SERVER-12392: use std::map instead of unordered_map because of gcc 4.1
Merge remote-tracking branch 'upstream/master'