Deadlock Avoidance

Moved to DatabaseDeadlockAvoidance.