FUT1-6371 fix R4 PlanDefinition search parameter definition

- path changed to PlanDefinition.repeat(action).definition to traverse action tree when including
FUT1-7028 fix R4 ValueSet search parameter definition (reference)
- path changed to include ValueSet.compose.include.valueSet

hapi-fhir-validation-resources-r4/src/main/resources/org/hl7/fhir/r4/model/sp/search-parameters.json

@@ -37587,8 +37587,7 @@
   "code": "definition",
   "base": [ "PlanDefinition" ],
   "type": "reference",
-  "expression": "PlanDefinition.action.definition",
-  "xpath": "f:PlanDefinition/f:action/f:definitionCanonical | f:PlanDefinition/f:action/f:definitionUri",
+  "expression": "PlanDefinition.repeat(action).definition",
   "xpathUsage": "normal",
   "target": [ "Questionnaire", "PlanDefinition", "ActivityDefinition" ]
  }
@@ -48924,8 +48923,8 @@
   "code": "reference",
   "base": [ "ValueSet" ],
   "type": "uri",
-  "expression": "ValueSet.compose.include.system",
-  "xpath": "f:ValueSet/f:compose/f:include/f:system",
+  "expression": "ValueSet.compose.include.system | ValueSet.compose.include.valueSet",
+  "xpath": "f:ValueSet/f:compose/f:include/f:system | f:ValueSet/f:compose/f:include/f:valueSet",
   "xpathUsage": "normal"
  }
 }, {