Improve schema merge performance

patch by Aleksey Yeschenko; reviewed by Sylvain Lebresne for
CASSANDRA-7444
Merge branch 'cassandra-2.1' into trunk