Be a little more robust in identifying matches between devices. When partitioning goes belly-up you end up with partitions that have names like 'req1' and that was preventing us from replacing those devices in the selectors with the ones from the backup tree which is put into place as part of error recovery.