Fix: Use JDK 17 in GHA merge workflow