Revert "Merge branch 'slb/dperez50/entitlements-v2' into 'master'"

This reverts merge request !31
6 jobs for !33 with revert-da651e81 in 11 minutes and 51 seconds (queued for 2 seconds)
latest merge request