Fix CellName comparison bugs

Patch by tjake; reviewed by bes for CASSANDRA-7227
Followup commit to fix maven deps on boundary's NBHM for CASSANDRA-7128
Merge branch 'cassandra-2.1' into trunk