Bug 959915 - Adapt FxA token server client to include X-Client-State header.