CASSANDRA-361 cleanup left-over references to Cql Patch by Michael Greene (+ regeneration of thrift code); reviewed by eevans for CASSANDRA-361