core-4876 fix ux issues
Merge branch 'master' of github.com:iPlantCollaborativeOpenSource/ui-disk-resource-module