Bug 947810 - Show authentication information in WAP-Push test app. r=arthurcc
Bug 947977 - [Messages] Bug 936370 regressed the scrolling behavior when redacting a multi-line message r=schung
Bug 950469 - [Setringtone][l12y] 'Set as ringtone' string is reused on title and button
Bug 947259 - Fix waitForEvent: marionetteScriptFinished is called from the right sandbox.
Bug 947259 - Cleanup post review.
Bug 826274 - Disabled lock screen sound still plays
Revert "Merge pull request #12717 from punamdahiya/Bug924170_Video_Marionette_Tests"

This reverts commit 7deffe21aedd0b1908d981be4a348f148a4332e8, reversing
changes made to 1f275beb53779feb31e1b00611c5e85428c431ae.
Merge pull request #14738 from gregorwagner/back

Revert "Merge pull request #12717 from punamdahiya/Bug924170_Video_Mario...
Merge pull request #14492 from chuck-lee/bug-947810_show_wap_push_auth_info

Bug 947810 - Show authentication information in WAP-Push test app. r=arthurcc
Merge pull request #14704 from KevinGrandon/bug_826274_annoying_sound

Bug 826274 - Disabled lock screen sound still plays r=timdream
Bug 949897 - test_cards_view_kill_apps_with_two_apps.py intermittently fails
Bug 947957 - Enable test_quick_settings.py on Travis and TBPL
Travis bustage fix
Merge pull request #14752 from gregorwagner/back

Travis bustage fix.
Merge pull request #14710 from viorelaioia/bug_949897

Bug 949897 - test_cards_view_kill_apps_with_two_apps.py intermittently fails
Bug 890440 - Disable system workarounds for notification sent with the deprecated API

Notification which have been sent with the old API should not be treated
with the hacks and workarounds we implemented to circumvent its
limitations. So we detect whether a notification was sent from this
deprecated API based on the form of the id property.
Merge pull request #14707 from AndreiH/bug947957

Bug 947957 - Enable test_quick_settings.py on Travis and TBPL
Bug 950465 - [Clock][l12y] Snooze is reused in different contexts

r=jugglinmike
Bug 933131 - Message report panel implementation
Merge pull request #14676 from TheoChevalier/setringtone-reused-strings

Bug 950469 - [Setringtone][l12y] 'Set as ringtone' string is reused on t...