Merge FileImageDescriptor into URLImageDescriptor and clean it up#2899

HannesWell merged 1 commit intoeclipse-platform:mastereclipse-platform/eclipse.platform.ui:masterfrom

HannesWell:unify-ImageDescriptor-logicHannesWell/eclipse.platform.ui:unify-ImageDescriptor-logicCopy head branch name to clipboard