typedefs.h: include sys/types.h instead of unistd.h to get off_t
Merge branch 'v7.4.7-patched' of https://github.com/kjurak/rsyslog into v7-stable
Merge branch 'v7-stable' into v7-devel

Conflicts:
	runtime/typedefs.h