OOIION-1124: IPython start race condition
Merge pull request #437 from mmeisinger/fix1124_ipy_m

OOIION-1124: IPython start race condition