Index: openacs-4/packages/acs-admin/www/users/user-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/user-add.adp,v
diff -u -r1.12 -r1.12.2.1
--- openacs-4/packages/acs-admin/www/users/user-add.adp	14 Jul 2015 22:26:55 -0000	1.12
+++ openacs-4/packages/acs-admin/www/users/user-add.adp	4 Feb 2017 14:13:22 -0000	1.12.2.1
@@ -3,5 +3,5 @@
 <property name="focus">register.email</property>
 <property name="context">@context;literal@</property>
 
-<include src="@user_new_template;literal@" next_url="@next_url;literal@" self_register_p="0"/>
+<include src="@user_new_template;literal@" next_url="@next_url;literal@" self_register_p="0">
 
Index: openacs-4/packages/acs-lang/www/admin/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/index.adp,v
diff -u -r1.20.2.2 -r1.20.2.3
--- openacs-4/packages/acs-lang/www/admin/index.adp	18 Jan 2017 08:18:37 -0000	1.20.2.2
+++ openacs-4/packages/acs-lang/www/admin/index.adp	4 Feb 2017 14:13:22 -0000	1.20.2.3
@@ -2,7 +2,7 @@
   <property name="doc(title)">@page_title;literal@</property>
   <property name="context">@context;literal@</property>
 
-<include src="/packages/acs-lang/lib/conflict-link" />
+<include src="/packages/acs-lang/lib/conflict-link" >
 
 <h1>@page_title@</h1>
 
Index: openacs-4/packages/acs-lang/www/admin/message-list.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/message-list.adp,v
diff -u -r1.16.2.2 -r1.16.2.3
--- openacs-4/packages/acs-lang/www/admin/message-list.adp	18 Jan 2017 08:18:37 -0000	1.16.2.2
+++ openacs-4/packages/acs-lang/www/admin/message-list.adp	4 Feb 2017 14:13:22 -0000	1.16.2.3
@@ -22,7 +22,7 @@
   </multiple>
 </p>
 
-<include src="/packages/acs-lang/lib/conflict-link" locale="@current_locale;literal@" package_key="@package_key;literal@"/>
+<include src="/packages/acs-lang/lib/conflict-link" locale="@current_locale;literal@" package_key="@package_key;literal@">
 
 <ul class="action-links">
   <if @create_p;literal@ true>
Index: openacs-4/packages/acs-lang/www/admin/package-list.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/package-list.adp,v
diff -u -r1.13 -r1.13.2.1
--- openacs-4/packages/acs-lang/www/admin/package-list.adp	14 Jul 2015 22:26:55 -0000	1.13
+++ openacs-4/packages/acs-lang/www/admin/package-list.adp	4 Feb 2017 14:13:22 -0000	1.13.2.1
@@ -6,7 +6,7 @@
 <p>Search <formwidget id="search_locale"> for <formwidget id="q"> <input type="submit" value="Search">
 </formtemplate>
 
-<include src="/packages/acs-lang/lib/conflict-link" locale="@current_locale;literal@" />
+<include src="/packages/acs-lang/lib/conflict-link" locale="@current_locale;literal@" >
 
 <if @locale_enabled_p@ and @site_wide_admin_p@>
   <ul class="action-links">
Index: openacs-4/packages/assessment/lib/feedback.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/lib/feedback.adp,v
diff -u -r1.7 -r1.7.2.1
--- openacs-4/packages/assessment/lib/feedback.adp	14 Jul 2015 22:36:43 -0000	1.7
+++ openacs-4/packages/assessment/lib/feedback.adp	4 Feb 2017 14:15:41 -0000	1.7.2.1
@@ -4,7 +4,7 @@
 <if @assessment_data.html_title@ not nil><h2>@assessment_data.html_title;noquote@: Feedback</h2></if>
 
 <if @total_pages@ defined>
-  <include src="/packages/assessment/lib/progress-bar" total="@total_pages;literal@" current="@current_page;literal@" finished_page="@finished_page;literal@"/>
+  <include src="/packages/assessment/lib/progress-bar" total="@total_pages;literal@" current="@current_page;literal@" finished_page="@finished_page;literal@">
 </if>
 
   <h2>@section_title@</h2>
Index: openacs-4/packages/assessment/lib/session.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/lib/session.adp,v
diff -u -r1.13.2.2 -r1.13.2.3
--- openacs-4/packages/assessment/lib/session.adp	18 Jan 2017 08:23:11 -0000	1.13.2.2
+++ openacs-4/packages/assessment/lib/session.adp	4 Feb 2017 14:15:41 -0000	1.13.2.3
@@ -40,5 +40,5 @@
 <if @assessment_data.survey_p@ ne t and @assessment_data.show_feedback@ ne none and @assessment_score@ not nil and @assessment_score@ gt 0><strong>#assessment.Total_score#:</strong> @session_score@ / @assessment_score@ = @percent_score@%</if>
 
 <if @comments_installed_p;literal@ true>
-<include src="/packages/assessment/lib/comments-chunk" object_id="@session_id;literal@" />
+<include src="/packages/assessment/lib/comments-chunk" object_id="@session_id;literal@" >
 </if>
Index: openacs-4/packages/assessment/www/assessment-section-submit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/assessment-section-submit.adp,v
diff -u -r1.30.2.2 -r1.30.2.3
--- openacs-4/packages/assessment/www/assessment-section-submit.adp	18 Jan 2017 08:23:11 -0000	1.30.2.2
+++ openacs-4/packages/assessment/www/assessment-section-submit.adp	4 Feb 2017 14:15:41 -0000	1.30.2.3
@@ -11,7 +11,7 @@
   <if @section.max_time_to_complete@ not nil><br>#assessment.section_time_remaining#</if>
 
   <if @progress_bar_list@ defined>
-  <include src="/packages/acs-tcl/lib/static-progress-bar" total="@total_pages;literal@" current="@current_page;literal@" />
+  <include src="/packages/acs-tcl/lib/static-progress-bar" total="@total_pages;literal@" current="@current_page;literal@" >
   </if>
 
   <if @form_is_submit@ true and @form_is_valid@ false>
Index: openacs-4/packages/assessment/www/finish.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/finish.adp,v
diff -u -r1.9 -r1.9.2.1
--- openacs-4/packages/assessment/www/finish.adp	14 Jul 2015 22:36:43 -0000	1.9
+++ openacs-4/packages/assessment/www/finish.adp	4 Feb 2017 14:15:41 -0000	1.9.2.1
@@ -3,7 +3,7 @@
 <property name="context">@context;literal@</property>
 
 <if @total_pages@ defined>
-  <include src="/packages/acs-tcl/lib/static-progress-bar" total="@total_pages;literal@" current="@current_page;literal@" finish="1" />
+  <include src="/packages/acs-tcl/lib/static-progress-bar" total="@total_pages;literal@" current="@current_page;literal@" finish="1" >
 </if>
 
 @assessment_data.exit_page;noquote@
Index: openacs-4/packages/assessment/www/asm-admin/results-session.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/results-session.adp,v
diff -u -r1.14.2.2 -r1.14.2.3
--- openacs-4/packages/assessment/www/asm-admin/results-session.adp	18 Jan 2017 08:23:11 -0000	1.14.2.2
+++ openacs-4/packages/assessment/www/asm-admin/results-session.adp	4 Feb 2017 14:15:41 -0000	1.14.2.3
@@ -24,6 +24,6 @@
 <hr>
 <if @assessment_data.type@ ne survey><strong>#assessment.Total_score#:</strong> @session_score@ / @assessment_score@ = @percent_score@%</if>
 <if @comments_installed_p;literal@ true>
-<include src="/packages/assessment/lib/comments-chunk" object_id="@session_id;literal@" />
+<include src="/packages/assessment/lib/comments-chunk" object_id="@session_id;literal@" >
 </if>
 </div> <!-- result -->
Index: openacs-4/packages/ajaxhelper/www/doc/default-master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ajaxhelper/www/doc/default-master.adp,v
diff -u -r1.1 -r1.1.4.1
--- openacs-4/packages/ajaxhelper/www/doc/default-master.adp	8 Sep 2007 14:21:22 -0000	1.1
+++ openacs-4/packages/ajaxhelper/www/doc/default-master.adp	4 Feb 2017 14:20:51 -0000	1.1.4.1
@@ -96,7 +96,7 @@
     TODO: remove this and add a more systematic / package independent way 
     TODO  of getting this content here
   </comment>
-  <if @curriculum_bar_p@ true><include src="/packages/curriculum/lib/bar" /></if>
+  <if @curriculum_bar_p@ true><include src="/packages/curriculum/lib/bar" ></if>
 
   <div id="footer">
     <div class="block-marker">Begin footer</div>
Index: openacs-4/packages/file-storage/www/permissions.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/permissions.adp,v
diff -u -r1.5 -r1.5.2.1
--- openacs-4/packages/file-storage/www/permissions.adp	14 Jul 2015 22:22:27 -0000	1.5
+++ openacs-4/packages/file-storage/www/permissions.adp	4 Feb 2017 14:20:51 -0000	1.5.2.1
@@ -4,4 +4,4 @@
 
 <h1>@page_title;noquote@ - #file-storage.Permissions#</h1>
 
-  <include src="/packages/acs-subsite/www/permissions/perm-include" object_id="@object_id;literal@" />
+  <include src="/packages/acs-subsite/www/permissions/perm-include" object_id="@object_id;literal@" >
Index: openacs-4/packages/openacs-default-theme/lib/plain-master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/openacs-default-theme/lib/plain-master.adp,v
diff -u -r1.3.2.1 -r1.3.2.2
--- openacs-4/packages/openacs-default-theme/lib/plain-master.adp	20 Jan 2017 08:27:23 -0000	1.3.2.1
+++ openacs-4/packages/openacs-default-theme/lib/plain-master.adp	4 Feb 2017 14:20:51 -0000	1.3.2.2
@@ -100,7 +100,7 @@
     TODO: remove this and add a more systematic / package independent way 
     TODO  of getting this content here
   </comment>
-  <if @curriculum_bar_p;literal@ true><include src="/packages/curriculum/lib/bar" /></if>
+  <if @curriculum_bar_p;literal@ true><include src="/packages/curriculum/lib/bar" ></if>
 
   <comment> empty UL gives a validation error for the W3C validator 
   </comment>
Index: openacs-4/packages/dotlrn/www/control-panel.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/control-panel.adp,v
diff -u -r1.27.2.1 -r1.27.2.2
--- openacs-4/packages/dotlrn/www/control-panel.adp	18 Jan 2017 18:25:41 -0000	1.27.2.1
+++ openacs-4/packages/dotlrn/www/control-panel.adp	4 Feb 2017 14:22:07 -0000	1.27.2.2
@@ -42,7 +42,7 @@
             </div>
           </if>
 
-          <include src="@user_info_template;literal@" />
+          <include src="@user_info_template;literal@" >
 
           <div style="clear: both;">
             <ul>
Index: openacs-4/packages/dotlrn/www/user-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/user-add.adp,v
diff -u -r1.19.2.1 -r1.19.2.2
--- openacs-4/packages/dotlrn/www/user-add.adp	18 Jan 2017 18:25:41 -0000	1.19.2.1
+++ openacs-4/packages/dotlrn/www/user-add.adp	4 Feb 2017 14:22:07 -0000	1.19.2.2
@@ -47,4 +47,4 @@
 </ol>
 </if>
 
-<include src="/packages/acs-subsite/lib/user-new" next_url="@next_url;literal@" self_register_p="0"/>
+<include src="/packages/acs-subsite/lib/user-new" next_url="@next_url;literal@" self_register_p="0">
Index: openacs-4/packages/new-portal/www/themes/kelp-theme/site-master-kelp.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/www/themes/kelp-theme/site-master-kelp.adp,v
diff -u -r1.5.2.1 -r1.5.2.2
--- openacs-4/packages/new-portal/www/themes/kelp-theme/site-master-kelp.adp	20 Jan 2017 08:22:13 -0000	1.5.2.1
+++ openacs-4/packages/new-portal/www/themes/kelp-theme/site-master-kelp.adp	4 Feb 2017 14:22:07 -0000	1.5.2.2
@@ -106,5 +106,5 @@
 <!--  [ CONTAINER ] Added by www.sii.it -->
 
 <if @curriculum_bar_p;literal@ true>
-  <p><include src="/packages/curriculum/lib/bar" />
+  <p><include src="/packages/curriculum/lib/bar" >
 </if>
\ No newline at end of file