JRA-32201 Fixes required for HTMLSafe compatability - JIRA Suite Utilities 1.4.2