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/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>
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