Move slow deletion purges out of complex DB transactions

* This should help reduce deletion related deadlock errors

Change-Id: Ie7cafbf87ab0c71cc6c4c4fe1e53af364974a745
Merge "Move slow deletion purges out of complex DB transactions"