Merge changes from topics 'fix_dpdk', 'vlan_support'