MDL-25500 Locks: Cleanup cime warnings