City of Tshwane makes major headway in addressing Hammanskraal water crisis