Add osarch grain
Properly handle 32-bit packages for debian32 on x86_64
Merge pull request #6647 from terminalmage/issue6607

add osarch grain and fix debian32 on x86_64