No matches were found for subject:"\[2\/6\] git commit\: Handle host id conflicts properly. Patch by brandonwilliams, reviewed by Tyler Hobbs for CASSANDRA\-6615"