[backport-1.4]: cluster-garbage-collector isn't garbage-collecting XXXconfigtemplates and XXXMachineTemplates

Issue #1356 (closed) needs to be backported to 1.4.x