Merge "common: nvedit: Support old format env default command"