Merged WEBAPP-API (5.2.1) to 5.2.N (5.2.1)

135805 jkaabimofrad: fixed tests failures.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@135932 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/test-java/org/alfresco/repo/security/authentication/ResetPasswordServiceImplTest.java

@@ -473,8 +473,8 @@ public class ResetPasswordServiceImplTest
                         .setPassword("newPassword")
                         .setWorkflowId(pair.getFirst())
                         .setWorkflowKey(pair.getSecond());
-            // Wait for 4 seconds, so the end timer expires!
-            Thread.sleep(4000);
+            // Wait for 5 seconds, so the end timer expires!
+            Thread.sleep(5000);
             try
             {
                 resetPasswordService.initiateResetPassword(passwordDetails);