take advantage of the context

core/src/main/resources/hudson/security/AuthorizationMatrixProperty/config.jelly

@@ -24,7 +24,6 @@ THE SOFTWARE.
 
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <f:optionalBlock name="useProjectSecurity" title="${%Enable project-based security}" checked="${instance!=null}">
-    <j:set var="descriptorPath" value="descriptorByName/AuthorizationMatrixProperty" />
     <st:include page="/hudson/security/GlobalMatrixAuthorizationStrategy/config.jelly" />
   </f:optionalBlock>
 </j:jelly>

core/src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/config.jelly

@@ -151,7 +151,7 @@ THE SOFTWARE.
           e = null; <!-- avoid memory leak -->
         },
         <j:if test="${empty(descriptorPath)}">
-          <j:set var="descriptorPath" value="${rootURL}/descriptor/${descriptor.clazz.name}"/>
+          <j:set var="descriptorPath" value="${rootURL}${descriptor.descriptorFullUrl}"/>
         </j:if>
         <!-- validates the name -->
         "#${strategyid} TR.permission-row" : function(e) {