Added machine name support for roles not created with baseline.