Bug 967120 - Clean up FxAccounts' public/internal API implementation r=markh
some fixes