Add x-auth-formtoken, etc.

Please merge cd4c8a6 only.