of12 OFPMatchField omit None mask from json output
of12 fix None mask omission
fix ofp class heuristic