merge.Override: Fix handling of dyn.NilValue#1530

pietern merged 2 commits intodatabricks:maindatabricks/cli:mainfrom

kanterov:dyn-override-nilkanterov/cli:dyn-override-nilCopy head branch name to clipboard