Extend Bug 5675 fix to include case where partition runs from a split-flow.  Change magic format of "subjob instance id" to always start with the top-level job instance id as "prefix".