Merge pull request #485 from LinkMJB/master

(MODULES-10636) Fixed mcollective being included as a default service to manage, in clientversion >= 6.0.0

Author: GabrielNagy

manifests/service.pp

@@ -7,7 +7,7 @@
   assert_private()
 
   # Starting with puppet6 collections we no longer carry the mcollective service
-  if $::puppet_agent::collection != 'PC1' and $::puppet_agent::collection != 'puppet5' {
+  if versioncmp("${::clientversion}", '6.0.0') >= 0 {
     $_service_names = delete($::puppet_agent::service_names, 'mcollective')
   } else {
     $_service_names = $::puppet_agent::service_names