of13_translation_utils.cc => removed FIXME
adjusting xdpd to changes in class caddress (intermediate commit, does not compile)
Merge branch 'devel-0.5' into akoepsel/devel-0.5/working
Merge branch 'akoepsel/devel-0.5/testing' into akoepsel/devel-0.5/caddress

Conflicts:
	src/xdpd/openflow/openflow10/of10_translation_utils.cc
adjusted xdpd to changes in class hierarchy caddress
Merge branch 'devel-0.5' into akoepsel/devel-0.5/caddress