diamond: use native Puppet types for collector vars

i.e., boolean true / false vs. 'true' / 'false'.

Change-Id: I6bb30a09a22eb19f658ab18da7a5a1d906e65a12
Merge "diamond: use native Puppet types for collector vars" into production