Review 24225

C. Thomas Tyler
Enhanced HMS failover to support failover of edge server.

Bypassing pre-commit review as this has been tested in
the Battle School alb and contains a needed fix.
Tip: Use n and p to cycle through the changes.