Merge branch '2018-08-09-feedback' into 'master'

Address feedback from 2018-08-09 failover attempt

See merge request gitlab-com/migration!197
2 jobs for master in 15 seconds (queued for 2 seconds)