Bug 1120966 - delaying removal of 'local' puppet config files until after deployments completed
Merge pull request #413 from nhr/bug_1120966_v4

Bug 1120966 - delaying removal of 'local' puppet config files...