Bug 959543 - [CostControl] Remove reference to lastSIM property
Bug 959175 - Force redraw on uppercase switch when layout has secondLayout flag
Bug 957122 - Enable more TBPL tests - Settings app

Enable test_settings_app_permissions on TBPL
Bug 957122 - Enable more TBPL tests - Lockscreen

Enable test_lockscreen_wake_with_notification on TBPL

Conflicts:
	tests/python/gaia-ui-tests/gaiatest/tests/tbpl-manifest.ini
Bug 960170 - [Calendar][Integration Test] use chai.assert instead of regular assert for better error messages
Bug 946205 - Re-enable Travis tests after 891882 merged
bug 948826, add prompt testing

clone uitests into uitests-privileged and set it as a privileged app

test
 - contacts
 - geolocation
 - device-storage
 - userMedia

remove unnecessary part in uitests-privielged
skip on desktop because there's no microphone available
Bug 960039 - [system] Remove `charging` attribute

Remove unused, non-standard `charging` attribute from the markup for the
battery icon.
Bug 938540 - Use Notification API for WapPush
Bug 931711 - mozContact constructor creates unconsistent objects with the 'undefined' string as 'id'
Bug 943812 - Remove "R$" from English keyboard layout.
bug 958318 - Optimize Settings App to find homescreen counts r=arthurcc
Bug 956648 - Update test-agent version
Bug 958652 - Part 2: MOZPERFOUT must be passed on in the Makefile.
Bug 927319 - Fix key presses causing reflows of the entire keyboard.
Revert "Bug 952098 - Add places as a rocketbar provider. r=kgrandon"

This reverts commit ff30172aa6f374c4c4cc3450dd3bb0dcff6d30d5.
Merge pull request #15426 from KevinGrandon/bug_952098_revert_places

Revert "Bug 952098 - Add places as a rocketbar provider. r=kgrandon"
Merge pull request #15419 from changm/bug958318

bug 958318 - Optimize Settings App to find homescreen counts r=arthurcc
Merge pull request #15421 from KevinGrandon/bug_956648_bump_test_agent

Bug 956648 - Update test-agent version
Merge pull request #15423 from hfiguiere/bug958652-2

Bug 958652 - Part 2: MOZPERFOUT must be passed on in the Makefile. r=davehunt