Fix for handling a repository dependency that has a tool dependency in error because it has a missing env.sh file.
Merged from next-stable