Merge "Use cached branches on tenant reconfiguration" into feature/zuulv3