Merge remote-tracking branch 'remotes/Unidata/4.5.4' into gradle

Conflicts:
	ui/build.gradle
Merge branch '4.5.4' into gradle

Conflicts:
	ui/build.gradle
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
Update Gradle build for 4.5.4.
Oops, forgot to add dap4 gradle files.
Merge branch '4.5.4' of https://github.com/Unidata/thredds into 4.5.4