Remove warning when using html_escape with Ruby 1.9.

Closes #7430
updating changelogs
CVE-2012-5664 options hashes should only be extracted if there are extra parameters
bumping to 3.0.18
Merge remote-tracking branch 'official/3-0-stable' into 3-0-stable

Conflicts:
	activesupport/lib/active_support/core_ext/string/output_safety.rb