Merge "Only strip trailing whitespace from console logs" into feature/zuulv3