Merge "Fix Java detection on some Linux distributions"