Change version of pom.xml to 2.6.18-SNAPSHOT
Change version of pom.xml to 2.10.5-SNAPSHOT
Merge branch 'branches/rudder/2.6' into branches/rudder/2.10

Conflicts:
	pom.xml
Merge branch 'branches/rudder/2.10' into branches/rudder/2.11

Conflicts:
	pom.xml