Issue #2898903 by tetranz, alexpott, smustgrave, immaculatexavier,...
Issue #2898903 by tetranz, alexpott, smustgrave, immaculatexavier, prasanth_kp, timmillwood, vinaymahale, rajandro: Terms lose <root> as the parent when editing
(cherry picked from commit 4b675406)