Merge "Fix zuul_stream callback dict modification" into feature/zuulv3