fix rebasing cycle heads when not reaching a fixpoint#147061

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

lcnr:provisional-cache-woopslcnr/rust:provisional-cache-woopsCopy head branch name to clipboard