SERVER-14349 problem with changing lock manager policy
Merge remote-tracking branch 'upstream/master'