simplify: prefer containsKey(x) to keySet().contains(x)
Merge branch 'cassandra-1.2' into cassandra-2.0