NIHVIVO-2051 Fix currentPage value sent to template: make home page value consistent regardless of the requested url, and change from servletPath to requestURI so we get full path value below the context path. Also add urls.currentPage to replace ${urls.base}/${currentPage} in templates. This value is similarly normalized for the home page.

webapp/web/templates/freemarker/body/menuN3Edit.ftl

@@ -15,7 +15,7 @@
     </#if>
     
     <#if menuN3??>
-        <form class="" action="${urls.base}/${currentPage}" method="post">
+        <form class="" action="${urls.currentPage}" method="post">
             <label for="navigatioN3">Setup the primary navigation menu for your website</label>
             <textarea name="navigationN3" id="navigationN3" cols="45" rows="40" class="maxWidth">
                 ${menuN3}<#t><#-- The trim directive here is to trim leading and trailing white-space -->