Import better fix for OC-11601, eliminate some provisioning errors
More complete fix for the sdc -> sdd move