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 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.
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
Bug 960698 - Un-xfail test_settings_change_keyboard_language

Unxfailing the test as https://bugzilla.mozilla.org/show_bug.cgi?id=956761 seems to be fixed
Bug 897199 - Camera should not request geolocation if no SD card was detected
Merge pull request #15418 from wilsonpage/bug/897199

Bug 897199 - Camera should not request geolocation if no SD card was det...
Merge pull request #15372 from millermedeiros/960170-chai-assert

Bug 960170 - [Calendar][Integration Test] use chai.assert instead of regular assert for better error messages r=gaye