Revert "Bug 986716 - Personatestuser.org is timing out"

This reverts commit a970a22cceab5537dae680b9a172468602d901c7.
Bug 985888 - [DSDS] Display currently in-use SIM cards on call buttons. r=rik
Merge pull request #17440 from DouglasSherk/985888-active-call-ui

Bug 985888 - [DSDS] Display currently in-use SIM cards on call buttons. r=rik
Merge pull request #17388 from lissyx/bug985117

Bug 985117 - Use the correct SIM number to query voicemail number r=alive
Revert "Bug 982260 - Gaia-integration tests on TBPL fail with: TEST-UNEXPECTED-FAIL | Contacts > Details Merging 15 contacts"

This reverts commit 3ba3079118b95b84d12e0e0a8555d329da4fe4b9.
Merge pull request #17470 from 6a68/bug-986716-reenable-tests

Revert "Bug 986716 - Personatestuser.org is timing out"
Bug 983171 - [Settings] Disable intermittent failing tests
Merge pull request #16541 from 6a68/bug-974108-iac-race-condition

Bug 974108 - Race condition in FxAccountsIACHelper
Merge pull request #17364 from gasolin/bubble974828

Bug 974828 - [Settings][dsds] Outgoing data confirmation is wrong, r=arthur
Merge pull request #17113 from ian-liu/bluetooth/bug980694_error_handle_in_bluetooth_app_while_user_turn_off_bt_before_sendfile

Bug 980694 - [B2G][Bluetooth] Bluetooth will continue searching for an export device after it is disabled, r=@timdream
Merge pull request #17105 from jedp/929917-uitest-fxa

Bug 929917 - UI Test app for Firefox Accounts DOM API
Merge pull request #15644 from gitmai/bug-960500-CC-specific-message-for-airplanemode

Bug 960500 - [Buri][Data usage] Show a specific message when launching d...
r=salva
Bug 979381 - [CostControl] Add a new agument to the 'requestSettings' method, to let specifying for which IccID do the settings refer
Bug 986473 -Modify cost control parameters
Merge pull request #16942 from gitmai/bug-979381-CC-add-argument-requestSettings

Bug 979381 - [CostControl] Add a new agument to the 'requestSettings' me...
r=salva
Revert "Revert "Bug 971546 - [System2] Instantiable Screenshot" for possibly breaking gaia-ui tests on TBPL"

This reverts commit 60e9eb1aa68a27fa21e75264e52409aa5a2b4cc4.
Bug 971577 - [System] Make visibility manager instantiable
Merge pull request #17445 from rnowm/986466

Bug 986466 - [VDR] Incorrect use of edit mode [BB]
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