bluenix: generalized branch-choice handling
bluenix channel builder: move to separate file
typo fixes
channel-builder: generalized branch-choices