Merge commit '3b54b30e7663691e491819a0212d86d4fc4864cd' into production

Conflicts:
	modules/public/collectd/README.md
Add interval and timeout parameters
Merge remote-tracking branch 'prod/mergeme'