Add support for diagnostic tags, and use them for mergeDefaultSetupAndUserConfigs
#10502
| Job | Run time |
|---|---|
| 4m 53s | |
| 9m 41s | |
| 6m 30s | |
| 4m 21s | |
| 3m 43s | |
| 4m 39s | |
| 9m 54s | |
| 9m 9s | |
| 4m 30s | |
| 7m 16s | |
| 3m 43s | |
| 9m 39s | |
| 9m 40s | |
| 7m 7s | |
| 4m 29s | |
| 4m 10s | |
| 6m 44s | |
| 4m 16s | |
| 1h 54m 24s |