Merge pull request #17455 from KevinGrandon/v1.3

Bug 986268 - Voicemail test is failing on v1.3 a=TEST_ONLY
Bug 982260 - Gaia-integration tests on TBPL fail with: TEST-UNEXPECTED-FAIL | Contacts > Details Merging 15 contacts

Conflicts:
	apps/communications/contacts/test/marionette/details_test.js
	shared/test/integration/tbpl-manifest.json
Merge pull request #17460 from KevinGrandon/bug_982260_to_1dot3

Bug 982260 - Gaia-integration tests on TBPL fail with: TEST-UNEXPECTED-FAIL | Contacts > Details Merging 15 contacts
Bug 986325 - Disable intermittent tests on travis for 1.3
Revert "Bug 982260 - Gaia-integration tests on TBPL fail with: TEST-UNEXPECTED-FAIL | Contacts > Details Merging 15 contacts"

This reverts commit c8dbcfd21a004fa9d7f7a133ebe9431ce557881d.
Bug 982260 - Disable intermittent failing test
Merge branch 'v1.3' into v1.3t