[BETA] backports to appease CI#6635

bors merged 2 commits intorust-lang:rust-1.33.0rust-lang/cargo:rust-1.33.0from

ehuss:beta-1.33-fixupehuss/cargo:beta-1.33-fixupCopy head branch name to clipboard