CLOUD-106 Cluster related resources refactored. Roles don't apply to clusters