SERVER-10026 fix size accounting in sort
SERVER-13387 CreateIndexes command allows non shard key unique indexes to be created
Merge remote-tracking branch 'upstream/master'