Gauteng and Free State tap water safe to drink despite cholera outbreak, govt says