Merge pull request #3136 from mrunge/systemd_service