Clean up to avoid unnecessary notices and service restarts
Merge pull request #366 from andrewklau/foreman_fixes

Clean up to avoid unnecessary notices and service restarts