branch merge from rBuilder 5.6.0 conary->conary 2.1
branch merge from rBuilder 5.6.0 conary->conary 2.1

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