SERVER-13633 Kill DiskLoc::ext()
Merge remote-tracking branch 'upstream/master'