Backport MB-41510 to mad-hatter branch
MB-41510 Race in histogram reset and dump
MB-41895 Bucket ends up in orphan state after bucket_delete