Merge "Use a select loop on log streamer socket reads" into feature/zuulv3