Merge pull request #1904 from raydavis/raywip

CLC-2866 Disable whitelist blocking
CLC-2933 Reduce chance of DB erasure on bad deploy