Merge "[3.0] (dali_env script) Add dimension defines to outputted setenv so it isn...