Merge "Add workaround for issue with deletion of TF security-group" into mcp/caracal