Accept multiple client_id/secret pairs for FxA (bug 1080039)
Merge pull request #2727 from mstriemer/sign-in-on-dev-1080039

Allow sign in from local commonplace to -dev zamboni