Fix check of KeyValidationClass and ComparatorType when moving to Cassandra 1.2