Not all patches have been upstreamed, so re-apply the changes from RHEL 9 that are still relevant. Downstream branding will be different in RHEL 10, so it has been left out for now and will be handled in a separate issue. Resolves: RHEL-32989
