Assorted bootstrap cleanups (step 1)#142303

bors merged 2 commits intorust-lang:masterrust-lang/rust:masterfrom

Kobzol:bootstrap-cleanup-1Kobzol/rust:bootstrap-cleanup-1Copy head branch name to clipboard