Merge pull request #1330 from andytaylor/master

retry creating server lock file on io failure
move all backup announcement code from clustermanager to its own manager