additional changes for v1beta15 handling of machine-types