Fix the bug with vlan_id always equal 1 in Table 10 (VLAN) for the test case 'flows.PacketInIPTable' and the Copyright header in .abat-automerge

Change-Id: Ie131435cbb7bd18b7481c4a769eb70081e935438
2 files changed