Merge pull request #4182 from pks-t/pks/treebuilder

git_treebuilder_write_with_buffer refactorings