Merge pull request #9030 from johndouthat/2-3-stable

Add .gemspec files to 2-3-stable to help Bundler
fixing load error messages
Do not mark strip_tags result as html_safe

Thanks to Marek Labos & Nethemba
Squashed commit of the following:

commit 9ef905f19807c62fb549ae6fe3784be4bcda96dc
Author: Rafael Mendonça França <rafaelmfranca@gmail.com>
Date:   Tue Aug 7 22:38:40 2012 -0300

    Fix tests about single quote escaping

commit 780a718723cf87b49cfe204d355948c4e0932d23
Author: Santiago Pastorino <santiago@wyeworks.com>
Date:   Tue Jul 31 22:25:54 2012 -0300

    html_escape should escape single quotes

    https://www.owasp.org/index.php/XSS_%28Cross_Site_Scripting%29_Prevention_Cheat_Sheet#RULE_.231_-_HTML_Escape_Before_Inserting_Untrusted_Data_into_HTML_Element_Content
    Closes #7215

    Conflicts:
    	actionpack/test/controller/new_base/render_template_test.rb
    	actionpack/test/template/asset_tag_helper_test.rb
    	actionpack/test/template/erb_util_test.rb
    	actionpack/test/template/javascript_helper_test.rb
    	actionpack/test/template/template_test.rb
    	activesupport/lib/active_support/core_ext/string/output_safety.rb
    	activesupport/test/core_ext/string_ext_test.rb
    	railties/test/application/assets_test.rb
backporting deep_munge
removing [nil] from the params
Fix escape_once not escaping single quotes. Fix it double-escaping hex-encoded entities, like &#x27, which was recently added to ERB::Util.