Merge "Remove hard-coded roles in EnabledServices output"