disabled mr_shard_version on debug builds because it's slow
Merge branch 'bugfixes/tokumx-1.3'
refs #768, add a line of logging information that may prove helpful
Print oplog contents to help diagnose failures
refs #684 fix up a sharding test to obey new _id primary key rules
fixes #767 Remove old _id hack logic, replacing it with pk hack logic.
Merge branch 'master' into fastupdates

Conflicts:
	src/mongo/db/ops/update.cpp