Fix errors in default user-context
fixed spring dependencies, addresses #594
Merge remote-tracking branch 'upstream/master'

Conflicts:
	ldap-server-overlay/src/main/webapp/WEB-INF/user-context.xml