Fixing reverse packet matches bug in ARP values for OF1.2/OF1.3
Merge branch 'devel-0.5' into devel-0.6

Conflicts:
	CHANGES