Create netmap feature for 3.5
Merge branch 'master' into Enhancement_improve_--mbps_option_stability_and_performance

Conflicts:
	src/Makefile.am
	src/send_packets.c
	src/sleep.c
	src/sleep.h
	src/tcpreplay.c