Bug 906841 - Port bug 770426 to try and fix dependency issues on lightning manifests. r=jcranmer,a=Standard8