Merge into master from pull request #137:
update loxi to include disable_vlan_counters (https://github.com/floodlight/oftest/pull/137)