City of Tshwane and Rand Water discuss resolution to water challenges