Re #10817 This should fix it
Re #10817 minor comments
Re #10817 Resolving conflicts with #10803

Merge branch 'bugfix/10817_errorHardmaskPlus' into develop

Conflicts:
	Code/Mantid/scripts/Inelastic/Direct/PropertyManager.py