SERVER-13635 Test collection and index rollback
Merge remote-tracking branch 'upstream/master'