Merge commit '45bce9fccca9b2c8ebb2d9d60e78a26c3659b7a9' into bugs/495
Merge commit '7cae13a0178fc86fd14626822bb8a2279e3b8e33' into bugs/495

Conflicts:
	src/mongo/tools/restore.cpp
Merge commit '8d50300a30552e9e65b981e2f8a62b06ce352472' into bugs/495

Conflicts:
	distsrc/NEWS
Merge commit 'ae2ad542d00019782d3fa2705001941c953523b1' into bugs/495

Conflicts:
	src/mongo/db/namespace_details.cpp
Merge branch 'fixup-merge-base' into releases/tokumx-1.2