Bug 987418 - Update copy in fxa system app r=ferjm

  Also reverts commit 2c7d550 (bug 961009) and renames locales file per
  comment 1 in that bug.
Merge pull request #17613 from 6a68/bug-987418-fxa-system-app-copy-update

Bug 987418 - Update copy in fxa system app