LPS-46156 Revert LPS-29566
LPS-46156 Remove early escaping
LPS-46156 Apply escaping - easy to backport
LPS-46156 Apply escaping to portlet.vm and portlet.flt - not suitable for backporting :(