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