Fix for ROOT-6600 (improved version of FindPythi6 and Pythia8)