Gauteng government unveils new measures to tackle water crisis