Bug 935860 Remove the "sendString" method from Korean IME
Bug 925398 - Refactor runtests.py to follow Mixin pattern
Bug 946047: Add nfc read only permissions to Settings UI to allow navigator.mozNfc DOM to be created.

This fix is needed for apps using NFC if "HasNfcSupport" is added to the navigator MozNfc WebIDL.

Conflicts:
	apps/settings/manifest.webapp
Bug 948811 - Remove HTML in comments
Fix indent
Bug 948862 - [Contacts] The first time exporting a contact to SIM creates a duplicate of the contact in the contact list
 Bug 888253 - Settings data migration for keyboard layouts
Revert "Merge pull request #14529 from jaoo/933203"

This reverts commit 4dd40d64f137c48104d5f39e48c2ccb0ce9ab78c, reversing
changes made to 0985280ffc917353eb34ff7b0dcc1c152856450c.

This is breaking unit tests:
[system] system/LockScreenConnInfoManager > Single sim devices "before each" hook:
TypeError: MockNavigatorMozIccManager.addIcc is not a function
Merge pull request #14476 from malini/mixin

Bug 925398 - Refactor runtests.py to follow Mixin pattern, r=davehunt
bump marionette-client and gaiatest versions, enable gaia-ui-tests
Bug 948396 - [Calendar] Can not scroll anymore the week/day view once the new event has been opened with APZ turned on. r=kgrandon
Bug 942854 - [Calendar] Scrolling the week view results into results into overlapping artifacts. r=kgrandon
Bug 948001 - [Settings] With APZ turned on the wifi panel is sometimes shown instead of the main panel at startup. r=arthurchen
Bug 943498: Spread email scroll sync reflows.
Merge pull request #14488 from RudyLu/keyboard/Bug888253-keyboard_settings_migration

 Bug 888253 - Settings data migration for keyboard layouts.
r=gnarf, gary, yuren
Merge pull request #14491 from sangpire/Bug935860

Bug 935860 Remove the "sendString" method from Korean IME.
r=rudylu
Bug 948822 - Fix xfail message for test_cards_view_with_two_apps.py
Merge pull request #14276 from wanderview/email-scroll-jank

Bug 943498: Spread email scroll sync reflows.  r=asuth
Merge pull request #14575 from vingtetun/bug909877

Bug 948001 - [Settings] With APZ turned on the wifi panel is sometimes s...
Merge pull request #14574 from vingtetun/bug942854

Bug 942854 - [Calendar] Scrolling the week view results into results int...