(User roles) Fix merge issues #15062

Job	Run time
setup	6s
security-scans	14s
test (packages/Dockerfile.base)	8s
test (packages/auth)	2m 11s
test (packages/client)	3m 49s
test (packages/commons)	2m 5s
test (packages/components)	1m 59s
test (packages/config)	2m 18s
test (packages/dashboards)	1m 49s
test (packages/data-seeder)	1m 49s
test (packages/documents)	2m 10s
test (packages/gateway)	2m 57s
test (packages/login)	2m 10s
test (packages/metrics)	2m 22s
test (packages/migration)	1m 51s
test (packages/mobile-proxy)	1m 48s
test (packages/notification)	2m 20s
test (packages/scheduler)	6s
test (packages/search)	4m 12s
test (packages/user-mgnt)	2m 50s
test (packages/webhooks)	2m 20s
test (packages/workflow)	2m 20s
	43m 54s

Provide feedback