refs #9581 updated branch to master and fixing merge conflicts

caused by the documentation changes.

Merge branch 'master' into feature/9581_SphinxChanges

Conflicts:
	Code/Mantid/Framework/MDAlgorithms/src/ConvertToMDParent.cpp
	Code/Mantid/docs/source/algorithms/DetectorEfficiencyCor-v1.rst
	Code/Mantid/docs/source/algorithms/LoadInstrument-v1.rst
	Code/Mantid/docs/source/algorithms/MergeMD-v1.rst
	Code/Mantid/docs/source/algorithms/OneStepMDEW-v1.rst
	Code/Mantid/docs/source/algorithms/UpdateInstrumentFromFile-v1.rst
refs #9581 Conflicts with develop

Merge branch 'feature/9581_SphinxChanges' into develop

Conflicts:
	Code/Mantid/Framework/MDAlgorithms/src/ConvertToMDParent.cpp
	Code/Mantid/docs/source/algorithms/DetectorEfficiencyCor-v1.rst
	Code/Mantid/docs/source/algorithms/OneStepMDEW-v1.rst
Merge branch 'develop' of https://github.com/mantidproject/mantid into develop