Cfy 1485 fix create deployment race condition