make constant, static
minor removal of dead code
patch by dbrosius reviewed by jbellis for CASSANDRA-5463
Merge branch 'cassandra-1.1' into cassandra-1.2
fix bad automatic merge