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

========

https://hg.mozilla.org/integration/gaia-1_4/rev/867b988e6d34
Author: Bob Silverberg <bob.silverberg@gmail.com>
Desc: Bug 987946 - [unittest] test_cold_launch.py failing

The test is failing because the correct app url is now not available until
shortly after launching.
This patch changes the test so it waits for the correct app url, rather than
just immediately asserting that it is as expected.

========

https://hg.mozilla.org/integration/gaia-1_4/rev/a7d3ffe173b4
Author: Dave Hunt <dave.hunt@gmail.com>
Desc: Bug 994176 - Create branched versions of marionette-client and consumer packages. r=zcampbell
Bumping manifests a=b2g-bump