SBDEV_53. rebuilt the collector management to use better puppet practices and better written code.