Rollup merge of #142416 - Kobzol:bootstrap-cleanup-2, r=jieyouxu

Assorted bootstrap cleanups (step 2)

Very small improvements designed towards making bootstrap tests less hacky/special, and towards making it possible to run bootstrap tests in parallel.

Best reviewed commit by commit.

r? ``@jieyouxu``

Author: Kobzol