Merge "Log a little extra debug info on log streaming" into feature/zuulv3