Merge "Wait for port status when getting IPv4 address" into mcp/xenial/rocky