bug 1131840: fix auth and token data for XML translation

Change-Id: I4408b3e6e0752ca75bc36399f5148890820e9a89
Merge "bug 1131840: fix auth and token data for XML translation"