Merge 2.10.x


review by @paulp for:
```
    def unexpandedName(name: Name): Name = name lastIndexOf "$$" match {
      case -1 | 0 => name
```

review by @retronym for UnCurry conflict