refs #738 Untangle a bunch of repeated upsert code
refs #738 Move code from the main _updateObjects function into
upsertAndLog (formerly insertAndLog) to help spread the complexity
Clean up includes
Merge branch 'master' into fastupdates

Conflicts:
	src/mongo/db/ops/update.cpp
Fix linking
Add fast updates to updateOneObject
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
final release notes for 1.3.2
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
Merge branch 'bugfixes/tokumx-1.3'
refs #748 Add logging to failed updates
fixes #772 Check the correct condition on indexer destruction. Also
remove a DEV block that serialized indexers in debug builds and made
this bug much harder to find outside of optimized builds.
Merge branch 'bugfixes/tokumx-1.3'
Merge branch 'master' into fastupdates
Remove deprecated tests (arg...)