Merge "Fixed vlan xml and host routes"