Added BZ#978119 - Resolve entities before payload is built or strings are sent to Zanata