Corrected test failures
Conflicts:
	src/main/java/org/iplantc/core/uidiskresource/client/presenters/DiskResourcePresenterImpl.java