Issue #3037436 by alexpott, jonathan1055, Wim Leers, catch, tedbow, longwave: [random test failure] Make QuickEditIntegrationTest more robust and fail proof (cherry picked from commit 3d7dd76c) (cherry picked from commit fdd88e0c)