Merge "Add integration test for zuul_stream" into feature/zuulv3