fix unit tests;
add *.jpg to types of files rootController can handle
Merge remote-tracking branch 'origin/4.6.0' into 4.6.0

Conflicts:
	cdm/src/test/java/ucar/ma2/TestStructureArrayBB.java