coxmatch.h => clean-up on output operators
Merge branch 'devel-0.4' into devel-0.5

Conflicts:
	src/rofl/common/openflow/coxmatch.h
Merge branch 'akoepsel/devel-0.5/working' into akoepsel/devel-0.5/testing
Merge branch 'akoepsel/devel-0.5/testing' into akoepsel/devel-0.5/pbb