Correct scala_ldap version in pom.xml
Merge branch 'branches/rudder/2.5'

Conflicts:
	pom.xml