Add GLOBUS_LOCATION
Merge remote-tracking branch 'oxford-physics/master' into apel_enhancements