City of Joburg takes action to resolve water crisis