Shimla to have water supply and sewerage circle