Set encode=none to i18n properties with html tags and some cleaning of
messages.properties
Merge branch 'APD-192-IMR' into develop