Check the target branch when pulling upstream projects - 15.6

Cherry pick !3433 (merged) into 15.6.

We need this for !3427 (closed) to work. I could cherry-pick this in the other MR, but I thought it would be cleaner to have two separate MRs.