Redact Velocity forwarding secret properly (#4980)

Spigot-Server-Patches/Add-Velocity-IP-Forwarding-Support.patch

@@ -46,9 +46,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        velocitySupport = getBoolean("settings.velocity-support.enabled", false);
 +        velocityOnlineMode = getBoolean("settings.velocity-support.online-mode", false);
 +        String secret = getString("settings.velocity-support.secret", "");
-+        if (!TimingsManager.hiddenConfigs.contains("settings.velocity-support.secret")) {
-+            TimingsManager.hiddenConfigs.add("settings.velocity-support.secret");
-+        }
 +        if (velocitySupport && secret.isEmpty()) {
 +            fatal("Velocity support is enabled, but no secret key was specified. A secret key is required!");
 +        } else {

Spigot-Server-Patches/Timings-v2.patch

@@ -696,7 +696,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        boolean timings = getBoolean("timings.enabled", true);
 +        boolean verboseTimings = getBoolean("timings.verbose", true);
 +        TimingsManager.privacy = getBoolean("timings.server-name-privacy", false);
-+        TimingsManager.hiddenConfigs = getList("timings.hidden-config-entries", Lists.newArrayList("database", "settings.bungeecord-addresses"));
++        TimingsManager.hiddenConfigs = getList("timings.hidden-config-entries", Lists.newArrayList("database", "settings.bungeecord-addresses", "settings.velocity-support.secret"));
++        if (!TimingsManager.hiddenConfigs.contains("settings.velocity-support.secret")) {
++            TimingsManager.hiddenConfigs.add("settings.velocity-support.secret");
++        }
 +        int timingHistoryInterval = getInt("timings.history-interval", 300);
 +        int timingHistoryLength = getInt("timings.history-length", 3600);
 +        timingsServerName = getString("timings.server-name", "Unknown Server");