Merge pull request #4887 from pratikshad/broken-webtest

Fixed broken webtest of Contact and Event

diff --cc tests/phpunit/WebTest/Contact/MergeContactsTest.php
index a74f608d50d1c6e90da89c6724486fd07e32f2e5,2ab2ba4b01f8faecee2866fd60bd899e9680197d..4f74185ae631880abe8c9a92b2a718906059c03c
--- 1/tests/phpunit/WebTest/Contact/MergeContactsTest.php
--- 2/tests/phpunit/WebTest/Contact/MergeContactsTest.php
+++ b/tests/phpunit/WebTest/Contact/MergeContactsTest.php
@@@ -247,10 -247,9 +247,10 @@@ class WebTest_Contact_MergeContactsTes
      $this->waitForElementPresent('_qf_Merge_cancel-bottom');
      $this->click('toggleSelect');
      $this->click('_qf_Merge_next-bottom');
-     $this->waitForPageToLoad($this->getTimeoutMsec());
+     $this->waitForPageToLoad($this->getTimeoutMsec() * 4);
      $this->assertTrue($this->isTextPresent("Staff, Student"));
    }
 +
    /**
     * @param string $firstName
     * @param string $lastName

diff --cc tests/phpunit/WebTest/Contact/SearchBuilderTest.php
Simple merge