Merge remote branch 'origin/feature/8651_errors_OptimizeLatticeForCellType'

Conflicts:
	Code/Mantid/Framework/Crystal/src/OptimizeLatticeForCellType.cpp

Re #8651
Merge remote-tracking branch 'origin/feature/8612_plus_docs_clarification'
refs #8689. Fix l2q usage and documentation.
Merge branch 'feature/8689_l2q_issues' into develop