Bug 973269 - Intermittent TEST-UNEXPECTED-FAIL | test_edit_contact.py test_edit_contact.TestContacts.test_edit_contacttest
Bug 982571 - [Contacts] JSHint fixes for contact unit test mocks r=arcturus
Bug 942582 - [System] Improve string for emergency call back mode

Updated string by :matej
Bug 983088 - Xfail test_dialer_find_contact with Bug 983054
Merge pull request #17029 from bebef1987/test_contacts

Bug 973269 - Intermittent TEST-UNEXPECTED-FAIL | test_edit_contact.py
Merge pull request #17119 from KevinGrandon/bug_982571_contacts_mock_jshint

Bug 982571 - [Contacts] JSHint fixes for contact unit test mocks r=arcturus
Merge pull request #17151 from chirarobert/xfail_test_dialer_find_contact

Bug 983088 - Xfail test_dialer_find_contact with Bug 983054
Bug 983117 - Disable intermittent failing test, Browser Bookmarks > Edit bookmark
Bug 983117 - Disable intermittent failing test, Browser Bookmarks > Add bookmark
Merge pull request #17148 from flodolo/bug942582_emergencycalltext

Bug 942582 - [System] Improve string for emergency call back mode
Merge branch 'master' into save_tree
Check marionette tests
Revert "Bug 958470 - [Ringtones] set ringer type and use web audio api to preview the ringtones"

This reverts commit 4b6b7d119563bb6554c6b49d7f3ad6a2092261f8.