Merge "Move tenant_config option to scheduler section" into feature/zuulv3