Merge "Allow loading additional variables file for site config" into feature/zuulv3