SERVER-15314 Stop accessing replication internals in auth_schema_upgrade_d.cpp
SERVER-14668 allow export of locks currently held
Merge remote-tracking branch 'upstream/master'