[389-devel] Mapping tree rework