Merge branch 'rs/strbuf-cleanup-in-rmdir-recursively'

Code clean-up. * rs/strbuf-cleanup-in-rmdir-recursively: rm: reuse strbuf for all remove_dir_recursively() calls, again