HPCC-9201 Short circuit parameter substitution

Signed-off-by: Gavin Halliday <gavin.halliday@lexisnexis.com>
Merge pull request #4308 from ghalliday/issue9201

HPCC-9201 Short circuit parameter substitution

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>