Merge pull request #315 from lbl-srg/Annex60Sync

Annex60 sync
Updated HeaterCooler_u