Fix repository config files
Add a new repo called next to point to 2.6.0-RC and reduce differencesbetween branches