diamond: clean out collector enabled => true settings

Follows I8e574c362.

Change-Id: I8dc4d07c5372b11f894017f1fa14838d4d79792f