Merge branch hotfix/1.1.2

Change-Id: I6130a64f8c5cf06d6217e421f90c8c82b1dcddea
Fixed the gem to set the target correctly and only when requested.

[#35638855]

Change-Id: I13973d233b92474319ca190c504a62eed019de8d
Merge "Fixed the gem to set the target correctly and only when requested."
Revert "Fixed the gem to set the target correctly and only when requested."

This was supposed to go on the develop branch.

This reverts commit 63ce8896ddafc993d6924987cbeb0316176ab9c0
Merge "Revert "Fixed the gem to set the target correctly and only when requested.""
Revert previous 4 commits: 2 merges, 2 small changes

Change-Id: I6232b2331ef87767016111bfd6a7311574bc2ead
Revert "Revert previous 4 commits: 2 merges, 2 small changes"

This reverts commit 1889f76516898c41745c058e7ddbd96e72c7b313.

Change-Id: I23ed0be11e64842bb4f79a4383f575559b69909b
Merge branch 'release/1.2.0'

Change-Id: I4e3513a4b76a67c4e08309536141ba21785d3282
Merge branch 'release/1.2.1'

Change-Id: I5a2f09ba9f3668c983d5fb58d6aa611ce1407494
[cfid-157] Populate UaaUser.authorities from group_membership table instead of authorities field.

Requests to /oauth/authorize load a UaaUser object by directly accessing the users table.
After the addition of Scim Groups feature, the authorities field in the users table is
no longer kept in sync with the user's membership data. Hence, we get this info from the
group tables instead.

Fixes [#37075077].

Change-Id: I28b4beccc94ae87cf4fe3c389e497ac9bc27e4be
Merge "[cfid-157] Populate UaaUser.authorities from group_membership table instead of authorities field." into develop
[cfid-161] Disable userids id translation endpoint in the uaa by default

Fixes [#37118233]

Change-Id: Icb8ea5e45a3f8694e3ff9c91fd9fd75969c656c6
restore docs

reverted to rst: fixes tables, external links, autogenerated toc, and ability to diff previous versions.

Change-Id: Iee936f8ae0a20b3b2bdd592cf68a5499df98d2b3
Merge "[cfid-161] Disable userids id translation endpoint in the uaa by default" into develop
[cfid-157] Simplify JDBC query

[#37075077]

Change-Id: I78dcabbf9ccc6cdd333da2d63d37b4e75e6cf382
add autologin api

Also some bug fixes for groups
[delivers #36271013]
[delivers #36254029]

Change-Id: I1267edb98aa18881c09b85a375ab859a01696f88
Merge "restore docs" into develop
Merge "add autologin api" into develop
[cfid-46] allow for approvals to be finer grained

Accommodating some changes in SECOAUTH that will eventually
allow us to track approvals per scope in the authenticated
request.

[#35352667]

Change-Id: Ic8d9d00ff4d8c1559433797aaf47255fce55fed6
Bumped the version of the uaa to 1.2.2

Change-Id: I0d0c98f9c25de68cb459212137e72e34e2873bd4