Fixed a couple bugs in the WaterML writer.
Merge branch '4.5.2' of https://github.com/Unidata/thredds into 4.5.2