Fix OOIION-1316; intermittent test failure
Merge pull request #1354 from pkediyal/OOIION-1316

Fix OOIION-1316; intermittent test failure