New merge

Merged Daniela Genius requested to merge new_merge into master

Minor bug fixes to obtain alternatively standalone SystemC-AMS or soclib with SystemC AMS pqrts

Merge request reports