We will keep groovy-devel as the only branch.