Water-shortage bill and revised workforce-housing policy receive initial OK