SERVER-16245 fix multiversion tests
SERVER-14306 Increase stability of sharding/in_memory_sort_limit.js test
Merge remote-tracking branch 'upstream/master'