Bug 852541 - Fixed to handle GAIA_DOMAIN set to something other than default
Merge pull request #8753 from JonHylands/jhylands-852541-master

Bug 852541 - Fixed to handle GAIA_DOMAIN set to something other than default