Re #10803 Brought changes to properties from #10817
Re #10803 resolving conflicts with #10817

Merge branch 'bugfix/10817_errorHardmaskPlus' into feature/10803_DirectInelasticPack

Conflicts:
	Code/Mantid/scripts/Inelastic/Direct/PropertyManager.py
Merge branch 'feature/10803_DirectInelasticPack' into develop