Merge "Mark Vpnaas4in4 as smoke remove unstable tag" into mcp/caracal