Bug 1017484 - Use appropriate dependencies for the branch under test. r=wlachance