Running the unit tests under the latest puppet fails because of
undefined resources. This change updates the references to use
collectors if they are optional or change the definitions in the files
for resources that are defined in the existing class.
Change-Id: I5506a563c459baf9d34246a1d517e07a82e0f36b
Closes-Bug: #1702964
08661e0fef