Bug 994176 - Create branched versions of marionette-client and consumer packages. r=zcampbell
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.