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

Address (some) feedback from 2018-08-02 failover attempt

Closes #753

See merge request gitlab-com/migration!176
2 jobs for master in 12 seconds (queued for 2 seconds)
Status Job ID Name Coverage
  Test
passed #2713668
references

00:00:11

passed #2713667
shellcheck

00:00:12