ldap props

Conflicts:
	eperusteet/src/main/resources/oph-configuration/eperusteet.properties.template