2.1.6 backport commits #947

Job	Run time
archives-cache	4s
build (ubuntu-latest, 4.02.3)	9m 4s
build (ubuntu-latest, 4.03.0)	9m 39s
build (ubuntu-latest, 4.04.2)	9m 20s
build (ubuntu-latest, 4.05.0)	9m 46s
build (ubuntu-latest, 4.06.1)	9m 26s
build (ubuntu-latest, 4.07.1)	9m 6s
build (ubuntu-latest, 4.08.1)	3m 44s
build (ubuntu-latest, 4.09.1)	3m 56s
build (ubuntu-latest, 4.10.2)	4m 1s
build (ubuntu-latest, 4.11.2)	3m 33s
build (ubuntu-latest, 4.12.1)	3m 26s
build (ubuntu-latest, 4.13.1)	3m 30s
build (ubuntu-latest, 4.14.0)	3m 17s
build (ubuntu-latest, 5.0.0~beta2)	1m 34s
build (macos-latest, 4.12.0)	4m 12s
hygiene	14s
solvers (ubuntu-latest, 4.12.0, z3)	8m 33s
solvers (ubuntu-latest, 4.12.0, 0install)	8m 48s
test (ubuntu-latest, 4.12.0)	12m 20s
cold (ubuntu-latest, 4.12.0)	3m 28s
solvers (macos-latest, 4.12.0, z3)	7m 25s
upgrade (ubuntu-latest, 4.12.0)	2m 24s
test (macos-latest, 4.12.0)	24m 10s
solvers (macos-latest, 4.12.0, 0install)	6m 19s
upgrade (macos-latest, 4.12.0)	3m 21s
	2h 44m 40s

Provide feedback