Change version of pom.xml to 2.5.4-SNAPSHOT
Merge branch 'branches/rudder/2.5' into branches/rudder/2.6