Reduce excess lock contention and chance for failure on rename

* DB locks and transactions were getting held up by sometimes slow purges (10+ seconds)

Change-Id: I0eead60e8faf5aee6b2ddf59cfdd928f9c8083ff