Regression fix: allows Code Snippets to include 'script' tags
(cherry picked from commit bcf99cf)
Regression fix: fixes html text mangled due to scrubbing for security hacks
(cherry picked from commit 4f2da5f)
Update to v2.3.1patch2