unify client_id to id
Merge branch 'register' of github.com:mozilla/fxa-oauth-server into register