feature #2097: Get DS_LOCATION from cluster when allocating a new DS
feature #2097: Minor fixes