Simplify warning/tests for reset deprecation

Conflicts:
	lib/rspec/core.rb
	spec/command_line/order_spec.rb
	spec/rspec/core/runner_spec.rb
Add a full changelog entry for #1587.

Conflicts:
	Changelog.md