rcstream: un-comment diamond collectors

..now that diamond has been packaged for trusty.

Change-Id: I2dcff4acefeb9148dffca4f9467c4a66700f9a83
Merge "rcstream: un-comment diamond collectors" into production