chore: keep entitlements in the options only, simplify fields#14434

Emyrk merged 2 commits intomaincoder/coder:mainfrom

stevenmasley/entitlement_referencecoder/coder:stevenmasley/entitlement_referenceCopy head branch name to clipboard