rhbz913745 - Fix issues with Zip File download.

Server path was not being correctly derived in some cases.
Refactor a few of the clases that generate the zanata.xml file.
Merge remote branch 'origin/integration/master' into integration/master