b2c7cc0:MB-12691 Do not update btreelist if _hbtrie_remove() fails