fix / remove unit tests
Merge remote-tracking branch 'origin/4.5.4' into 4.5.4

Conflicts:
	cdm/src/test/java/ucar/nc2/util/cache/TestNetcdfFileCache.java