Merge "Revert "Chore: Remove ODL maven JDK11 job groups""