Fix FileLock path tracking after rename in package operation#16036

weihanglo merged 2 commits intorust-lang:masterrust-lang/cargo:masterfrom

kurasaiteja:bugfix/#7863kurasaiteja/cargo:bugfix/#7863Copy head branch name to clipboard