Merge "Revert^2: "Setting Java 11 as the default version""