Change version of pom.xml to 2.8.5-SNAPSHOT
Change version of pom.xml to 2.6.13-SNAPSHOT
Merge branch 'branches/rudder/2.6' into branches/rudder/2.8