OPENUCB-290: Sanitize to prevent XSS: Zen 5.5 and minor tweaks
Prep for release 7.x-1.0-alpha10