CORE-4557:
* Updated some special case handling to be generalized toward the new
DiskResourceSelector interface