Merge pull request #3567 from shane-tomlinson/issue_3566-firefoxos-idp

Fix primaries on FirefoxOS
Merge pull request #3592 from mozilla/issue_3572_firefoxos_idp_verification

Fix returning from IdP verification on FirefoxOS
Merge pull request #3601 from mozilla/train-2013.06.19-fxos-hotfix

Train 2013.06.19 hotfix - FirefoxOS primary support