remove DM_DATA_DIR; consistently use DM_STORAGE_DIR; apply fix for different DS installation directory