fix functional tests / remove useless imports in endurance tests
Bug 949351 - [Download Manager] Remove workaround to avoid bug 944682
Merge pull request #14224 from flodolo/separate_header

Bug 944749 - [Settings][l12y] Use different labels for menu items and headers, r=kaze
Bug 949364 - Unxfail test_add_photo_to_contact.py
Merge pull request #14405 from EverythingMe/946176-collection-tap

Bug 946176 - [e.me][Bug] Collections Tapping issues [r=evyatar]
Bug 947432 - [DSDS] Marketplace and Payment indication in Settings

- update strings
Bug 949392 - [e.me] 'Music2' removed from 'Music' collection when adding a web app [r=ranbena]
Bug 949393 - Re-enable test_number_keyboard and test_url_keyboard - Travis intermittents
Merge pull request #14602 from EragonJ/bug-947432

Bug 947432 - [DSDS] Marketplace and Payment indication in Settings
Bug 947001 - Add requirements.txt to MANIFEST.in file so it gets packaged to pypi, bump version. r=dhunt
Bug 831948 - WiFi Tethering should default to WPA2
Bug 948934 - [Download Manager] The downloading icon is not displayed during the download
Merge pull request #14603 from askeing/949364

Bug 949364 - Unxfail test_add_photo_to_contact.py
Merge pull request #14534 from viorelaioia/bug_948385

Bug 948385 - Merge test_set_alarm_repeat, test_set_alarm_snooze, test_set_alarm_sound.py
Merge pull request #14606 from zacc/bug_949393

Bug 949393 - Re-enable test_number_keyboard and test_url_keyboard - Trav...
Merge pull request #14591 from daleharvey/946807

Bug 946807 - Dont postResult to activity with no return value r=benfrancis
Merge pull request #14557 from gitmai/bug-937251-CC-Remove-proxy

Bug 937251 - [Cost Control] Remove proxy
r=salva
Merge pull request #14570 from fcampo/mms-message-width-948346

Bug 948346 - MMS when message has multiple lines, it cuts off (r=julienw)
Bug 948462 - Fix SIMULATOR=1. r=yurenyu
Merge pull request #14600 from crdlc/bug-949351

Bug 949351 - [Download Manager] Remove workaround to avoid bug 944682