Work with Drupal core maintainers to avoid hard-coded 5-second window

See https://drupal.org/node/2104139

Meanwhile we might need to include a patch to core as was done in the Selenium project.