Bug 951563 - CSS fix for the 5th row of app label on WVGA resolution.
Bug 957100 - [Settings] add marionette for b2g-improve and feedback page
Bug 959543 - [CostControl] Remove reference to lastSIM property
Bug 959175 - Force redraw on uppercase switch when layout has secondLayout flag
Bug 947504 - Only enable HwcComposer2D by default if hardware support it
Bug 957122 - Enable more TBPL tests - Settings app

Enable test_settings_app_permissions on TBPL
Bug 957122 - Enable more TBPL tests - System app

Enable test_context_menu_activity_picker on TBPL
Bug 956428 - Add checks on set/getPreferredNetworkType
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 959447 - Remove twittershare test app
Bug 960094 - Multiple CSS warnings shown when launching E-Mail app
Bug 952482 - [FTE] "SIM 1" is written to enter the PIN for the SIM, even when the phone is single sim
Bug 960170 - [Calendar][Integration Test] use chai.assert instead of regular assert for better error messages
Bug 956424 - SIM Security enabled/disabled information is wrong

- add related tests
- fix enabled/disabled information
Bug 946205 - Re-enable Travis tests after 891882 merged
Bug 869289 - Video app fails to list videos where it can't generate a thumbnail
Bug 958423 - ndef in 'nfc-manager-tech-discovered' is two levels of array.
Merge pull request #15284 from EragonJ/bug-956424

Bug 956424 - SIM Security enabled/disabled information is wrong
Merge pull request #15365 from larryxiao/master

Bug 959447 - Remove twittershare test app, r=timdream
Bug 955887 -  [Buri] "Add Collection" wallpaper label missing

the root cause is we didn't use foo.en-US.properties for en-US instead
of en-US/apps/foo/foo.properties if GAIA_CONCAT_LOCALES=1, so we need to
use the original file in gaia directory not in locale basedir.