of_tunnel_id support for OXM is added.
toString methods are overrided for ICMPv4Code and ICMPv4Type
javadoc updated.
tunnel_id oxm location in spec file is adjusted, and loci files are updated according to the change.
oxm tunnel_id is separated into oxm-1.3.
location of LOCI_SHOW_u64_tunnel_id macro is adjusted.
useless blank lines are removed.
Merge branch 'of_tunnel_id' into icmpv4_tostring
c_match.py is patched to name collision commented by @rlane
Merge into master from pull request #275:
Add more port counters. (https://github.com/floodlight/loxigen/pull/275)
java_gen: add PrimitiveSinkUtils
Merge into master from pull request #276:
java_gen: add PrimitiveSinkUtils (https://github.com/floodlight/loxigen/pull/276)
match.py merged by applying #274
Merge into master from pull request #272:
OF-1.3 OXM TUNNEL_ID (38) support and several enhancements (https://github.com/floodlight/loxigen/pull/272)
java_gen.PrimitiveSinkUtils - add putNullableTo
Merge into master from pull request #277:
java_gen.PrimitiveSinkUtils - add putNullableTo (https://github.com/floodlight/loxigen/pull/277)
java_gen.PrimitiveSinkUtils: add support for putting nullable Strings, better support for null

Based on a conversation with @rlane, prepend optional entries with a
presence bit + length instead of the null-byte delimitation.
Merge into master from pull request #278:
java_gen.PrimitiveSinkUtils: add support for putting nullable Strings, better support for null (https://github.com/floodlight/loxigen/pull/278)
wireshark: detect and skip obviously broken messages

When a TCP segment is lost Wireshark may attempt to start a PDU in the middle
of an OpenFlow message. This breaks framing and can make the rest of the
capture useless. These checks attempt to detect this and skip this segment,
hopefully restarting dissection at the beginning of the next message.
wireshark: use desegment_offset

If the second (or later message) in a segment needs to be reassembled from
further segments, it's not enough to tell wireshark how long the message is. We
also need to tell it what the offset is from the start of the current segment.