Up timeout for requests to service broker to 70s

[Finishes #63937406]
Fix configuration bug with syslog_aggregator
Allow manifest stub to override nats templates (used to disable nats_stream_forwarder)
Create uaa client for cc service client creator and pass to cc config
[#58040510]

Conflicts:
	jobs/cloud_controller_ng/spec
	jobs/cloud_controller_ng/templates/cloud_controller_ng.yml.erb
Make cc_service_broker_client optional
Bump src/cloud_controller_ng

Bump cloudfoundry/cloud_controller_ng:
  David Stevenson and Zach Robinson:
     Merge branch 'master' of github.com:cloudfoundry/cloud_controller_ng ( Travis Success: https://travis-ci.org/cloudfoundry/cloud_controller_ng/builds/19352692 )
     Merge branch 'services-fork' ( Travis Unknown )
  Tammer Saleh:
     Rename job_name to job_name_in_configuration for clarity [#62361748] ( Travis Success: https://travis-ci.org/cloudfoundry/cloud_controller_ng/builds/19351750 )
  Ruth Byers:
     Use TimeoutJob wrapper in Enqueuer ( Travis Success: https://travis-ci.org/cloudfoundry/cloud_controller_ng/builds/19303620 )
  Eric Malm:
     Create TimeoutJob wrapper for Delayed::Job ( Travis Unknown )
  Alex Stupakov and Ryan Moran:
     Provides better error messages for validations ( Travis Success: https://travis-ci.org/cloudfoundry/cloud_controller_ng/builds/19204456 )
     Refactors ServiceInstance controller internals ( Travis Unknown )
     Adds endpoint for bulk updating service instances ( Travis Unknown )
  Christopher Jobst and Ryan Moran:
     Fix service_plan urls returned from spaces controller ( Travis Unknown )
     Adds new permissions endpoint for service instances ( Travis Unknown )
     Reduces possible test pollution from fake servers ( Travis Unknown )
     Change the error for non-unique service labels to match the desired error. ( Travis Unknown )
  Alex Stupakov and Matt Royal:
     v2 service labels are unique scoped to v2 services ( Travis Unknown )
  Matt Royal and Zach Robinson:
     Return the number of instances moved [#63080352] ( Travis Unknown )
  David Sabeti and Derek Richard:
     Show an error when service ids are not unique within a catalog ( Travis Unknown )
     Do not show duplicate error messages ( Travis Unknown )
     Add api doc specs for service_plans [finishes #61862446] ( Travis Unknown )
     Add services api spec for docs [#61862446] ( Travis Unknown )
     Rename dashboard_client_id to sso_client_id ( Travis Unknown )
  Zach Robinson and alex choi:
     Update error messages [#65060492] ( Travis Unknown )
     Brokers can have a uaa client created by requesting it in their catalog  [#58040510] ( Travis Unknown )
     Add dashboard_client_id to service model [#58040510] ( Travis Unknown )
  David Sabeti, Ryan Moran, Zach Robinson and alex choi:
     Add uaa client info to configuration [#58040510] ( Travis Unknown )
  David Sabeti, Matt Royal and alex choi:
     Add migration to reset service provider default for mysql ( Travis Unknown )
  Ryan Tang:
     Merge remote-tracking branch 'origin/master' into services-fork ( Travis Unknown )
  Matt Royal and alex choi:
     Merge remote-tracking branch 'origin/master' into services-fork ( Travis Unknown )
  Christopher Jobst and Matt Royal:
     Add 'purge' parameter to DELETE /v2/services/:guid ( Travis Unknown )
  David Sabeti and Ryan Moran:
     Do not export system_env_json with get /v2/app/:guid response [finishes #55332776] ( Travis Unknown )
  Matt Royal and Max Brunsfeld:
     /v2/services can be filtered by label and provider ( Travis Unknown )
  Kris Kelly:
     Add default value for maximum_app_disk ( Travis Unknown )
  Matt Royal and Ryan Moran:
     Update catalog, plan, service validation errors ( Travis Unknown )
Merge branch 'develop' of github.com:cloudfoundry/cf-release into develop