West Saint John homes could link to new water supply in two weeks