Merge "Restart Heka services when removing config files"