Bug 897977 - Fixing FTE for v1-train only
Merge pull request #11166 from lodr/bug-897977-fixing-fte

Bug 897977 Fixing FTE
r=arcturus
label desktop-helper as fx-compatible and set recommended maxVersion; r=vingtetun, a=NPOTB

(cherry picked from commit 7315f49c817f56b57ab453bf184f0587cdd1795e)
Merge pull request #11190 from mykmelez/v1-train-fx-version

bug 898130 - label desktop-helper as fx-compatible and set recommended maxVersion; r=vingtetun, a=NPOTB
Merge pull request #11048 from comoyo/vcf-encoding

Bug 883278 - [contacts] importing from .vcf file (sd card) puts providedfirstname and lastname in firstname field if both contain only ascii characters, causes sort by lastname to fail [r=arcturus]
(cherry picked from commit bbad03e30527e1df8261a462e5cefbdc562f0819)

Conflicts:
	apps/communications/contacts/js/utilities/vcard_parser.js
Bug 899328 - Register only one listener for mozbrowserloadend and appopen on a given app iframe.

This prevents us from leaking listeners.
Bug 858463 - Hide the subtitle Accounts if there is no account in settings (cherry picked from commit c542dd1)
Merge pull request #11238 from jlebar/apploaded-listener-b2g18

Bug 899328 - Register only one listener for mozbrowserloadend and appopen (v1-train PR)
Merge pull request #9868 from RudyLu/keyboard/catalan_support

Bug 866746 - Catalan keyboard layout r=RudyLu(cherry picked from commit 1419f08968e1a4b746579af39c9e2dbb44c0cf9d)

Conflicts:

	apps/settings/index.html
	shared/resources/keyboard_layouts.json

Merge pull request #9888 from gaye/bug-866746-followup

Bug 866746 - Fix lint errors introduced by 1419f0 r=RudyLu(cherry picked from commit 26701c886c262a40ffb9bcca3121204575baa922)

Conflicts:

	apps/keyboard/js/render.js

remove unused layout property
Merge pull request #11272 from davidflanagan/bug866746-v1-train

Bug866746 v1 train
Merge pull request #11231 from davidflanagan/bug896363

Bug 896363: Add an auto-correct dictionary for Catalan r=RudyLu(cherry picked from commit 247eec1e8cf4a5ccb4077ecc3e48dd3bda6ef108)

Conflicts:

	apps/keyboard/js/keyboard.js
Merge pull request #11273 from davidflanagan/bug896363-v1-train

Bug896363 v1 train