Change version of pom.xml to 2.4.7-SNAPSHOT
Change version of pom.xml to 2.4.6-SNAPSHOT
Merge branch 'branches/rudder/2.4' into branches/rudder/2.5

Conflicts:
	pom.xml
Merge branch 'branches/rudder/2.5' into branches/rudder/2.6