Fix provider path handling

@bug W-1982209@

@rev eric.anderson@
Merging origin/goliver/master-pending-provider-paths into master