BATCH-2089: Added ability to remap ExitStatus