import dbtree hotfix changes, recent and old, made on fenari

Change-Id: I6538cf6abd11361b28f208ae76bfce6031846e4d