MODE-2120 Added some checks to prevent duplicate child references from being added/exposed

We don't yet have confirmation that this will fix/workaround the underlying problem, and that make take a few days of additional testing. So we probably want to hold off merging this into the '3.6.x' branch and 'master' branch.