Merge "Gate on zuul-stream-functional" into feature/zuulv3