Re #10532 Renamed ei monitors names to names with dashes.
Re #10532 Change to unit tests caused by changes in properties
Re #10532 Fixed conflicts with develop

Merge branch 'feature/10532_separatePropertyManager' into develop

Conflicts:
	Code/Mantid/scripts/Inelastic/DirectReductionProperties.py