[entity] Cleanup hierarchic iterator

Timo Kochrequested to merge
cleanup/hierarchiciterator into master

Reduce code duplication for the hierarchic iterator and remove friendship with entity

Edited by Timo Koch

Merge request reports