Nodetool rebuild_index requires named indexes argument

patch by Stunnicliffe reviewed by dbrosius for cassandra-7038
Merge branch 'cassandra-1.2' into cassandra-2.0
Nodetool rebuild_index requires named indexes argument

patch by Stunnicliffe reviewed by dbrosius for cassandra-7038
fix bad merge
Merge branch 'cassandra-2.1' into trunk