Merge master to 2.11.x

```
% git show --oneline
972244d Merge pull request #3721 from lrytz/t7852

% export MB=$(git merge-base origin/2.11.x origin/master)

% git log --graph --oneline --decorate $MB..origin/master
*   b5392a0 (origin/master, origin/HEAD) Merge pull request #3704 from gourlaysama/wip/t8504
|\
| * c6b5028 (origin/pr/3704) SI-8504 fix NPE in the Java wrapper for a Scala Map.
*   6dd0a36 Merge pull request #3689 from xeno-by/ticket/8523
|\
| * 2d37cc0 (origin/pr/3689) makes bundles friendly to -Ywarn-dead-code
*   63b91bf Merge pull request #3706 from gourlaysama/wip/t8550
|\
| * b3243e8 (origin/pr/3706) SI-8550 fix scaladoc for the default s.c.LinearSeq.
*   a4e56ef Merge pull request #3711 from retronym/ticket/8549-2
|\
| * 2dbd269 (retronym/ticket/8549-2, origin/pr/3711) SI-6988 Test case for non-literal / non-constant SerialVersionUID
| * e7ab41e SI-8549 Enforce serialization stability for selected collections
| * ecbc9d0 SI-8549 Honour the @SerialVersionUID annotatation
*   e8ed2d2 Merge pull request #3703 from huitseeker/issue/SI-8537
|\
| * 8317266 (origin/pr/3703) SI-8537 Puts SI-8157 fix under Xsource
* e735cb3 Merge pull request #3576 from som-snytt/issue/8325
* b0fe135 (origin/pr/3576) SI-8325 Accept infix star type outside patterns

% git checkout -b merge/master-to-2.11.x
Switched to a new branch 'merge/master-to-2.11.x'

% git merge b5392a0
```

No conflicts