re #10489 fix system tests usage of ParameterDefinition.directoy
Merge branch 'feature/10489_instrument_directories' into develop