refs #6936. Fix broken mac package.
Refs #6315. Merging Mac fix.

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

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