CB-6028: Protect against cyclic dependencies in install