Fix 32-bit packages of different arches than the CPU arch

This fixes an issue in which i386 packages were being identified as
pkgname.i386 on an i686 CPU.
Merge pull request #11909 from terminalmage/issue11822

Fix 32-bit packages of different arches than the CPU arch on 32-bit RHEL/CentOS