rebase
[PATCH] packet lib: dhcp: use text addresses and so on
[PATCH] RFC: packet lib supports json conversion
Merge branch 'master' into igmpv3

Conflicts:
	tests/unit/packet/test_igmp.py