[1/2] git commit: Fix bad merge (commit: 88b9d95165b5f83896be740bcfff260ff8e2009d)

Fix bad merge (commit: 88b9d95165b5f83896be740bcfff260ff8e2009d) Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/444a5515 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/444a5515 Diff: http://git-wip-us.apa

[1/2] git commit: Fix bad merge (commit: 88b9d95165b5f83896be740bcfff260ff8e2009d)

Fix bad merge (commit: 88b9d95165b5f83896be740bcfff260ff8e2009d) Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ad980210 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ad980210 Diff: http://git-wip-us.apa