NBC: Houston lifts boil-water order affecting more than 2 million