Make sure we don't hang waiting for a node to go down if it went down before we became the winner.
Merge bug26368
stable to default