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

Feedback from the 2018-08-07 failover attempt

See merge request gitlab-com/migration!191
2 jobs for master in 16 seconds
Status Job ID Name Coverage
  Test
passed #2719634
references

00:00:12

passed #2719633
shellcheck

00:00:16