unit test for DiskResourceUtil
core-5341 add scrollbars for treeviwer tab
Merge branch 'dev' of github.com:iPlantCollaborativeOpenSource/DiscoveryEnvironment into dev