make Arch.x86.x86_64 deprecated, add Arch.x86_64
make Arch.x86.x86_64 deprecated, add Arch.x86_64

fedora-conary/conary,fedora-conary/conary,fedora-conary/conary,fedora-conary/conary,fedora-conary/conary