Simplified branch name selection, make it work for 8.x-1.x projects.