Merge "Correct logic problem with job trees" into feature/zuulv3