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