Merge "Rework the way Java version is set in CSIT jobs"