NXP-11551: simpler, mergeable repository contribs
NXP-11551: fix service inter-dependencies order