Mashatile says government is resolving water crisis affecting Durban, Joburg