Bug #2602: Fix DS name space on ESX

(cherry picked from commit 9cf3fbc158b2a818a89f0e5152588c47c077e904)