Classify machines by the roles matched, not by all roles tested on
Merge branch 'allow_multiple_roles' into features