Various fixups related to rhel-10 and deb-13 platforms#5928

craigcomstock merged 2 commits into

cfengine:mastercfengine/core:masterfrom

craigcomstock:ENT-13016/mastercraigcomstock/core:ENT-13016/masterCopy head branch name to clipboard