r/m unused HeaderTypes class (CASSANDRA-6743)
Merge branch 'cassandra-2.0' into cassandra-2.1