Merge "Revert "Setting Java 11 as the default version""