Combine mocking on any instance cukes
Use expect syntax more consistently
Merge pull request #398 from rspec/any_instance-combine-features

Combine 'any instance' cukes