[Bug 225937] Merge Review: jakarta-oro