fix ERB::Util::escape_json to escape javascript incompatible whitespace

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