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: Ic91a8d577675fd1f2fb21543320426bfe49b1a2e
Closes-Bug: #1702964