Merge pull request #8235 from tilsammans/dont_escape_actionmailer_when_plaintext

Introduce `ActionView::Template::Handlers::ERB.escape_whitelist`

Conflicts:
	actionpack/CHANGELOG.md