NXP-11551: simplify repository contribution
NXP-11551: allow merging of repository contribs
NXP-13925: fix duplicate documents due to aclr_user duplicate rows