Merge pull request
#12146 from meeseeksmachine/auto-backport-of-pr-12135-on-7.x...
Merge pull request
#12146 from meeseeksmachine/auto-backport-of-pr-12135-on-7.x
Backport PR
#12135 on branch 7.x (add configuration controlling whether the CWD gets added to sys.path)