Merge "Change way how second NIC in guest OS is configured" into mcp/xenial/rocky