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

Fix OOIION-1316; intermittent test failure