Index: openacs-4/packages/dotlrn/install.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/install.xml,v
diff -u -r1.23.2.1 -r1.23.2.2
--- openacs-4/packages/dotlrn/install.xml	9 Sep 2015 13:50:42 -0000	1.23.2.1
+++ openacs-4/packages/dotlrn/install.xml	12 Sep 2016 11:43:38 -0000	1.23.2.2
@@ -8,7 +8,7 @@
     <!-- Installing all applets gives us what we need as applets depend on both dotlrn, the portlets
          and the respective applications (i.e. forums file-storage etc.) -->
 <!--
-    *** deactivated for the time being (while working on incrementation installation ***
+    *** deactivated for the time being (while working on incrementation installation) *** -->
     <install package="dotlrn-bm"/>
     <install package="dotlrn-calendar"/>
     <install package="dotlrn-dotlrn"/>
@@ -22,7 +22,7 @@
     <install package="dotlrn-assessment"/>
     <install package="dotlrn-evaluation"/>
     <install package="theme-zen"/>
-
+<!--
     <set-parameter package-key="acs-subsite" name="DefaultMaster" value="/packages/theme-zen/lib/lrn-master"/> 
     <set-parameter package-key="acs-subsite" name="ThemeCSS" value=""/>
 -->
Index: openacs-4/packages/openacs-bootstrap3-theme/resources/masters/plain-master.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/openacs-bootstrap3-theme/resources/masters/plain-master.tcl,v
diff -u -r1.1.2.1 -r1.1.2.2
--- openacs-4/packages/openacs-bootstrap3-theme/resources/masters/plain-master.tcl	10 Sep 2016 10:13:22 -0000	1.1.2.1
+++ openacs-4/packages/openacs-bootstrap3-theme/resources/masters/plain-master.tcl	12 Sep 2016 11:43:38 -0000	1.1.2.2
@@ -73,7 +73,7 @@
 set csrf [security::csrf::new]
 
 security::csp::require img-src ipv6-test.com
-security::csp::require style-src netdna.bootstrapcdn.com
-security::csp::require font-src netdna.bootstrapcdn.com
+security::csp::require style-src maxcdn.bootstrapcdn.com
+security::csp::require font-src maxcdn.bootstrapcdn.com
 security::csp::require font-src 'self'
-security::csp::require font-src netdna.bootstrapcdn.com
+security::csp::require font-src maxcdn.bootstrapcdn.com
Index: openacs-4/packages/openacs-bootstrap3-theme/tcl/apm-callback-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/openacs-bootstrap3-theme/tcl/apm-callback-procs.tcl,v
diff -u -r1.1 -r1.1.2.1
--- openacs-4/packages/openacs-bootstrap3-theme/tcl/apm-callback-procs.tcl	8 Jul 2016 16:13:35 -0000	1.1
+++ openacs-4/packages/openacs-bootstrap3-theme/tcl/apm-callback-procs.tcl	12 Sep 2016 11:43:38 -0000	1.1.2.1
@@ -15,15 +15,15 @@
             -template tabbed-master \
             -css {
 {-href /resources/acs-subsite/site-master.css -media all -order 0}
-{-href //netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css -media all -order 1}
+{-href //maxcdn.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css -media all -order 1}
 {-href /resources/openacs-bootstrap3-theme/css/main.css -media all -order 2}
 {-href /resources/openacs-bootstrap3-theme/css/color/blue.css -media all -order 3}
 {-href /resources/acs-templating/forms.css -media all -order 4}
 {-href /resources/acs-templating/lists.css -media all -order 5}
             } \
             -js {
 {-src "/resources/openacs-bootstrap3-theme/js/jquery-1.11.3.min.js" -order 1}
-{-src "//netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js" -order 2}
+{-src "//maxcdn.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js" -order 2}
             } \
             -form_template standard \
             -list_template table \
@@ -38,15 +38,15 @@
             -template tabbed-master-turquois \
             -css {
 {-href /resources/acs-subsite/site-master.css -media all -order 0}
-{-href //netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css -media all -order 1}
+{-href //maxcdn.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css -media all -order 1}
 {-href /resources/openacs-bootstrap3-theme/css/main.css -media all -order 2}
 {-href /resources/openacs-bootstrap3-theme/css/color/turquois.css -media all -order 3}
 {-href /resources/acs-templating/forms.css -media all -order 4}
 {-href /resources/acs-templating/lists.css -media all -order 5}
             } \
             -js {
 {-src "/resources/openacs-bootstrap3-theme/js/jquery-1.11.3.min.js" -order 1}
-{-src "//netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js" -order 2}
+{-src "//maxcdn.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js" -order 2}
             } \
             -form_template standard \
             -list_template table \