I have a quick answer for you.
It was not discussed in TPP. Water is not a good under a trade agreement. The only time water becomes a good is if you put it in a bottle, put a fancy label on it, and charge $5. Then water is a good. Bulk water is not considered a good under a trade agreement, and so it is not susceptible to these rules.