Fix race condition in paths.get_ipython_dirs(),
Fix race condition in paths.get_ipython_dirs(),

Directory may already exists.

Use octomerge to get everyboy's contributions.

Merge remote-tracking branches 'origin/pull/13256' and 'origin/pull/13263'

ipython/ipython,ipython/ipython