Cherry pick from master for collectd cookbooks

Change-Id: Iad37cbb8c3bda54f3873b094824772e6bb98cf65