SERVER-13635: move some tests that mmap specific
SERVER-13635: add check that storage engine returns valid DiskLoc
SERVER-13635: fix captrunc transaction nesting
SERVER-13635: fix transaction nesting
SERVER-13635: tailable test for heap
SERVER-13635: BSONCollectionCatalogEntry supports options
Merge remote-tracking branch 'upstream/master'