Description of problem: Cleaner (I hope) solution for https://github.com/zanata/zanata-client/pull/17 Reference pull request: https://github.com/zanata/zanata-client/pull/20
VERIFIED with Zanata client modules 3.4.0-SNAPSHOT commit 38f4a7668eb78ce26e17804876c9b1a3604dc982