For 4.85 RC: Cherry pick 44291 & 44302#44322

juan-fdz-hawa merged 2 commits into

rc-minor-fleet-v4.85.0fleetdm/fleet:rc-minor-fleet-v4.85.0from

cherry_pick_api_only_fixesfleetdm/fleet:cherry_pick_api_only_fixesCopy head branch name to clipboard