Fixed up issues found during testing for BZ#978119 - resolve entities before payload is built or strings are sent to Zanata.