Fix tests, restart on removal, update from upstream

Pulls in changes from upstream/master and two outstanding PRs:

- https://github.com/puppetlabs-operations/puppet-rsyslog/pull/6
- https://github.com/puppetlabs-operations/puppet-rsyslog/pull/7