Change version of pom.xml to 2.6.17-SNAPSHOT
Change version of pom.xml to 2.9.8-SNAPSHOT
Merge branch 'branches/rudder/2.6' into branches/rudder/2.9

Conflicts:
	pom.xml
	rudder-core/pom.xml
	rudder-web/pom.xml
Merge branch 'branches/rudder/2.9' into branches/rudder/2.10