Merge "CategoryFinder: give parent category tree an accessor"