Upstream some redundant diffs fixed in Valhalla

[liach]

In the lworld diff review for java.base, some diff are identified problems with mainline and best upstreamed to mainline than reverted in lworld.

---

Progress

• Change must be properly reviewed (1 review required, with at least 1 Reviewer)
• Change must not contain extraneous whitespace
• Commit message must refer to an issue

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/29944/head:pull/29944
$ git checkout pull/29944

Update a local copy of the PR:
$ git checkout pull/29944
$ git pull https://git.openjdk.org/jdk.git pull/29944/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 29944

View PR using the GUI difftool:
$ git pr show -t 29944

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/29944.diff

[bridgekeeper]

👋 Welcome back liach! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

[openjdk]

❗ This change is not yet ready to be integrated.
See the Progress checklist in the description for automated requirements.

[openjdk]

@liach The following labels will be automatically applied to this pull request:

• core-libs
• javadoc

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing lists. If you would like to change these labels, use the /label pull request command.

[RogerRiggs]

Nice cleanup.