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