Fixed remaining Coverity defects in waterml.
* Some defects were intentional or false positives. They were triaged in Coverity.
Merge branch '4.5.2' of https://github.com/Unidata/thredds into 4.5.2