Revert "Revert rspec-mock's Marshal monkey-patch"

This reverts commit 10af6a7c1c4f52b7408cba51e1fb97f7d9c04d07.

Conflicts:
	spec/spec_helper.rb
Merge remote-tracking branch 'origin/master' into db-sharding