SERVER-16392 ShardInfo should stop using mapped to get size estimate
Merge remote-tracking branch 'upstream/master'