Fix progress/jid injection & rename progress to __progress__

This refs #17701, #17725, #17335.