Better exception msg for invalid CLUSTRING ORDER
Merge branch 'cassandra-1.2' into trunk