Merge instead of making assumptions about deployments
Namespace aws and datadog configuration
Add openstdb port and address under collector
Change the paths in the template to take into account the new namespacing
Remove opentsdb from cf-jobs spiff template, this is now under collector
Bump src/cloud_controller_ng

Bump src/cloud_controller_ng:
  Michael Fraenkel:
     Prune failed delayed jobs periodically ( Travis Unknown )
  Alex Stupakov and David Sabeti:
     Merge branch 'pr/253' ( Travis Unknown )
  Matthew Sykes:
     Revert "Only reset TestConfig if it has changed since the last call" ( Travis Unknown )
     Ignore fake_service_broker method length ( Travis Unknown )
     Place org_with_default_quota in new IntegrationHelpers module ( Travis Unknown )
     Place FakeServiceBroker in class so the Sinatra app isn't in the test scope ( Travis Unknown )
     Only reset TestConfig if it has changed since the last call ( Travis Unknown )
  Troy Astle:
     Test syslog drain is absent when not returned ( Travis Unknown )
  trastle:
     V2 broker bindings should store syslog_drain_url ( Travis Unknown )

[#73904862]

Signed-off-by: Matthew Sykes <matthew.sykes@gmail.com>
Bump src/gorouter

Bump :
  src/gorouter:
     Retry on failed connects

Signed-off-by: Michael Fraenkel <fraenkel@us.ibm.com>
Bump packages/ruby

Bump :
  Dave Liebreich:
     use provided libyaml during compile
Bump src/cloud_controller_ng

Bump cloudfoundry/cloud_controller_ng:
  Joseph Palermo and Zach Robinson:
     Fix flaky specs ( Travis started: https://travis-ci.org/cloudfoundry/cloud_controller_ng/builds/28919332 )
     Fix flaky spec ( Travis started: https://travis-ci.org/cloudfoundry/cloud_controller_ng/builds/28918798 )
     Consolidate all Rspec.configure blocks into spec_helper ( Travis Failed: https://travis-ci.org/cloudfoundry/cloud_controller_ng/builds/28918445 )
     remove unnecessary test ( Travis Failed: https://travis-ci.org/cloudfoundry/cloud_controller_ng/builds/28915707 )
     Remove service_instances integration tests. ( Travis Success: https://travis-ci.org/cloudfoundry/cloud_controller_ng/builds/28914827 )
  Joseph Palermo:
     Remove savepoint: true from code and specs now that auto_savepoint works ( Travis Success: https://travis-ci.org/cloudfoundry/cloud_controller_ng/builds/28899127 )
     Upgrade Sequel ( Travis Unknown )
Update README.md to remove update_sub description

It seems update_sub has been removed since v162, need to clear readme to avoid misunderstanding.
Bump src/dea_next

Bump src/dea_ng:
  Matthew Sykes:
     Use thread join to avoid sleeping in the code ( Travis Unknown )
  Julz Friedman:
     Run signal handlers in a thread to prevent deadlocks ( Travis Unknown )

Signed-off-by: Michael Fraenkel <fraenkel@us.ibm.com>
Bump src/acceptance-tests

Bump :
  Matthew Sykes:
     Increase php push timeout to 6 minutes

Signed-off-by: Michael Fraenkel <fraenkel@us.ibm.com>
Merge pull request #433 from resouer/patch-3

Update README.md to remove update_sub description
Bump src/acceptance-tests, src/cloud_controller_ng

Bump :
  Matthew Sykes:
     Increase php push timeout to 8 minutes
Bump cloudfoundry/cloud_controller_ng:
  Matthew Sykes:
     Correct super delegation in model hooks ( Travis Success: https://travis-ci.org/cloudfoundry/cloud_controller_ng/builds/28986259 )
  Joseph Palermo and Zach Robinson:
     Pull RspecApiConfiguration out of before :all ( Travis Success: https://travis-ci.org/cloudfoundry/cloud_controller_ng/builds/28920648 )

Signed-off-by: Michael Fraenkel <fraenkel@us.ibm.com>
Merge remote-tracking branch 'origin/pr/424' into develop
Merge remote-tracking branch 'origin/pr/425' into develop
Revert "Merge pull request #433 from resouer/patch-3"

This reverts commit 871e001e49c6ee26db585ff429633510bc28c5ad, reversing
changes made to c4dfff2fe703fd05c4a9044b492d8e4abfb4ac6b.
Merge branch 'master' into develop
Revert "Revert "Merge pull request #433 from resouer/patch-3""

This reverts commit 32aaadba409083061b17a5ecca592c0928f07c43.
Bump src/dea_next

Bump cloudfoundry/dea_ng:
  Matthew Sykes:
     Use EM.schedule signal handlers to avoid thread safety issues ( Travis started: https://travis-ci.org/cloudfoundry/dea_ng/builds/29061107 )

[#72260198]

Signed-off-by: Michael Fraenkel <fraenkel@us.ibm.com>