#550254 by Damien Tournoud, sun: Fixed some causes of menu links are sometimes not properly re-parented.