Add internal-error tags to diagnostics in `mergeDefaultSetupAndUser…
#16173
| Job | Run time |
|---|---|
| 18s | |
| 56s | |
| 55s | |
| 1m 22s | |
| 1m 29s | |
| 1m 20s | |
| 1m 40s | |
| 0s | |
| 8m 0s |