SERVER-13410 metadata changes in dblock
Merge remote-tracking branch 'upstream/master'