Merge "Don't add .vendor suffix for vendor-only modules" into oc-mr1-dev