[Bug 225940] New: Merge Review: javacc