More fixes for supporting ARP match fields with OF 1.0