Merge "Use connection type supplied from nodepool" into feature/zuulv3