Add fxa settings to errors (bug 1097084)
Merge pull request #569 from muffinresearch/add-fxa-to-system-errors-1097084

Add fxa settings to errors (bug 1097084)
Fix import error at deploy (bug 1097157)
Merge pull request #570 from muffinresearch/fix-import-error-1097157

Fix import error at deploy (bug 1097157)