Merge "Fix network configuration in contrail labs"