Don't mark parent particle in setDescriptorTemplate
The branch of the parent particle was being duplicated. Fixed by using the mapping dictionary to prevent the parent particle from getting marked with a ^.
Cherry-pick of MR !!560 (merged) to master.
Edited by Rosen Matev