More fixes to simplify the simple case of only one file content type (CNY-3504)
More fixes to simplify the simple case of only one file content type (CNY-3504)

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