Commit to address GORA-47 (again). I'll set the environment variables within the Jenkins nightly build accordingly. N.B. The Jenkins builds (and locally) still fail due to broken tests.