Merge "Include tenant in pipeline log messages" into feature/zuulv3