[3.6] bpo-29723: Consistently configure sys.path[0]#636

ncoghlan merged 2 commits intopython:3.6python/cpython:3.6from

ncoghlan:backport-d2977a3-3.6ncoghlan/cpython:backport-d2977a3-3.6Copy head branch name to clipboard