No waffle for FxA on FxOS 2.0 (bug 1042886)
Merge pull request #527 from washort/always-fxa-20

No waffle for FxA on FxOS 2.0 (bug 1042886)
fix fireplace unit tests (bug 1040803)
Don't wait on persona if we are using Firefox Accounts fallback (bug 1039868)