Carlsbad City Council approves zoning changes for housing