Change version of pom.xml from 2.5.0-SNAPSHOT to 2.5.0
Change version of pom.xml from 2.5.0 to 2.5.1-SNAPSHOT
Change version of scala-ldap tag in pom.xml from 2.5.0-SNAPSHOT to 2.5.1-SNAPSHOT
Merge branch 'branches/rudder/2.5'

Conflicts:
	pom.xml