Merge "Don't merge /etc/collectd.d" into stable/rocky

docker/services/metrics/collectd.yaml

@@ -84,6 +84,10 @@ outputs:
               dest: "/"
               merge: true
               preserve_properties: true
+            - source: "/var/lib/kolla/config_files/src/etc/collectd.d"
+              dest: "/etc/"
+              merge: false
+              preserve_properties: true
           permissions:
             - path: /var/log/collectd
               owner: collectd:collectd