syslog-ng 3.6

Revert the revert in 8e1072fd60f9dcf5eac0bb2d604258f121b658d8 and fix the `syslog-ng-incubator` build to work with syslog-ng 3.6