Merge "Fix identification of address Cassandra is configured to listen to"