OS-2111 dmake not properly resetting conditoinal variables