Merge conflicts between 2.34 and 2.39, and regen for x86_64
branches: 1.1.2;rename libctf to libgnuctf to avoid conflict with the sun version.