Merge remote-tracking branch 'arcus/train-production' into 'arcus/train-staging'

Bring the staging branch up to date with the production branch. This is so we can run tempest for gitlab.