Updated file locations in SGE template.
Changed NeCTAR volume check in supported zones to a waning instead of an error.
Merge with cba702e297ced7ff6bd4084a502a2bf51c6f513a
Reverted qmaster dir so that it's backward compatible.