Bug 796588 - Don't allow user to setup same account twice r=lightsofapollo
Merge pull request #9341 from lightsofapollo/leob2g-Bug_796588_Can_Add_multiple_same_account

Bug 796588 - Don't allow user to setup same account twice r=lightsofapol...
Bug 858463 - Hide the subtitle 'Accounts' if there is no account in settings
Merge pull request #9219 from gaye/bug-858463

Bug 858463 - Hide the subtitle 'Accounts' in settings if no accounts
Fix advanced settings view test
Merge pull request #9363 from gaye/fix-broken-view-test

Fix advanced settings view test
Merge branch 'master' of github.com:mozilla-b2g/gaia into travis-test-agent-debug