Index: openacs-4/packages/acs-subsite/lib/home.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/lib/home.adp,v
diff -u -r1.8.2.1 -r1.8.2.2
--- openacs-4/packages/acs-subsite/lib/home.adp	18 Jan 2017 08:05:59 -0000	1.8.2.1
+++ openacs-4/packages/acs-subsite/lib/home.adp	4 Feb 2017 13:57:09 -0000	1.8.2.2
@@ -60,7 +60,7 @@
           </div>
         </div>
         <div class="portlet">
-          <include src="@user_info_template;literal@" />
+          <include src="@user_info_template;literal@" >
           <if @account_status@ eq "closed">
             #acs-subsite.Account_closed_workspace_msg#
            </if>
Index: openacs-4/packages/acs-subsite/www/group-master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/group-master.adp,v
diff -u -r1.18.2.1 -r1.18.2.2
--- openacs-4/packages/acs-subsite/www/group-master.adp	18 Jan 2017 08:05:59 -0000	1.18.2.1
+++ openacs-4/packages/acs-subsite/www/group-master.adp	4 Feb 2017 13:57:09 -0000	1.18.2.2
@@ -146,7 +146,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>
 
   <div id="footer">
     <div class="block-marker">Begin footer</div>
Index: openacs-4/packages/acs-subsite/www/members/user-new.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/members/user-new.adp,v
diff -u -r1.9 -r1.9.2.1
--- openacs-4/packages/acs-subsite/www/members/user-new.adp	14 Jul 2015 22:26:56 -0000	1.9
+++ openacs-4/packages/acs-subsite/www/members/user-new.adp	4 Feb 2017 13:57:09 -0000	1.9.2.1
@@ -7,4 +7,4 @@
     self_register_p="0" 
     email="@email;literal@" 
     return_url="." 
-    rel_group_id="@rel_group_id;literal@" />
+    rel_group_id="@rel_group_id;literal@" >
Index: openacs-4/packages/acs-subsite/www/pvt/home.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/pvt/home.adp,v
diff -u -r1.29 -r1.29.2.1
--- openacs-4/packages/acs-subsite/www/pvt/home.adp	14 Jul 2015 22:26:56 -0000	1.29
+++ openacs-4/packages/acs-subsite/www/pvt/home.adp	4 Feb 2017 13:57:09 -0000	1.29.2.1
@@ -4,4 +4,4 @@
   <property name="focus">user_info.first_names</property>
   <property name="displayed_object_id">@user_id;literal@</property>
 
- <include src="@user_home_template;literal@" user_id="@user_id;literal@"/>
+ <include src="@user_home_template;literal@" user_id="@user_id;literal@">
Index: openacs-4/packages/acs-subsite/www/register/email-confirm.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/email-confirm.adp,v
diff -u -r1.11.2.1 -r1.11.2.2
--- openacs-4/packages/acs-subsite/www/register/email-confirm.adp	27 Feb 2016 04:57:21 -0000	1.11.2.1
+++ openacs-4/packages/acs-subsite/www/register/email-confirm.adp	4 Feb 2017 13:57:09 -0000	1.11.2.2
@@ -2,4 +2,4 @@
   <property name="context">{#acs-subsite.Email_Confirmation#}</property>
   <property name="doc(title)">#acs-subsite.Email_Confirmation#</property>
 
-<include src="@email_confirm_template;literal@" user_id="@user_id;literal@" token="@token;literal@" return_url="@return_url;literal@" />
+<include src="@email_confirm_template;literal@" user_id="@user_id;literal@" token="@token;literal@" return_url="@return_url;literal@" >
Index: openacs-4/packages/acs-subsite/www/register/user-new.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/user-new.adp,v
diff -u -r1.19 -r1.19.2.1
--- openacs-4/packages/acs-subsite/www/register/user-new.adp	14 Jul 2015 22:26:56 -0000	1.19
+++ openacs-4/packages/acs-subsite/www/register/user-new.adp	4 Feb 2017 13:57:09 -0000	1.19.2.1
@@ -3,4 +3,4 @@
   <property name="context">{#acs-subsite.Register#}</property>
   <property name="focus">register.email</property>
 
-<include src="@user_new_template;literal@" email="@email;literal@" return_url="@return_url;literal@" />
+<include src="@user_new_template;literal@" email="@email;literal@" return_url="@return_url;literal@" >