make Content arch compares more specific

Content for example, for 'i686' now only
matches 'i686' machines (no longer matches
as compatible with 'x86_64')

Add support for Content arch of 'x86' that
maps to i386,i486,i586,i686