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