Fix AIOOBE when building syntax error message

Patch by Benjamin Lerer; reviewed by Tyler Hobbs for CASSANDRA-8455
Merge branch 'cassandra-2.1' into trunk

Conflicts:
	src/java/org/apache/cassandra/cql3/ErrorCollector.java
	test/unit/org/apache/cassandra/cql3/ErrorCollectorTest.java