Backport jc/fix-add-tree-entry into 16-7-stable

This MR backports the changes from !6670 (merged) into the 16-8-stable branch

assigned to @jcaigitlab

added groupgitaly label

Reviewer roulette

Changes that require review have been detected! A merge request is normally reviewed by both a reviewer and a maintainer in its primary category and by a maintainer in all other categories.

To spread load more evenly across eligible reviewers, Danger has picked a candidate for each review slot. Feel free to override these selections if you think someone else would be better-suited or use the GitLab Review Workload Dashboard to find other available reviewers.

To read more on how to use the reviewer roulette, please take a look at the Engineering workflow and code review guidelines. Please consider assigning a reviewer or maintainer who is a domain expert in the area of the merge request.

Once you've decided who will review this merge request, mention them as you normally would! Danger does not automatically notify them for you.

Category	Reviewer	Maintainer
None	@samihiltunen (UTC+2, 7 hours ahead of author)	@ahmadsherif (UTC+1, 6 hours ahead of author)

If needed, you can retry the 🔁 danger-review job that generated this comment.

Generated by 🚫 Danger

Proper labels assigned to this merge request. Please ignore me.

👋 @jcaigitlab - please see the following guidance and update this merge request.

	1 Error
❌	Please add typebug typefeature, or typemaintenance label to this merge request.

requested review from @justintobler

changed milestone to %16.10

added bugfunctional devopssystems sectioncore platform typebug labels

resolved all threads

approved this merge request

Thanks @jcaigitlab! This one also looks good to me 👍

Approving and merging.

started a merge train

merged

mentioned in commit dd2ec883