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
Merge remote-tracking branch 'bsilverberg/tbpl_lockscreen'

Conflicts:
	tests/python/gaia-ui-tests/gaiatest/tests/tbpl-manifest.ini
Merge remote-tracking branch 'bsilverberg/tbpl_settings'

Conflicts:
	tests/python/gaia-ui-tests/gaiatest/tests/tbpl-manifest.ini