Include environment in rsyslog server searches, correct search for rsyslog port attribute
Merge pull request #22 from JimmyMcCrory/issue-862

Merged automatically by jenkins after successful build test