Merge branch 'hotfix/1.9.1'
Merge branch 'releases/1.10'
partial response for id_token hybrid flow for client without implicit grant [#83897020]
https://www.pivotaltracker.com/story/show/83897020

Configurable via oauth.openid.fallbackToAuthcode

Signed-off-by: Jesse Zhang <jzhang@pivotal.io>
Add 'default' profile to ensure tests are run on Travis
Only append client_id a resource id if it is not null
https://www.pivotaltracker.com/story/show/84043514
[#84043514]
Merge branch 'feature/fix_jdbc_profile_for_tests' into develop
https://www.pivotaltracker.com/story/show/84043514
[#84043514]
Merge branch 'hotfix/lenient_hybrid_flow' into develop
- Bump next developer version

Signed-off-by: Madhura Bhave <mbhave@pivotal.io>

Conflicts:
	gradle.properties
	uaa/src/test/java/org/cloudfoundry/identity/uaa/mock/token/TokenMvcMockTests.java
Remove profile requirement from JDBC test
Remove @ContextConfiguration, since the annotation web application context does not properly get refreshed and destroyed between tests
https://www.pivotaltracker.com/story/show/84043514
[#84043514]
Merge branch 'feature/fix_jdbc_profile_for_tests' into develop
migration scripts for hsql and mysql. postgres script still needed.
tables identity_zone, identity_provider and client_idp created, added
column oauth_client_details.identity_zone_id, added column
users.identity_provider_id.
removing ENGINE/charset declaration to conform with previous migration
scripts
Using SchemaSpy to generate diagrams. We had to manually add FK
constraints to create the relationships in the diagram; they won't be in
the actual DB.
postgres migration script is almost exactly like hsqldb
cleaning up id columns in mysql. Not sure if this is needed in postgres.
oops. renamed file to .sql
added validation routine which will error out if any id column data
won't fint into char(36) ascii
[#81978984] Added metadata fields to the migrations for creating the identity-zone and identity-provider tables.
Update MultitenantMigrator to insert metadata fields

Signed-off-by: Madhura Bhave <mbhave@gopivotal.com>
Added identity_provider relationship to group_membership to deprecate
group_membership.origin
running the UUID column cleanup in a JdbcMigration so the application
can continue to start up in case of error. If validation fails, you'll
see a WARN level log, eg:
https://gist.github.com/xtreme-will-tran/63bad757093285ef78c0
dropping unique index users.(username,origin)