(Issue 763) Switch to ESAPI module; Distinguish between formatting and escaping