Adjusting CHANGES
crofconn => fixed potential bug for error messages and features replies
Merge branch 'devel-0.5' of https://github.com/bisdn/rofl-core into devel-0.5
Fixed bug during OUTPUT action for unknown ports, that could lead to a leakage of PKTs in exceptional situations.
Merge remote-tracking branch 'origin/devel-0.4' into devel-0.5

Conflicts:
	src/rofl/datapath/pipeline/openflow/openflow1x/pipeline/of1x_action_pp.h
Merge remote-tracking branch 'origin/devel-0.5' into devel-0.6