Merge "Chore: Update Sonar OpenJDK version"