Merge pull request #2151 from atsign-foundation/xl/e2e-test-flake