Do less work when there are no dropped columns present
Merge branch 'cassandra-2.0' into trunk