fixing flaky test
Merge pull request #1172 from marcel-blonk/PLFM-2648

fixing flaky test
PLFM-2661
PLFM-2661
Merge pull request #1174 from brucehoff/PLFM-2661

PLFM-2661
check
check