Remove usage of deprecated Xml::escapeJsString

* Also removed unnecessary HTML escaping

Change-Id: I7021eff1d088156ceace2079a4228ec63873c4eb