Rawalpindi water supply system to be overhauled