Change version of pom.xml to 2.6.1-SNAPSHOT
Change version of pom.xml to 2.5.4-SNAPSHOT
Merge branch 'branches/rudder/2.5' into branches/rudder/2.6
Merge branch 'branches/rudder/2.6'
Switching to 2.7.0~alpha1-SNAPSHOT