Add IPv4 and IPv6 Data packets
Merge branch 'upstream2' into sflow4

Conflicts:
	lib/em-sflow/packet/ipv4_data.rb
	lib/em-sflow/packet/ipv6_data.rb