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