Watersmart 398 mergefix

I can't put my finger as to why, but the changes introduced in this merge: https://github.com/USGS-CIDA/nwc/pull/135 did not appear on canonical so I had to re-implement them with straight-up copypasta. I think this was due to a poorly done merge conflict resolution at some point after this was merged to canonical.