Port #4444 to master

[jamesagnew]

#4444 based against a branch and GitHub decided to autoclose it when that branch merged. Porting that change to master.

No changelog in this ticket, it's a correction on #4438

[codecov]

Codecov Report

Base: 81.32% // Head: 81.35% // Increases project coverage by +0.02% 🎉

Coverage data is based on head (c43ca1c) compared to base (2f5ffe7).
Patch has no changes to coverable lines.

❗ Current head c43ca1c differs from pull request most recent head 8f8de43. Consider uploading reports for the commit 8f8de43 to get more accurate results

Additional details and impacted files

@@             Coverage Diff              @@
##             master    #4465      +/-   ##
============================================
+ Coverage     81.32%   81.35%   +0.02%     
- Complexity    23650    23809     +159     
============================================
  Files          1425     1432       +7     
  Lines         86399    87271     +872     
  Branches      11677    11774      +97     
============================================
+ Hits          70265    71000     +735     
- Misses        10947    11040      +93     
- Partials       5187     5231      +44     

Impacted Files	Coverage Δ
ca/uhn/fhir/mdm/api/MdmQuerySearchParameters.java	49.31% <0.00%> (-35.94%)	⬇️
org/hl7/fhir/r5/hapi/fhirpath/FhirPathR5.java	40.74% <0.00%> (-28.01%)	⬇️
...a/uhn/fhir/jpa/mdm/svc/MdmLinkQuerySvcImplSvc.java	41.66% <0.00%> (-25.00%)	⬇️
org/hl7/fhir/r4/hapi/fluentpath/FhirPathR4.java	62.96% <0.00%> (-24.54%)	⬇️
.../hl7/fhir/dstu3/hapi/fluentpath/FhirPathDstu3.java	76.00% <0.00%> (-17.75%)	⬇️
ca/uhn/fhir/jpa/mdm/svc/MdmControllerSvcImpl.java	63.44% <0.00%> (-9.40%)	⬇️
...r/narrative/CustomThymeleafNarrativeGenerator.java	94.73% <0.00%> (-5.27%)	⬇️
ca/uhn/fhir/system/HapiSystemProperties.java	76.47% <0.00%> (-4.78%)	⬇️
ca/uhn/fhir/narrative2/BaseNarrativeGenerator.java	72.07% <0.00%> (-2.93%)	⬇️
...ir/rest/client/interceptor/LoggingInterceptor.java	84.04% <0.00%> (-2.13%)	⬇️
... and 75 more

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report at Codecov.
📢 Do you have feedback about the report comment? Let us know in this issue.