Temporary cache 44167
spec updates for rspec 3.0 changes
Remove unnecessary require
Revert rspec-mock's Marshal monkey-patch
Revert "Temporary cache 44167"

This reverts commit 4a3391c08c1fe5cc17af5e8845519d4f4d9c482e.
Remove old comment
Merge remote-tracking branch 'origin/master' into db-sharding

Conflicts:
	spec/spec_helper.rb