Merge "Add neutron_enable_vlan_aware_vms option"