Merge branch 'hotfix/1.2.4'

Change-Id: I3543026721802bb999083918d60c292c403da8f8
[cfid-227] User bootstrap fails if user already exists

The scim.user.override flag if false (the default) causes
the bootstrap to blow up.  Fixed the logic so it doesn't.

[Fixes #38273911]

Change-Id: I5d20c72823b7749de8508d347edb5f933673e961
Change to get the UAA to return a json error response to vmc

This is a hack to workaround vmc sending an incorrect
xml accept header it's inability to handle the response.

We will revert this at a later time.

Change-Id: I8009a2abfe4580a83b3937972a7ce1f9aef5bbf3
Bump the UAA to version 1.2.5

Change-Id: I92623d6479bfe7794b9ac9dc537b0f5dbaa719e5
Merge branch 'hotfix/1.2.5'

Change-Id: Ie5da011c56aa9126442c9a13cbfa7a25cea54948
Presentation on the UAA and it's features

Change-Id: I0e6a16b231ecf00c1eee691fd007740674a8ce4e
[cfid-300] Retain user authorities from database in login authentication

[Fixes #39194235] [cfid-300] User authenticated by Login Server only has restricted authorities (uaa.user)

Change-Id: I3cda5be69e57f5f23bd149fc227aba8e1495d048
Bump UAA version to 1.2.6

Change-Id: I9fa7786a1ec7567683df6f7fa4d6b74f592102de
PDF version of the UAA presentation

Change-Id: I122a222d2628b62fb961fc89dc3f4d3d1e0512e5
Merge branch 'release/1.3.1'

Conflicts:
	common/pom.xml
	common/src/main/java/org/cloudfoundry/identity/uaa/authentication/AuthzAuthenticationFilter.java
	gem/lib/uaa/version.rb
	pom.xml
	samples/api/pom.xml
	samples/app/pom.xml
	samples/login/pom.xml
	samples/pom.xml
	uaa/pom.xml

Change-Id: I48acdd2693e7a1b34ccf250c1fe1aa2c85634765
Update LICENSE and NOTICE
Remove stale LICENSE.txt and NOTICE.txt
Fix for wrong SECOAUTH 1.0.0 jar in spring repo

Change-Id: Ic7925ba0823e27fab7df9362f4d262e77e28413a
Update README.md
[cfid-616] Ensure vmc works with sample api

[#44453639] [cfid-616] Switching authentication manager in the login server only works for webapp
Update README.md
Bug fix to the approval check during access token refresh

The update date was not being set correctly.
Fix sample app so it has a link to approvals UI
Expand information available from RemoteTokenServices

[Fixes #44528237] Support resource servers that want more information from tokens
Fix license header