Fix ordering of static cells

patch by slebresne; reviewed by benedict for CASSANDRA-7763
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk