Edits based on DPS author inputs
Merge pull request #167 from cwingard/phsen-r2

CIDEVMI-1037 Edits PHWATER based on DPS author inputs