[Bug 225940] Merge Review: javacc