Electricity and water supply expected to be restored in the Joburg CBD by Monday