CLC-2933 Reduce chance of DB erasure on bad deploy

https://jira.media.berkeley.edu/jira/browse/CLC-2933

Bit of a belt-and-suspenders PR...