Merge remote-tracking branch 'upstream/3.1' into HOR-1087

Conflicts:
	workflow/engine/classes/class.derivation.php

workflow/engine/classes/class.derivation.php

@@ -1344,14 +1344,15 @@ class Derivation
         $flag = false;
 
         //check if there is any paused thread
-        $existThareadPause = false;
+
+        $existThreadPaused = false;
         if (isset($arraySiblings['pause'])) {
             if (!empty($arraySiblings['pause'])) {
-                $existThareadPause = true;
+                $existThreadPaused = true;
             }
         }
 
-        if ($openThreads == 0 && !$existThareadPause) {
+        if ($openThreads == 0 && !$existThreadPaused) {
             //Close case
             $appFields["APP_STATUS"] = "COMPLETED";
             $appFields["APP_FINISH_DATE"] = "now";

workflow/engine/classes/class.system.php

@@ -57,6 +57,7 @@ class System
         'wsdl_cache' => 1,
         'memory_limit' => "256M",
         'time_zone' => 'America/New_York',
+        'expiration_year' => '1',
         'memcached' => 0,
         'memcached_server' => '',
         'default_skin' => 'neoclassic',