NIHVIVO-658 Reintegrate changes from dev-freemarker-new. Most necessary updates to freemarker controllers for thread-safety are complete. A couple of details remain.

webapp/web/templates/freemarker/page/partials/footer.ftl

@@ -4,8 +4,8 @@
 
 <div id="footer">
 
-    <#if bannerImageUrl??>
-        <img class="footerLogo" src="${urls.bannerImage}" alt="${tagline!}" />
+    <#if urls.bannerImage??>
+        <img class="footerLogo" src="${urls.bannerImage}" alt="${siteTagline!}" />
     </#if>
     
     <div class="footerLinks">

webapp/web/templates/freemarker/page/partials/identity.ftl

@@ -6,8 +6,8 @@
 
     <h1><a title="Home" href="${urls.home}">${siteName}</a></h1>
     
-    <#if tagline.has_content>
-        <em>${tagline}</em>
+    <#if siteTagline.has_content>
+        <em>${siteTagline}</em>
     </#if>
     
     <ul id="otherMenu">  

webapp/web/templates/freemarker/page/partials/search.ftl

@@ -7,7 +7,7 @@
         <#if showFlag1SearchField??>
             <select id="search-form-modifier" name="flag1" class="form-item" >
                 <option value="nofiltering" selected="selected">entire database (${loginName})</option>
-                <option value="${portalId}">${tagline!}</option>
+                <option value="${portalId}">${siteTagline!}</option>
             </select>
         <#else>
             <input type="hidden" name="flag1" value="${portalId}" />