fix merge-created bad map key lookup type
Merge branch 'cassandra-2.1' into trunk