Merge branch 'develop' into 'staging'

Merge develop into staging

See merge request !127

.gitlab-ci.yml

@@ -89,7 +89,7 @@ system-tests:
 
     # Update the deployment
     - |
-      ./ci-tools/update-grid-servers "${KEY_PATH}" ${name}
+      ./ci-tools/update-grid-servers "${KEY_PATH}" "${CI_ENVIRONMENT_NAME}"
 
     # Remove the key from the filesystem to reduce the chance of unintentional
     # disclosure.  Overall our handling of this key is still not *particulary*