fix import bugs
Merge branch 'v7-stable' into v8-stable
Merge branch 'v8-stable'
Merge branch 'master' of https://github.com/rsyslog/rsyslog-doc