Merge pull request #967 from rspec/quick_fix_for_deprecation_formatter_on_jruby

Properly base #966 off 2-14-maintenance
Conflicts:
	Changelog.md