Merge "Don't add .vendor suffix for vendor-only modules"