small changes puppetmaster
Merge commit '687598185bc3df0e89164ecbec33a9419a87cf3d'