[Auto] Updated Upstream (CraftBukkit)

Upstream has released updates that appears to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

CraftBukkit Changes:
812f66aa SPIGOT-4684: Update persistence of converting zombie villagers

Spigot-Server-Patches/EntityTransformedEvent.patch

@@ -49,7 +49,7 @@ index 7a943a6c2..7998b80c1 100644
              this.world.addEntity(entityzombievillager, CreatureSpawnEvent.SpawnReason.INFECTION); // CraftBukkit - add SpawnReason
              // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/server/EntityZombieVillager.java b/src/main/java/net/minecraft/server/EntityZombieVillager.java
-index c6198626a..86e5fbcda 100644
+index 670e38eb8..359ac8b88 100644
 --- a/src/main/java/net/minecraft/server/EntityZombieVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityZombieVillager.java
 @@ -0,0 +0,0 @@ public class EntityZombieVillager extends EntityZombie {

Spigot-Server-Patches/Use-EntityTypes-for-living-entities.patch

@@ -433,7 +433,7 @@ index 85d402965..0cca7b6d5 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityZombieVillager.java b/src/main/java/net/minecraft/server/EntityZombieVillager.java
-index 86e5fbcda..fb96743af 100644
+index 359ac8b88..96a1b1d3f 100644
 --- a/src/main/java/net/minecraft/server/EntityZombieVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityZombieVillager.java
 @@ -0,0 +0,0 @@ public class EntityZombieVillager extends EntityZombie {

work/CraftBukkit

@@ -1 +1 @@
-Subproject commit f40143ef5e2215b15c08eac481517bd6a0cf7239
+Subproject commit 812f66aa99d7ef65f29ea60690dccbcc4ccec369