Updated Upstream (Bukkit/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

Bukkit Changes:
122289ff Add FaceAttachable interface to handle Grindstone facing in common with Switches
a6db750e SPIGOT-5647: ZombieVillager entity should have getVillagerType()

CraftBukkit Changes:
bbe3d58e SPIGOT-5650: Lectern.setPage(int) causes a NullPointerException
3075579f Add FaceAttachable interface to handle Grindstone facing in common with Switches
95bd4238 SPIGOT-5647: ZombieVillager entity should have getVillagerType()
4d975ac3 SPIGOT-5617: setBlockData does not work when NotPlayEvent is called by redstone current

Spigot-Server-Patches/0173-Include-Log4J2-SLF4J-implementation.patch

@@ -1,11 +1,11 @@
-From 3b94bf80be80647c75ad63c0858e94ddd67102bf Mon Sep 17 00:00:00 2001
+From a0aeb66881e3e84c2a5407d063d82f7de394c5e6 Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Thu, 21 Sep 2017 16:33:35 +0200
 Subject: [PATCH] Include Log4J2 SLF4J implementation
 
 
 diff --git a/pom.xml b/pom.xml
-index 7132e2021..9e06edfe2 100644
+index 5a230592c7..6f2fe9c26d 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -63,6 +63,12 @@
@@ -22,5 +22,5 @@ index 7132e2021..9e06edfe2 100644
              <groupId>org.apache.logging.log4j</groupId>
              <artifactId>log4j-iostreams</artifactId>
 -- 
-2.25.0.windows.1
+2.25.1