HHH-8288 Upgrade to Javassist 3.18