Merge "Set default java-version for distro-check"