F/3.6compat fixes

This branch makes the incubator to compile with syslog-ng 3.6 (latest master)