Switch to linear version of Group#groups_including_descendants_by

Model Group#groups_including_descendants_by use the recursive version of base_and_descendants. We need to switch it to the linear version.