Index: openacs-4/packages/acs-tcl/tcl/apm-install-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/apm-install-procs.tcl,v
diff -u -r1.109.2.5 -r1.109.2.6
--- openacs-4/packages/acs-tcl/tcl/apm-install-procs.tcl	18 Sep 2015 07:33:48 -0000	1.109.2.5
+++ openacs-4/packages/acs-tcl/tcl/apm-install-procs.tcl	26 Sep 2015 11:25:22 -0000	1.109.2.6
@@ -1112,7 +1112,7 @@
     # the backup directory for the package.
     regsub {@.+} [cc_email_from_party [ad_conn user_id]] "" my_email_name
 
-    set backup_dir "[apm_workspace_dir]/$package_key-removed-$my_email_name-[ns_fmttime [ns_time] "%Y%m%d-%H:%M:%S"]"
+    set backup_dir "[apm_workspace_dir]/$package_key-removed-$my_email_name-[ns_fmttime [ns_time] {%Y%m%d-%H:%M:%S}]"
 
     apm_callback_and_log $callback "
     <li>Moving <tt>packages/$package_key</tt> to $backup_dir... "
Index: openacs-4/packages/acs-tcl/tcl/apm-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/apm-procs.tcl,v
diff -u -r1.95.2.2 -r1.95.2.3
--- openacs-4/packages/acs-tcl/tcl/apm-procs.tcl	25 Sep 2015 08:44:32 -0000	1.95.2.2
+++ openacs-4/packages/acs-tcl/tcl/apm-procs.tcl	26 Sep 2015 11:25:22 -0000	1.95.2.3
@@ -908,11 +908,14 @@
 ad_proc -private apm_package_installed_p_not_cached {
     package_key
 } {
-    return [db_string apm_package_installed_p {
-      select 1 from apm_package_versions
-      where package_key = :package_key
-      and installed_p = 't'
-    } -default 0]
+    if {[catch {set installed_p [db_string apm_package_installed_p {
+        select 1 from apm_package_versions
+        where package_key = :package_key
+        and installed_p = 't'
+    } -default 0]}]} {
+        set installed_p 0
+    }
+    return $installed_p
 }
 
 ad_proc -public apm_package_enabled_p {
Index: openacs-4/packages/acs-tcl/tcl/site-nodes-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/site-nodes-procs.tcl,v
diff -u -r1.93.2.4 -r1.93.2.5
--- openacs-4/packages/acs-tcl/tcl/site-nodes-procs.tcl	18 Sep 2015 07:33:49 -0000	1.93.2.4
+++ openacs-4/packages/acs-tcl/tcl/site-nodes-procs.tcl	26 Sep 2015 11:25:23 -0000	1.93.2.5
@@ -64,8 +64,6 @@
 # 05-db-procs.tcl). The current implementation does not support
 # oracle, the implementation does not distinguish btw. AOLserver and
 # NaviServer (uses simply ns_cache_eval for speed and simplicity).
-# We can't use e.g.     && [ds_string check_package {select 1 from apm_package_versions where package_key = 'xotcl-core' and installed_p = 't'}]
-
 #
 
 if {[info commands ::nx::Object] ne ""
Index: openacs-4/packages/acs-tcl/tcl/text-html-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/text-html-procs.tcl,v
diff -u -r1.67.2.2 -r1.67.2.3
--- openacs-4/packages/acs-tcl/tcl/text-html-procs.tcl	18 Sep 2015 07:33:49 -0000	1.67.2.2
+++ openacs-4/packages/acs-tcl/tcl/text-html-procs.tcl	26 Sep 2015 11:25:23 -0000	1.67.2.3
@@ -200,7 +200,7 @@
 
     @see ad_quotehtml
 } {
-    return [string map {&gt; > &lt; < &quot; \" &amp; &} $arg]
+    return [string map {&amp; & &gt; > &lt; < &quot; \" &#34; \" &#39; '} $arg]
 }
 
 
Index: openacs-4/packages/acs-tcl/tcl/test/html-conversion-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/test/html-conversion-procs.tcl,v
diff -u -r1.10.8.2 -r1.10.8.3
--- openacs-4/packages/acs-tcl/tcl/test/html-conversion-procs.tcl	18 Sep 2015 07:33:49 -0000	1.10.8.2
+++ openacs-4/packages/acs-tcl/tcl/test/html-conversion-procs.tcl	26 Sep 2015 11:25:23 -0000	1.10.8.3
@@ -191,10 +191,10 @@
     Test if it quote and unquote html
 } {
     #quote html
-    set html "\"<&text>\""
+    set html {"<&text>"}
     aa_log "Unquote html=$html"
     set result [ns_quotehtml $html]
-    aa_true "Quoute html=$result" [string equal "&quot;&lt;&amp;text&gt;&quot;" $result]
+    aa_true "Quoute html=$result" [string equal "&#34;&lt;&amp;text&gt;&#34;" $result]
 
     #unquote html
     set html $result