IpfixFlowInspectorExporter: use IPFIX names instead of legacy names
Make injectUDPToCollector compile on OS X/FreeBSD
Merge branch 'merge-features' of github.com:constcast/vermont into merge-features

Conflicts:
	src/modules/ipfix/database/IpfixFlowInspectorExporter.cpp