Various fixes
    
    - Update UID classification patch to match Rawhide
    - Drop conflicts/provides/obsoletes on epel-systemd-rpm-macros as
    it only existed on CentOS Stream 8
    - Drop 'v' from version to match Rawhide.
    - Add conditional grubby/sdubby version depends again to match Rawhide.