Merge WCM_WDR_MER TO HEAD

MOB-399 Implementation of Deploymemnt Engine
     MOB-669
     MOB-630
     Revisions 14181 - 14539 merged,,

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@14543 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/repo/lock/JobLockService.java

@@ -78,6 +78,7 @@ public interface JobLockService
      * make use of retrying; the lock is actually being refreshed and will therefore never
      * become valid if it doesn't refresh directly.
      * 
+     * @param timeToLive            the time (in milliseconds) for the lock to remain valid
      * @param retryWait             the time (in milliseconds) to wait before trying again
      * @param retryCount            the maximum number of times to attempt the lock acquisition
      * @throws LockAcquisitionException if the lock could not be acquired