BZ-996028: upgrading to ANTLR 3.5