Merge branch 'cassandra-3.0' into cassandra-3.11
authorAriel Weisberg <aweisberg@apple.com>
Wed, 9 Jan 2019 16:26:26 +0000 (11:26 -0500)
committerAriel Weisberg <aweisberg@apple.com>
Wed, 9 Jan 2019 16:26:26 +0000 (11:26 -0500)

Trivial merge