Merge into master from pull request #96:
add vlan support to simple_arp_packet (https://github.com/floodlight/oftest/pull/96)