Disable module incompatibility with nDPI
Merge branch 'jag/poc-traffic-control' into poc

Conflicts:
	main/trafficshaping/ChangeLog