Fix ColumnIdentifier comparison and use of equals for typed comparison

patch by slebresne; reviewed by benedict for CASSANDRA-7089
Merge branch 'cassandra-2.1' into trunk