fix merge conficts with packet_out_with_packet_in branch
Merge pull request #70 from iHiroakiKawai/fix_merge_metadata

fix merge conficts with packet_out_with_packet_in branch