PJSM-241: Use system properties instead of substituted values.