Switched NFv5 query elements to IPFIX IEs
Merge branch 'master' of github.com:vbajpai/nfql
Merge branch 'master' of github.com:vbajpai/nfql

Conflicts:
	engine/scripts/queries/build-dns-udp.py
	engine/scripts/queries/build-http-tcp-session.py
	engine/scripts/queries/build-https-tcp-session.py
	engine/scripts/queries/build-mdns-udp.py
	engine/scripts/queries/build-tcp-session.py
Added IPFIX generated constants
Fixed asprintf() unchecked return warnings
IPFIX support - initial version
Added trace-20[09|12] data in silk, IPFIX formats
Finished libfixbuf adapter implementation
Preparing ft/ipfix IO wrapper
Implemented flow-tools IO wrapper
Ported ft calls to io_handler calls.
Moved aggregation start / end TS behind IO API
Finished flow-tools IO handler
IPFIX I/O handler - initial version
IPFIX support for reading
IPFIX support for writing
Fixed fixbuf templ ref_count race
Fixed gerror memory leak
IPFIX print fmt changes
Fixed prot field length bug