Merge "jdk error message should not mention the version"