apply new ruby branch naming scheme, fix #2473