Address feedback from 2018-08-09 failover attempt

parent edca1216
Pipeline #89011 passed with stage
in 18 seconds