Merge pull request #14923 from Djelibeybi/fix14905

Switch to using only the RPM command to determine the distro version.