minor cosmetic fixes after merge from -experimental tree
minor cosmetic fixes after merge from -experimental tree

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