add unit test for DiskResourceUtil
Merge branch 'dev' of github.com:iPlantCollaborativeOpenSource/DiscoveryEnvironment into dev