Merge pull request #1331 from andytaylor/2.3.x

retry creating server lock file on io failure
fix test race condition on backup start by adding flag