Re #10817 This should fix it
Re #10817 minor comments
Re #10817 Minor bug in DirectEnergyConversion

(header not defined if scrip fails)
Re #10817 Lost in branches changes to DirectPropertyManager
Re #10817 lost changes again
Merge remote-tracking branch 'origin/bugfix/10817_errorHardmaskPlus'