SERVER-16043 Rename heap1 classes and filenames to inMemory.
SERVER-16138: remove unneeded and wrong invariant in oplog check
Merge remote-tracking branch 'upstream/master'