moved to the base tree model rather than wildfire_content
Merge branch 'wax_tree_model_has_child_query' into v3.1

* wax_tree_model_has_child_query:
  moved to the base tree model rather than wildfire_content