Don't use _ as a reference
Merge branch 'trunk' of https://git-wip-us.apache.org/repos/asf/cassandra into trunk