JDK-8255032: Conflict between recent pushes breaks the build #752
The patch resolves a bad merge between two recent changes.
@jonathan-gibbons This change now passes all automated pre-integration checks.
After integration, the commit message for the final commit will be:
At the time when this comment was updated there had been no new commits pushed to the