fix parentage for non merge job
add unittest
Merge pull request #4806 from ticoann/merge_parentage_fix

Merge/Processing job file parentage fix