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

Conflicts:
	pom.xml
Change version of pom.xml to 2.6.10-SNAPSHOT
Merge branch 'branches/rudder/2.6' into branches/rudder/2.7

Conflicts:
	pom.xml