Make command-line macros take precedence over file macros (CNY-1062)
Make command-line macros take precedence over file macros (CNY-1062)

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