Merge "Add tenant column to the buildset reporter table" into feature/zuulv3