Refs #9993. Merge master into branch to solve merge conflicts

Conflicts:
	Code/Mantid/Framework/SINQ/inc/MantidSINQ/PoldiUtilities/MillerIndices.h
	Code/Mantid/Framework/SINQ/inc/MantidSINQ/PoldiUtilities/PoldiPeakCollection.h
	Code/Mantid/Framework/SINQ/src/PoldiUtilities/MillerIndices.cpp
	Code/Mantid/Framework/SINQ/src/PoldiUtilities/PoldiPeakCollection.cpp
	Code/Mantid/Framework/SINQ/test/MillerIndicesTest.h
	Code/Mantid/Framework/SINQ/test/PoldiPeakCollectionTest.h