BZ-996028: upgrading to ANTLR 3.5
(cherry picked from commit 1a28d31fab6fe441df3b718d2539233d012d0435)