Merged fix for dtml bug in help button generation in manage_tabs (#1557)

lib/python/App/manage_tabs.dtml

@@ -145,6 +145,7 @@
       topic=help_topic)">
   </td>
   <dtml-else>
+  <dtml-if manage_options>
   <dtml-with "_(option=manage_options[a_])">
   <dtml-if "option.has_key('help')">
   <td align="right" valign="top">
@@ -152,7 +153,7 @@
       product=option['help'][0],
       topic=option['help'][1])">
   </td>
-  </dtml-if></dtml-with>
+  </dtml-if></dtml-with></dtml-if>
   </dtml-if>
 
   </tr>