Fix aggregation fn on empty selection, column names

Patch by Benjamin Lerer; reviewed by Tyler Hobbs for CASSANDRA-8229
Fix ordering on SSTableScanner / SSTableReader close

Patch by jmckenzie; reviewed by marcuse for CASSANDRA-8019
Merge branch 'cassandra-2.1' into trunk