Proper matching for *_LOG_DIR variables in env files

Use our derived variables instead of the attributes, directly. This resolves some issues where the *_log_dir attribute wasn't set, and we were deleting it.