Fix for OSX issues. Refs #7688.
Merge branch 'feature/7688_Reorganise_ICAT_directory_structure' into develop