[ci skip] Add more identifying patch comments, merge related patches

patches/server/Prevent-softlocked-end-exit-portal-generation.patch

@@ -16,7 +16,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        if (this.portalLocation.getY() <= this.level.getMinBuildHeight()) {
 +            this.portalLocation = this.portalLocation.atY(this.level.getMinBuildHeight() + 1);
 +        }
-+        // Paper end
++        // Paper end - Prevent "softlocked" exit portal generation
          if (worldgenendtrophy.place(FeatureConfiguration.NONE, this.level, this.level.getChunkSource().getGenerator(), RandomSource.create(), this.portalLocation)) {
              int i = Mth.positiveCeilDiv(4, 16);