More automerge changes to catch up wuth pygit2 0.19.0