Merge "Use Tempest compatible version for xenial node job"