Merge instead of making assumptions about deployments

Hello!

Simple PR to merge collector in the spiff-templates instead of making assumptions about deployments.

We use Graphite[1] and we need to merge, otherwise we have to manually alter the manifest after generating it.

Have a nice day,
Simon.

[1] not datadog nor tsdb, therefore we do not want them mentioned in our manifest