Merge mozilla-central to autoland a=merge on a CLOSED TREE

accessible/tests/mochitest/states/test_tree.xul

browser/app/profile/firefox.js

...r/components/payments/content/paymentDialogFrameScript.js

browser/components/payments/content/paymentDialogWrapper.js

browser/components/payments/res/containers/address-form.js

browser/components/payments/res/unprivileged-fallbacks.js

browser/components/payments/test/browser/head.js

browser/extensions/formautofill/FormAutofill.jsm

browser/extensions/formautofill/FormAutofillHandler.jsm

browser/extensions/formautofill/FormAutofillParent.jsm

browser/extensions/formautofill/FormAutofillStorage.jsm

browser/extensions/formautofill/FormAutofillUtils.jsm

...ser/extensions/formautofill/ProfileAutoCompleteResult.jsm

...ensions/formautofill/addressmetadata/addressReferences.js

...ions/formautofill/addressmetadata/addressReferencesExt.js

browser/extensions/formautofill/content/autofillEditForms.js

browser/extensions/formautofill/content/editAddress.xhtml

...nsions/formautofill/locales/en-US/formautofill.properties

browser/extensions/formautofill/skin/shared/editAddress.css

...ns/formautofill/test/browser/browser_editAddressDialog.js