Ministers are planning a shake-up of the water abstraction licensing system to ensure that the UK becomes more efficient in the way it uses water and manages supply.