Integrate with the new rspec-mocks lifecycle
Merge pull request #1239 from rspec/integrate-new-mocks-lifecycle

Integrate with the new rspec-mocks lifecycle