Merge remote-tracking branch 'origin/master' into pre/1.13

* origin/master:
  Fix watchdog restarting on short timeout (#1344)

Spigot-Server-Patches/Add-Early-Warning-Feature-to-WatchDog.patch

@@ -62,7 +62,7 @@ index 4ac0ab9974..0c45d75adf 100644
  
      public static boolean bungee;
 diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java
-index 57a4748a30..ac6aeb875a 100644
+index 57a4748a30..19df383e06 100644
 --- a/src/main/java/org/spigotmc/WatchdogThread.java
 +++ b/src/main/java/org/spigotmc/WatchdogThread.java
 @@ -0,0 +0,0 @@ import java.lang.management.MonitorInfo;
@@ -146,11 +146,12 @@ index 57a4748a30..ac6aeb875a 100644
 +
                  log.log( Level.SEVERE, "------------------------------" );
  
++                if ( isLongTimeout )
++                {
                  if ( restart )
                  {
                      RestartCommand.restart();
                  }
-+                if (isLongTimeout) {
                  break;
 +                } // Paper end
              }