Eyeing recovery of Rs 6,000 crore, Delhi extends water bill late payment waiver