Ensure LockManager uses a consistent lock order
JBTM-1298