fix unit tests
Merge remote-tracking branch 'origin/target-4.3.16' into target-4.3.16
Do significant name management surgery
Merge branch 'dennis' of https://github.com/Unidata/thredds into dennis