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
diff --git a/ofdpa/flows.py b/ofdpa/flows.py
index a2f725d..1b6d2d4 100755
--- a/ofdpa/flows.py
+++ b/ofdpa/flows.py
@@ -186,7 +186,7 @@
                 l3_msg = add_l3_unicast_group( self.controller, port, vlanid=vlan_id, id=vlan_id,
                         src_mac=intf_src_mac, dst_mac=dst_mac )
                 # add vlan flow table
-                add_one_vlan_table_flow( self.controller, port, vlan_id, flag=VLAN_TABLE_FLAG_ONLY_TAG )
+                add_one_vlan_table_flow( self.controller, port, vlan_id=vlan_id, flag=VLAN_TABLE_FLAG_ONLY_TAG )
                 # add termination flow
                 add_termination_flow( self.controller, port, 0x0800, intf_src_mac, vlan_id )
                 # add unicast routing flow