Make fixes to pythonTerminalEnvVarActivation
experiment
#21036
Merged
pythonTerminalEnvVarActivation
experiment
#21036