Merge branch 'entitlement-role-fix1' into 'master'

Entitlement role fix1

See merge request !12
11 jobs for master in 12 minutes and 34 seconds (queued for 7 seconds)