Reorder tree menu to match pre-merge state

Ticket:	#3407