Merge "Quote message when reporting to Gerrit" into feature/zuulv3