Resolve Java 21 FTBFS

This MR resolves: 1057507

Changes:

• cherry-pick upstream patch that resolves the test failure due to Java 21 i18n changes.

Testing:

• rebuild in sid chroot
• rebuild in sid chroot with default Java 21