Power-button-modal
Bug 986473 -Modify cost control parameters
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
Merge pull request #17474 from gitmai/bug-986473-CC-modify-parameters

Bug 986473 -Modify cost control parameters
r=salva
Merge pull request #17510 from yurenju/stage3

Bug 897352 - [gaia build system] Transition to a build_stage for assembl... r=@ochameau
Merge pull request #17386 from nucliweb/973827-Power-button-modal

Power-button-modal
Bug_956219 Multiple Contact Delete

Fixing Lint