OOIION-1124: IPython start race condition
Merge pull request #438 from mmeisinger/fix1124_ipy_r2

OOIION-1124: IPython start race condition