fix restarts on HA services
fix a foodcritic violation
cherry pick commits from grizzly
revert part of the change
Merge pull request #44 from rackerjoe/folsom

Merged automatically by jenkins after successful build test