Remove LDAP configuration from login server
https://www.pivotaltracker.com/story/show/70410348
[#70410348]
Merge branch 'develop' into feature/remove_ldap_keystone

Conflicts:
	pom.xml
Remove the keystone authentication manager
Login Server can pass along username/origin or user_id to the UAA.This way login-server can support multi tenancy through external authentication mechanism.
The UAA needs an origin to properly retrieve a user from the DB. If origin flag is missing, default is used, as login-server. This may go away in the future and the parameter become required.
Merge branch 'feature/remove_ldap_keystone' into develop
Bump for new major release containing UAA/LDAP origin and approvals changes/refactoring