Kelantan’s water woes to end by 2023, says minister