refs #6939. PATH changes don't propegate through.
refs #6939. Unused include.
Refs #6315. Merging Windows fix.

Merge branch 'feature/6936_pv_mantidplot_dialog' into feature/6315_build_pv_398

Conflicts:
	Code/Mantid/Build/CMake/DarwinSetup.cmake