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
Merge remote-tracking branch 'origin/pr/424' into develop
Merge remote-tracking branch 'origin/pr/425' into develop