Merge "Wait for dns name reset in detach port operation" into mcp/caracal