BZ-1022140: removing busy wait loop from fireUntilHalt()
(cherry picked from commit fe59367a6d695f45d8076c0749819e01fc563b9d)