Squashed cherry-pick for the entitlement-role-fix1 MR

Basically, this commit is the diff between 49b9d47c (master pre-merge) and 7b117113 (master post-merge)
1 job for !14 with ibm-cherry-picks-for-0.5 in 13 minutes and 4 seconds (queued for 1 second)
detached
Status Name Job ID Coverage
  Review
passed trigger-trusted-tests #198016
osdu-small

00:13:04