Editor's drafts for boucadair-patch-3 branch of boucadair/simple-ipfix-fixes