* FIX: Remove RBAC datasource permissions upon datasource deletion * Use scope provider instead * Fix test