Merge "Workaround a bug in the JavaParser 3p library"