misc bootstrap cleanups#113644

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

jyn514:bootstrap-cleanupsjyn514/rust:bootstrap-cleanupsCopy head branch name to clipboard