Bug 989272 - FPS and TTL monitors shouldn't depend on the Developer HUD being active. r=evelyn
Bug 992216 - s/Feura/Fira/. r=21
Bug 992466 - Phone wont come back from sleep on ftu
Bug 897352 - [gaia build system] Transition to a build_stage for assembling apps

Conflicts:
	Makefile
	apps/communications/build/build.js
	build/copy-build-stage-manifest.js
	build/test/integration/distribution.test.js
	build/utils-xpc.js
	build/utils.js
	build/webapp-manifests.js
Bug 991585 - NFC: NfcUtils.encodeHandoverSelect is not a function. r=alive
Merge pull request #17998 from snowmantw/issue992466

Bug 992466 - Phone wont come back from sleep on ftu
Merge pull request #17944 from allstarschh/Bug991585

Bug 991585 - NFC: NfcUtils.encodeHandoverSelect is not a function. r=alive
Merge pull request #18008 from yurenju/stage5

Bug 897352 - [gaia build system] Transition to a build_stage for assembl...
Merge pull request #17983 from jankeromnes/feura

Bug 992216 - s/Feura/Fira/. r=21
Merge pull request #17801 from jankeromnes/disintegrate

Bug 989272 - FPS and TTL monitors shouldn't depend on the Developer HUD being active. r=21
Bug 991628 - [Settings][OMA CP] Not possible to select an APN received via OMA CP message if there is already one with the same name