SERVER-15696 don't drop filters while creating a SORT_MERGE plan
SERVER-14462 Fix compile break on Linux 32-bit
 SERVER-14860 allow bg index builds on secondaries with doc-level-locking storage engines
Merge remote-tracking branch 'upstream/master'