Fix the puppet, chief and development server.
Merge pull request #2512 from jezdez/sweet-jesus-cleanup

Fix the puppet, chief and development server.