Merge pull request #217 from pminutillo/master

BISERVER-8426, BISERVER-7561, BISERVER-7858 LDAP Configuration
Update repository.spring.xml

Removing the merge <<<
BISERVER-8436 - Updated another repository.spring.xml with new properties