Fix for "carbon doesn't restart after a reboot"

Fixes: Bug#1091436
Fixed puppet-lint issues for the new code and for some part of the old code
Merge pull request #11 from cbpadman/bug1091436

Fix for "carbon doesn't restart after a reboot"