updates for replacing editRequestDispatch.jsp with editRequestDispatch

webapp/web/templates/freemarker/edit/forms/autoCompleteObjpropForm.ftl

@@ -51,7 +51,7 @@ $(document).ready(function() {
     <form id="autoCompleteDatapropForm" class="editForm" action="${submitUrl}"  role="autocomplete">
     
     <#if predicate.offerCreateNewOption >
-        <#assign var="createNewUrl = "/edit/editRequestDispatch.jsp?subjectUri=${param.subjectUri}&predicateUri=${param.predicateUri}&clearEditConfig=true&cmd=create >
+        <#assign var="createNewUrl = "/editRequestDispatch?subjectUri=${param.subjectUri}&predicateUri=${param.predicateUri}&clearEditConfig=true&cmd=create >
     </#if>
     
     <#if predicate.publicDescription?has_content >       

webapp/web/templates/freemarker/edit/forms/confirmDeletePropertyForm.ftl

@@ -6,15 +6,15 @@
     <#assign toBeDeletedClass = "objProp" />
 </#if>
 
+<#assign deletionTemplateName = editConfiguration.deleteTemplate/>
 <#assign statement = editConfiguration.statementDisplay />
-
 <form action="${editConfiguration.deleteProcessingUrl}" method="get">
     <h2>Are you sure you want to delete the following entry from <em>${editConfiguration.propertyName}</em>?</h2>
     
     <p class="toBeDeleted ${toBeDeletedClass}">
         <#if editConfiguration.objectProperty = true>
-            <#if statement.object?has_content>
-                <#include "propStatement-default.ftl" />
+            <#if statement?has_content>
+                <#include deletionTemplateName />
             </#if>
         <#else>
             ${statement.dataValue}