of12/of13_translation_utils => ARP_SPA match => added mask value, strategy for ARP_TPA and ARP_SPA identical now
Merge branch 'devel-0.4' into devel-0.5

Conflicts:
	src/xdpd/openflow/openflow12/of12_translation_utils.cc
	src/xdpd/openflow/openflow13/of13_translation_utils.cc
Merge branch 'devel-0.5' into akoepsel/devel-0.5/pbb
of13_endpoint::handle_flow_stats_request() => added missing flags field to coflowstats instance
Merge branch 'devel-0.5' into akoepsel/devel-0.5/pbb
Merge branch 'devel-0.5' into akoepsel/devel-0.5/working
Merge branch 'akoepsel/devel-0.5/testing' into akoepsel/devel-0.5/pbb