include ::diamond in ::diamond::collector

Otherwise the require => File['/etc/diamond/collectors'] is liable to fail.

Change-Id: Ibc4b98f99e7c79c3132edb09db1eab5da7d43875
Merge "include ::diamond in ::diamond::collector" into production