Merge "Use new tenant project index for config references" into feature/zuulv3