SERVER-13635 fixed rocksdb storage engine test to expect BSONCollectionCatalogEntry options
Merge remote-tracking branch 'upstream/master'