Merge "BUG-1622 Fix DependencyResolver ignoring submodule but no parent"