Deleted unnecessary /^sameas:disk(\d+)/ block
Fix resolve_disk_shortname to accept "disk*" parameters and still work
Fixes wipefs problem when attempting to preserve lv or vg