Merge change 20816

* changes:
  joeo here -- pesky findleaves.sh wasn't pruning directories.