SERVER-14668 Fix the LockManager conflict matrix and add unit-test