SERVER-15970 --durOptions was not working
Revert "SERVER-13635: fix rollback of collection create in kv engine"

This reverts commit ab7a1d27f130d0f920651181eafe19316c247b13.
Merge remote-tracking branch 'upstream/master'