Bug 940633 - [Cost Control] Fix alignment of checkboxes in usage tab.
Bug 948975 - Safeguard to make sure we can always resume a single held
conference call.
Bug924170 - [Video] - Add Marionette tests for Video App r=jugglinmike
Bug 952760 - Email next/previous marionette setup orange
Bug 956031 - Checking for geolocation icon precludes this test from running on CI environments r=me
Merge pull request #14921 from gaye/bug-952760

Bug 952760 - Email next/previous marionette setup orange
Merge pull request #14892 from etiennesegonzac/bug-948975-resume-single-conference-group

Bug 948975 - Safeguard to make sure we can always resume a single held conference call. r=rik
Revert "Merge pull request #15004 from cctuan/956004"

This reverts commit 6d59734b0b1700a594b4f80f415897e3e0fde682, reversing
changes made to 56958810b8c51a513b6ef3263a362da7c9922d7f.
Merge pull request #14814 from eeejay/bug-940633

Bug 940633 - [Cost Control] Fix alignment of checkboxes in usage tab.
Only run travis on master for now
Revert "Bug 944697 - Make the edge_gesture_test.js resolution independent. r=alive"

This reverts commit 5f67e563ef9eb52ee33cc76ac73ffe3dccdc3296.
Merge pull request #15078 from gaye/only-run-travis-on-master

Only run travis on master for now
Merge pull request #14781 from punamdahiya/Bug924170_Video_Tests

Bug924170 - [Video] - Add Marionette tests for Video App r=jugglinmike