PDI-10514: fixd bug with ESAPI encoding.