Merge branch 'cherry-pick-89a1cbff' into '1.3-dev'

Merge branch '5797-cancel-button-has-no-effect-apply-template' into '1.3-dev'

See merge request fusiondirectory/fd!456

include/simpleplugin/class_simpleManagement.inc

@@ -118,6 +118,7 @@ class templateDialog
 
   function handle_cancel ()
   {
+    $this->simpleManagement->remove_lock();
     $this->simpleManagement->closeDialogs();
     return FALSE;
   }