- Vlan tagged packets are handled different between 2.6 (Centos) kernel
and later kernels. To make handling uniform in all platforms, push the
vlan header in the packet for the later kernels

Change-Id: I06fe6bb06cd5ab483f88606a402f826510815cb5
- BUG:1337295- NULL terminate getopt_long option list

Change-Id: I50463864ef515d5706b0b27206d2583b83bbfca9
Merge "- BUG:1337295- NULL terminate getopt_long option list"