update branch selection code to use new flavor API
update branch selection code to use new flavor API

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