remove unused compaction controller field from Unwrapper iterator
Merge branch 'cassandra-1.2' into trunk