J&K & Haryana to give tap connections till 2022