Merge branch 'release/1.1.2'
Allow identity.version to pick out UAA to run with tomcat

Change-Id: I94437b2b4fd6428d1df017113f67921a972b4752
Merge branch 'hotfix/guide'

Change-Id: Ie53b54801928c320f11e6e6c720c7de15784cf3e
Merge branch 'release/1.2.0'
Fixed the appearance of the delete button on the approvals page

Change-Id: I1cfdb41bfe772bbd4f78072eabf7b873778def7d
Merge branch 'develop'

Change-Id: Ic3448dfe0f208a633d9d49da79547fa7edcc06c7
Update pom to post-release snapshot version
[cfid-669] Add UsernamePasswordExtractingAuthenticationManager

[#45987701] Login server changes to support vmc and LDAP
Remove vmc headers to prevent duplicates
[cfid-669] Add ldap profile and test case for context

The war now contains all the ldap dependencies and there is a
Spring profile cdalled "ldap" that switches it on for authentication
only. The LDAP query might need to be tweaked and there is a
URL externalized to `ldap.base.url`.

[Fixes #45987701] Login server changes to support vmc and LDAP
[cfid-578] change /approvals URL to /profile

Also added missing unit test

[Fixes #43815941]
[cfid-453] [cfid-668] Re-organize links on UI

Some had the wrong base url, so were opening a new window.  Fixed all that
and added a local profile to pom for testing in localhost:8080/ (root context).

[Fixes #41714353] [cfid-453] login server forgot pw link should open in current window
[Fixes #45878445] [cfid-668] reset password link on approvals management page doesn't use configurable link
Merge branch 'master' of github.com:cloudfoundry/login-server into develop
Merge branch 'develop' of github.com:cloudfoundry/login-server into develop