auth info in body/json instead of WWW-Authenticate field
Merge branch 'master' into ice-cream-sandwich