remove another unnecessary dup
do not append a second slash when using
Fix a number of validation/style errors:

 * <pre> is not allowed to be nested inside of <p> elements in HTML
 * Indentation of </p> doesn't match corresponding <p>
 * <p> element not explicitly closed
 * One more </div> than <div>

In each case, the template was fixed to match how a HTML5 parser would "see"
the resulting page.
Merge pull request #8702 from rubys/master

Fix a number of validation/style errors
Fixing closing </p>
Merge pull request #8701 from senny/8700_double_slash_with_trailing_slash

do not append a second slash when using `trailing_slash: true`
CVE-2012-5664 options hashes should only be extracted if there are extra parameters

Conflicts:
	activerecord/lib/active_record/dynamic_matchers.rb
Merge pull request #8697 from goshakkk/undup

Remove another unnecessary dup
missing changelog entry for #8682