Merge "Add max-nodes-per-job tenant setting" into feature/zuulv3