Merge "Fix building ves-openapi-manager image"