[OE-3572] Fixing htmlentities handling of UTF-8
[OE-3572] PHP 5.3 htmlentites does not support ENT_HTML5
Merge branch 'master' into develop