Avoid build failure due to ANTLR timeout

Patch by Ben Chan; reviewed by Tyler Hobbs for CASSANDRA-6991
Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk