Bug 985090 - Fix voicemail number migration issue and refactor
Bug 968693 - [settings] add marionette test for App permissions panel
Revert "Bug 985409 -  Fix JSHint issues with test/unit/setup.js"

This reverts commit 5d3e2618af85aa245e4bc06692b9d5df32687745.
Revert "Bug 964180 - Introduce AMD to settings app"

This reverts commit d9fb81e2d83dae21e53496b697cdd10ad6a2d4fd.

Conflicts:
	apps/communications/dialer/test/unit/multi_sim_action_button_test.js
	apps/settings/index.html
Merge pull request #17373 from crh0716/985090

Bug 985090 - Fix voicemail number migration issue and refactor r=jaoo
Merge pull request #17391 from cctuan/968693

Bug 968693 - [settings] add marionette test for App permissions panel