CLC-2933 Reduce chance of DB erasure on bad deploy
Merge pull request #1906 from raydavis/raywip

CLC-2933 Reduce chance of DB erasure on bad deploy