fix regexps for WEB-7972
revert regex changes for WEB-7972 in prep for merging with refactor from WEB-8033
Merge branch 'master' into dev-WEB-7972
re-commit regex fixes for WEB-7972
replace, not append decoded html for WEB-8156 (fix merge snafu for WEB-7972)
Merge branch 'dev-WEB-7972'