PTFM-8772: dx and dxpy support for stage-specific folders and rerunning stages

@psung, we discussed some of these changes previously.  Want to review?