Remove usage of deprecated AbstractAddStepHandler methods that reference ServiceVerificationHandler.
We also no longer need to collect the ServiceControllers of installed services.
Merge pull request #6798 from pferraro/clustering

Remove usage of deprecated AbstractAddStepHandler methods that reference ServiceVerificationHandler.