ENGINE-1847 + ENGINE-1848 + ENGINE-1899: fixed parent / root container ID confusion