Add option to set Tomcat CATALINA_OPTS from properties.

Change-Id: I06e159fd6521ae65f419d525eeabfff9526ec76d
Add test marketplace for marketplace gateway bvt
 - Update appdirect template to generate empty file for test marketplace

 - Bump src/services pointer
   git shortlog 5ae6c5fd..aa8d7612
    Figo Feng (1):
      support restore mysql service if missing instance dir

    Harshawardhan Gadgil (2):
      Add unit tests for marketplace base code
      Merge "Add unit tests for marketplace base code"

Change-Id: Ia7c57ccf78b49a85fb163e1175bc66c4f2fbece4
disable filter of repeated msg for report processor to ease the traffic log processing.

Change-Id: Ibd91bf1063513b78aca0ba8ac6bc10e8c7f8831d
Merge "Add test marketplace for marketplace gateway bvt  - Update appdirect template to generate empty file for test marketplace"
Merge branch 'built'
Merge "disable filter of repeated msg for report processor to ease the traffic log processing."
Reset ephemeral port range when warden starts

Change-Id: I8f5d2eb8918f312fee8d12b3560e4e9535b572e5
Fix verbose logging of clienttraces in hadoop datanodes.

Change-Id: I162e89c8e0e603673048c088f67c3e7660ef8373
kill long mysql transactions, don't just log them

Change-Id: I2e237938a416347768d187600a00c403dfaa763c
Merge "Add option to set Tomcat CATALINA_OPTS from properties."
Merge "kill long mysql transactions, don't just log them"
Merge "Fix verbose logging of clienttraces in hadoop datanodes."
Bump cloud_controller

$ git shortlog 18703ef0..6be383ca
Pieter Noordhuis (1):
      Make /info/services accessible to everybody

Change-Id: Id2783c06f43f325ba8e92467eb62a23eb9263bfc
Merge "Bump cloud_controller"
Update the uaa to 1.2

Also includes
[cfid-132] Add userids_enabled to uaa job template
The property is scim.userids_enabled and defaults to 'false'.
It should not be enabled in production.

Shortlog of changes

Chloe Jackson (1):
      Updates for IE

Dale Olds (13):
      Added support for --vmc option to uaac
      start support for groups and general queries in uaa gem
      support saml login server, separate token_endpoint
      Merge "support saml login server, separate token_endpoint" into develop
      Fixed gem unit test, failing since last week. Fixed jenkins too.
      Fixed gem unit test, failing since last week. Fixed jenkins too.
      API updates related to user updates and groups
      Merge "API updates related to user updates and groups" into develop
      add output to aid bash tab completion
      Merge "add output to aid bash tab completion" into develop
      scriptability improvements for uaac
      Merge "scriptability improvements for uaac" into develop
      bug fixes for user/group APIs and CLI

Dave Syer (59):
      Update versions post 1.1.1
      CFID-246: re-order initialization callbacks
      CFID-400: initial re-org of spring config files
      Misc tidying (imports, spelling etc.)
      CFID-404: remove deprecated classes
      CFID-403: add docs for Login Server contract
      CFID-382: add maven enforcer plugin to fail with wrong mvn or JDK
      Merge "Updates for IE" into develop
      CFID-376: make public key accessible to all if set
      CFID-390: fix integration test (needs more work)
      CFID-400: fix ordering of token admin and client admin endpoints
      CFID-405: Tighten up Login Server authentication
      CFID-407,CFID-411: Token admin endpoints updates
      CFID-406: add UAA-specific authentication key generator
      CFID-399: change comment to reflect reason for catch
      Fix profiles in top-level POM to use postgres with -P vcap
      CFID-417: Use display instead of externalId
      CFID-419: tidy up maven dependencies
      CFID-389: add extra validation and default scopes and authorities
      Merge branch hotfix/1.1.2
      Fix scala version in gatling pom
      Hack on integration profile for login sample
      CFID-419: update httpcomponents so that login sample works
      CFID-403: enable login server to autoadd new account by default
      CFID-402: add groups.display support to SCIM /Users
      Update tests for changes to SECOAUTH
      CFID-405: one of the 401 that should be 302 is fixed
      CFID-402: /Groups/{group}/Users endpoint
      Merge "CFID-402: /Groups/{group}/Users endpoint" into develop
      CFID-402: add docs for /Groups/{group}/Users
      [#35598249] Conflicts uncommitted in gem (635ac69f)
      [Fixes #35655999] Gem does not strip "/" from target url
      Unify endpoint return codes and message bodies
      cfid-39: user id returned in the token to a user created by the login server
      [Fixes #35830651] [cfid-69] Runtime error in gem (frozen string)
      [#35832353] [cfid-71] investigate cause of problem
      [cfid-71] Add CORS filter to api sample
      [cfid-76] Add explicit session creation flag to login security config
      [cfid-72] Add option to configure authz filter to allow more HTTP methods
      [cfid-9] whitelabel the login sample
      [cfid-9] extract batch features into separate app
      [cfid-45] Extract SocialUserDetailsSource so it can be used later
      [cfid-97] update UAA API document
      Merge "[cfid-97] update UAA API document" into develop
      Fix really stupid typo in AuthzAuthenticationRequest
      Fix broken integration test
      Add /clientinfo endpoint
      [cfid-112] improve scim error reporting when bad field names
      [cfid-45] Fix app sample for previous changes
      [cfid-128] /home endpoint should redirect if unauthenticated
      Merge "[cfid-45] Fix app sample for previous changes" into develop
      Merge "[cfid-128] /home endpoint should redirect if unauthenticated" into develop
      [cfid-134] don't return bcrypted client secret from /authorize
      Fix compiler warnings
      [cfid-66] extract /healthz into a separate endpoint
      Return code for default vmc should be 302
      [cfid-144] Fix race condition when users are deleted during a filter operation
      [cfid-145] scim query startIndex always returns 1
      [cfid-138] ids/Users endpoint doesn't work in dev instance

Joel D'sa (5):
      Added support for a distinct token target
      Fixed breaking tests
      Fixed the gem to set the target correctly and only when requested.
      Updated the spring oauth2 version to release
      Updated the uaa to 1.2.0 for release

Luke Taylor (8):
      Fix minor rst error in zxcvbn link
      Add summary of lockout policy.
      Upgraded szxcvbn library to version 0.2
      Support for user data at password strength endpoint.
      Standardize authentication times.
      Merge "Standardize authentication times." into develop
      [cfid-113] Open access to /ids/Users endpoint.
      [cfid-113] change property name to userids_enabled

Vidya Valmikinathan (8):
      [#35352681] Add /Groups endpoints as defined in the SCIM spec.
      [#35952177] Add bootstrap support for groups and members.
      [#35953239] Add query filter support for /Groups endpoint.
      [#35953007] Sync ScimUser.groups field with group_membership table.
      Merge branch 'feature/groups' into develop
      [#36678769] Add tab-completion support for uaac
      Merge "[#36678769] Add tab-completion support for uaac" into develop
      Fix broken integration test - ScimUserEndpointsIntegrationTests

Change-Id: Iabaa34435bddaad77f1ffafb295ac289c350e096
Merge "Update the uaa to 1.2"