Merge branch 'master' into collectd

Former-commit-id: cc87b3ae

roles/collectd/templates/collectd.conf.j2

@@ -76,6 +76,8 @@ LoadPlugin network
 </Plugin>
 <Plugin network>
     <Server "{{ collectd_server }}" "25826">
+    Username collectd
+    Password "{{ collectd_password }}"
     </Server>
 </Plugin>
 
@@ -1395,7 +1397,3 @@ LoadPlugin users
 #	Port "2181"
 #</Plugin>
 
-<Include "/etc/collectd/collectd.conf.d">
-	Filter "*.conf"
-</Include>
-