BZ-996028: upgrading to ANTLR 3.5
(cherry picked from commit 2158315fbf0f186cb034b952fbc67665224f6be4)