change NBHS in ARR to CLQ
patch by bes; reviewed by jbellis for CASSANDRA-7116
merge from 2.1