Merge branch 'cherry-pick-3d826a19' into '1.2.2-fixes'

Merge branch 'cherry-pick-89a1cbff' into '1.2.2-fixes'

See merge request fusiondirectory/fd!457

include/simpleplugin/class_simpleManagement.inc

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