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/body/contactForm/confirmation.ftl

@@ -3,7 +3,7 @@
 <#-- Contact form submission confirmation page -->
 
 <h2>Thank you for your feedback</h2>
-<img src="${siteIconPath}/mail.gif" alt="mailbox"/><br/>
+<img src="${urls.siteIcons}/mail.gif" alt="mailbox"/><br/>
 
 <p>Thank you for contacting our curation and development team. We will respond to your inquiry as soon as possible.</p>
 <p>Return to the <a href="${urls.home}">home page</a>.</p>

webapp/web/templates/freemarker/body/contactForm/error.ftl

@@ -4,7 +4,7 @@
 
 <h2>${title}</h2>
 
-<img src="${siteIconPath}/bomb.gif" alt="email error"/>
+<img src="${urls.siteIcons}/bomb.gif" alt="email error"/>
 
 <p class="normal">An error occurred during the processing of your request.<br />
     <#if errorMessage?has_content>