fix broken os grains on SmartOS, only collect zonedata when we are in a SmartOS zone, map salt:role metadata to role grain
fix broken os grains on SmartOS, only collect zonedata when we are in a SmartOS zone, map salt:role metadata to role grain

saltstack/salt,saltstack/salt,saltstack/salt,saltstack/salt,saltstack/salt