Improve IAuthority interface by introducing fine-grained access permissions and grant/revoke commands
patch by Pavel Yaskevich; reviewed by Yuki Morishita for CASSANDRA-4490
cqlsh: allow disabling colors.
Patch by Tyler Hobbs, reviewed by brandonwilliams for CASSANDRA-4634
small fix in permission checking in ClientState, related to CASSANDRA-4490
fix assumption error in CLI when updating/describing keyspace
patch by Pavel Yaskevich; reviewed by Dave Brosius for CASSANDRA-4322
Add sstablescrub to debian packaging

patch by slebresne; reviewed by jbellis for CASSANDRA-4642
cqlsh: sort columns so COPY TO -> FROM works.
Patch by paul cannon, reviewed by brandonwilliams for CASSANDRA-4594
cqlsh: suggesting cql3 to cql2 users when they get an error and their
statement appears to parse for cql 2, and vice versa.
Patch by paul cannon, reviewed by brandonwilliams for CASSANDRA-4454
cqlsh: flush capture output after every command.
Patch by paul cannon, reviewed by brandonwilliams for CASSANDRA-4073
cqlsh: combine multiline statements into single line history
Patch by Matthew Horsfall, reviewed by brandonwilliams for
CASSANDRA-4666
cqlsh: check for non-empty history file before loading
Patch by Brian O'Neill, reviewed by brandonwilliams for CASSANDRA-4669
Add ITransportFactory to cassandra-thrift jar
patch by Sam Tunnicliffe for CASSANDRA-4668
Automatic fixing of overlapping leveled sstables
patch by jbellis; reviewed by slebresne for CASSANDRA-4644
Revert "cqlsh: check for non-empty history file before loading"

This reverts commit 6a8ba07313e2fad8c5a6cf7566bbd77321274c60.
cqlsh: catch IOError on history loading
Patch by Aleksey Yeschenko, reviewed by brandonwilliams for
CASSANDRA-4669
increase long-test timeout
Backport proxyhistograms to 1.1, print zero instead of blank values.
Patch by Alexey Zotov, reviewed by brandonwilliams for CASSANDRA-4656
update nodetool ring description
patch by Alexey Zotov; reviewed by jbellis for CASSANDRA-4677
fix error when using ORDER BY with extended selections
patch by Pavel Yaskevich; reviewed by Sylvain Lebresne for CASSANDRA-4689
rename permission USE to DESCRIBE
patch by Pavel Yaskevich; reviewed by Yuki Morishita for CASSANDRA-4664
switch out Arrays.asList.toString for Arrays.toString
patch by yukim; reviewed by jbellis for CASSANDRA-4697