Bumping gaia.json for 4 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/84e6aad5e981
Author: Zac Campbell <zcampbell@mozilla.com>
Desc: Merge remote-tracking branch 'bsilverberg/tbpl_settings'

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

========

https://hg.mozilla.org/integration/gaia-central/rev/886dae024ada
Author: Bob Silverberg <bob.silverberg@gmail.com>
Desc: Bug 957122 - Enable more TBPL tests - Settings app

Enable test_settings_app_permissions on TBPL

========

https://hg.mozilla.org/integration/gaia-central/rev/861d99663e25
Author: Zac Campbell <zcampbell@mozilla.com>
Desc: Merge remote-tracking branch 'bsilverberg/tbpl_lockscreen'

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

========

https://hg.mozilla.org/integration/gaia-central/rev/ec315cf375ce
Author: Bob Silverberg <bob.silverberg@gmail.com>
Desc: 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
Bumping manifests a=b2g-bump