diff --git a/integration/fixtures/access_log_config.toml b/integration/fixtures/access_log_config.toml
index 4fa1c587e..cd785dc9f 100644
--- a/integration/fixtures/access_log_config.toml
+++ b/integration/fixtures/access_log_config.toml
@@ -1,11 +1,11 @@
-[log]
-logLevel = "ERROR"
-filePath = "traefik.log"
-
 [global]
 checkNewVersion = false
 sendAnonymousUsage = false
 
+[log]
+logLevel = "ERROR"
+filePath = "traefik.log"
+
 [accessLog]
   filePath = "access.log"
 
diff --git a/integration/fixtures/acme/acme_base.toml b/integration/fixtures/acme/acme_base.toml
index d1e9f4aa3..943d5e4ad 100644
--- a/integration/fixtures/acme/acme_base.toml
+++ b/integration/fixtures/acme/acme_base.toml
@@ -1,5 +1,9 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
 [log]
-  logLevel = "DEBUG"
+logLevel = "DEBUG"
 
 [entrypoints]
   [entrypoints.web]
diff --git a/integration/fixtures/acme/acme_tls.toml b/integration/fixtures/acme/acme_tls.toml
index 5874e5db7..41bd2941a 100644
--- a/integration/fixtures/acme/acme_tls.toml
+++ b/integration/fixtures/acme/acme_tls.toml
@@ -1,5 +1,9 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
 [log]
-  logLevel = "DEBUG"
+logLevel = "DEBUG"
 
 [entrypoints]
   [entrypoints.web]
diff --git a/integration/fixtures/acme/acme_tls_dynamic.toml b/integration/fixtures/acme/acme_tls_dynamic.toml
index 04cd993ed..614edb036 100644
--- a/integration/fixtures/acme/acme_tls_dynamic.toml
+++ b/integration/fixtures/acme/acme_tls_dynamic.toml
@@ -1,3 +1,7 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
 [log]
 logLevel = "DEBUG"
 
diff --git a/integration/fixtures/acme/acme_tls_multiple_entrypoints.toml b/integration/fixtures/acme/acme_tls_multiple_entrypoints.toml
index dbfaac382..5c015389f 100644
--- a/integration/fixtures/acme/acme_tls_multiple_entrypoints.toml
+++ b/integration/fixtures/acme/acme_tls_multiple_entrypoints.toml
@@ -1,3 +1,7 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
 [log]
 logLevel = "DEBUG"
 
diff --git a/integration/fixtures/docker/minimal.toml b/integration/fixtures/docker/minimal.toml
index 83140cb80..99bddf9ae 100644
--- a/integration/fixtures/docker/minimal.toml
+++ b/integration/fixtures/docker/minimal.toml
@@ -1,3 +1,6 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
 
 [log]
 logLevel = "DEBUG"
diff --git a/integration/fixtures/docker/simple.toml b/integration/fixtures/docker/simple.toml
index 7271ef365..1974e3833 100644
--- a/integration/fixtures/docker/simple.toml
+++ b/integration/fixtures/docker/simple.toml
@@ -1,3 +1,7 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
 [log]
 logLevel = "DEBUG"
 
diff --git a/integration/fixtures/error_pages/error.toml b/integration/fixtures/error_pages/error.toml
index 5c6724c5f..574437ead 100644
--- a/integration/fixtures/error_pages/error.toml
+++ b/integration/fixtures/error_pages/error.toml
@@ -1,3 +1,7 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
 [log]
 logLevel = "DEBUG"
 
diff --git a/integration/fixtures/error_pages/simple.toml b/integration/fixtures/error_pages/simple.toml
index b8b6c023b..d2e710ac9 100644
--- a/integration/fixtures/error_pages/simple.toml
+++ b/integration/fixtures/error_pages/simple.toml
@@ -1,3 +1,7 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
 [log]
 logLevel = "DEBUG"
 
diff --git a/integration/fixtures/file/56-simple-panic.toml b/integration/fixtures/file/56-simple-panic.toml
index 139d3907a..5a763f6f4 100644
--- a/integration/fixtures/file/56-simple-panic.toml
+++ b/integration/fixtures/file/56-simple-panic.toml
@@ -1,5 +1,9 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
 [log]
-  logLevel = "DEBUG"
+logLevel = "DEBUG"
 
 [entrypoints]
   [entrypoints.web]
diff --git a/integration/fixtures/file/directory.toml b/integration/fixtures/file/directory.toml
index 405820848..8a2fb10e4 100644
--- a/integration/fixtures/file/directory.toml
+++ b/integration/fixtures/file/directory.toml
@@ -1,3 +1,7 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
 [log]
 logLevel = "DEBUG"
 
diff --git a/integration/fixtures/file/simple.toml b/integration/fixtures/file/simple.toml
index bb26d7e9f..5b082b2d6 100644
--- a/integration/fixtures/file/simple.toml
+++ b/integration/fixtures/file/simple.toml
@@ -1,11 +1,14 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
+[log]
+logLevel = "DEBUG"
 
 [entrypoints]
   [entrypoints.web]
     address = ":8000"
 
-[log]
-logLevel = "DEBUG"
-
 [providers]
    [providers.file]
 
diff --git a/integration/fixtures/grpc/config.toml b/integration/fixtures/grpc/config.toml
index 35d74df12..849c51867 100644
--- a/integration/fixtures/grpc/config.toml
+++ b/integration/fixtures/grpc/config.toml
@@ -1,9 +1,13 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
+[log]
+logLevel = "DEBUG"
+
 [serversTransport]
 rootCAs = [ """{{ .CertContent }}""" ]
 
-[global]
-debug = true
-
 [entrypoints]
   [entrypoints.web-secure]
     address = ":4443"
diff --git a/integration/fixtures/grpc/config_h2c.toml b/integration/fixtures/grpc/config_h2c.toml
index 5c0f99070..d5b533cdc 100644
--- a/integration/fixtures/grpc/config_h2c.toml
+++ b/integration/fixtures/grpc/config_h2c.toml
@@ -1,5 +1,9 @@
 [global]
-debug = true
+checkNewVersion = false
+sendAnonymousUsage = false
+
+[log]
+logLevel = "DEBUG"
 
 [entrypoints]
   [entrypoints.web]
diff --git a/integration/fixtures/grpc/config_h2c_termination.toml b/integration/fixtures/grpc/config_h2c_termination.toml
index b26b5ee0b..8e74581b8 100644
--- a/integration/fixtures/grpc/config_h2c_termination.toml
+++ b/integration/fixtures/grpc/config_h2c_termination.toml
@@ -1,5 +1,9 @@
 [global]
-debug = true
+checkNewVersion = false
+sendAnonymousUsage = false
+
+[log]
+logLevel = "DEBUG"
 
 [entrypoints]
   [entrypoints.web-secure]
diff --git a/integration/fixtures/grpc/config_insecure.toml b/integration/fixtures/grpc/config_insecure.toml
index 69e8bec56..040ebbb0f 100644
--- a/integration/fixtures/grpc/config_insecure.toml
+++ b/integration/fixtures/grpc/config_insecure.toml
@@ -1,10 +1,13 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
+[log]
+logLevel = "DEBUG"
 
 [serversTransport]
 insecureSkipVerify = true
 
-[global]
-debug = true
-
 [entrypoints]
   [entrypoints.web-secure]
     address = ":4443"
diff --git a/integration/fixtures/grpc/config_retry.toml b/integration/fixtures/grpc/config_retry.toml
index 3492e7a6a..279b5bcb7 100644
--- a/integration/fixtures/grpc/config_retry.toml
+++ b/integration/fixtures/grpc/config_retry.toml
@@ -1,3 +1,10 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
+[log]
+logLevel = "DEBUG"
+
 [serversTransport]
 rootCAs = [ """{{ .CertContent }}""" ]
 
diff --git a/integration/fixtures/grpc/config_with_flush.toml b/integration/fixtures/grpc/config_with_flush.toml
index 81b5aaa05..849c51867 100644
--- a/integration/fixtures/grpc/config_with_flush.toml
+++ b/integration/fixtures/grpc/config_with_flush.toml
@@ -1,3 +1,9 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
+[log]
+logLevel = "DEBUG"
 
 [serversTransport]
 rootCAs = [ """{{ .CertContent }}""" ]
diff --git a/integration/fixtures/headers/basic.toml b/integration/fixtures/headers/basic.toml
index 315d8b24b..f2dc8d022 100644
--- a/integration/fixtures/headers/basic.toml
+++ b/integration/fixtures/headers/basic.toml
@@ -1,11 +1,14 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
+[log]
+logLevel = "DEBUG"
 
 [entrypoints]
   [entrypoints.web]
     address = ":8000"
 
-[log]
-logLevel = "DEBUG"
-
 [providers]
    [providers.file]
 
diff --git a/integration/fixtures/headers/cors.toml b/integration/fixtures/headers/cors.toml
index 091b207a5..39d696927 100644
--- a/integration/fixtures/headers/cors.toml
+++ b/integration/fixtures/headers/cors.toml
@@ -1,11 +1,14 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
+[log]
+logLevel = "DEBUG"
 
 [entrypoints]
   [entrypoints.web]
     address = ":8000"
 
-[log]
-logLevel = "DEBUG"
-
 [providers]
    [providers.file]
 
diff --git a/integration/fixtures/healthcheck/multiple-entrypoints-drr.toml b/integration/fixtures/healthcheck/multiple-entrypoints-drr.toml
index abbb3c9c0..641be97ca 100644
--- a/integration/fixtures/healthcheck/multiple-entrypoints-drr.toml
+++ b/integration/fixtures/healthcheck/multiple-entrypoints-drr.toml
@@ -1,3 +1,7 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
 [log]
 logLevel = "DEBUG"
 
diff --git a/integration/fixtures/healthcheck/multiple-entrypoints-wrr.toml b/integration/fixtures/healthcheck/multiple-entrypoints-wrr.toml
index e84bdb485..658b5bafb 100644
--- a/integration/fixtures/healthcheck/multiple-entrypoints-wrr.toml
+++ b/integration/fixtures/healthcheck/multiple-entrypoints-wrr.toml
@@ -1,3 +1,7 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
 [log]
 logLevel = "DEBUG"
 
diff --git a/integration/fixtures/healthcheck/port_overload.toml b/integration/fixtures/healthcheck/port_overload.toml
index 9f00f94b6..7587fb017 100644
--- a/integration/fixtures/healthcheck/port_overload.toml
+++ b/integration/fixtures/healthcheck/port_overload.toml
@@ -1,3 +1,7 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
 [log]
 logLevel = "DEBUG"
 
diff --git a/integration/fixtures/healthcheck/simple.toml b/integration/fixtures/healthcheck/simple.toml
index 87958e44c..7a848c775 100644
--- a/integration/fixtures/healthcheck/simple.toml
+++ b/integration/fixtures/healthcheck/simple.toml
@@ -1,3 +1,7 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
 [log]
 logLevel = "DEBUG"
 
diff --git a/integration/fixtures/https/clientca/https_1ca1config.toml b/integration/fixtures/https/clientca/https_1ca1config.toml
index ee87756ec..645bf373a 100644
--- a/integration/fixtures/https/clientca/https_1ca1config.toml
+++ b/integration/fixtures/https/clientca/https_1ca1config.toml
@@ -1,3 +1,7 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
 [log]
 logLevel = "DEBUG"
 
diff --git a/integration/fixtures/https/clientca/https_2ca1config.toml b/integration/fixtures/https/clientca/https_2ca1config.toml
index 864676369..c4964f028 100644
--- a/integration/fixtures/https/clientca/https_2ca1config.toml
+++ b/integration/fixtures/https/clientca/https_2ca1config.toml
@@ -1,3 +1,7 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
 [log]
 logLevel = "DEBUG"
 
diff --git a/integration/fixtures/https/clientca/https_2ca2config.toml b/integration/fixtures/https/clientca/https_2ca2config.toml
index f14189645..0a7fb6263 100644
--- a/integration/fixtures/https/clientca/https_2ca2config.toml
+++ b/integration/fixtures/https/clientca/https_2ca2config.toml
@@ -1,7 +1,10 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
 [log]
 logLevel = "DEBUG"
 
-
 [entrypoints]
   [entrypoints.web-secure]
   address = ":4443"
diff --git a/integration/fixtures/https/dynamic_https_sni.toml b/integration/fixtures/https/dynamic_https_sni.toml
index 6d402c640..7734b40e7 100644
--- a/integration/fixtures/https/dynamic_https_sni.toml
+++ b/integration/fixtures/https/dynamic_https_sni.toml
@@ -1,5 +1,9 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
 [log]
-  logLevel = "DEBUG"
+logLevel = "DEBUG"
 
 [entrypoints]
   [entrypoints.web-secure]
diff --git a/integration/fixtures/https/dynamic_https_sni_default_cert.toml b/integration/fixtures/https/dynamic_https_sni_default_cert.toml
index 781b331be..5701ae4e2 100644
--- a/integration/fixtures/https/dynamic_https_sni_default_cert.toml
+++ b/integration/fixtures/https/dynamic_https_sni_default_cert.toml
@@ -1,5 +1,9 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
 [log]
-   logLevel = "DEBUG"
+logLevel = "DEBUG"
 
 [entrypoints]
   [entrypoints.web-secure]
diff --git a/integration/fixtures/https/https_redirect.toml b/integration/fixtures/https/https_redirect.toml
index 12bb081c8..7897c0daf 100644
--- a/integration/fixtures/https/https_redirect.toml
+++ b/integration/fixtures/https/https_redirect.toml
@@ -1,5 +1,9 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
 [log]
-  logLevel = "DEBUG"
+logLevel = "DEBUG"
 
 [entrypoints]
   [entrypoints.web]
diff --git a/integration/fixtures/https/https_sni.toml b/integration/fixtures/https/https_sni.toml
index 34b9cb537..3a225db89 100644
--- a/integration/fixtures/https/https_sni.toml
+++ b/integration/fixtures/https/https_sni.toml
@@ -1,5 +1,9 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
 [log]
-  logLevel = "DEBUG"
+logLevel = "DEBUG"
 
 [entrypoints]
   [entrypoints.web-secure]
diff --git a/integration/fixtures/https/https_sni_case_insensitive_dynamic.toml b/integration/fixtures/https/https_sni_case_insensitive_dynamic.toml
index 6107f6a94..0f26eb6ea 100644
--- a/integration/fixtures/https/https_sni_case_insensitive_dynamic.toml
+++ b/integration/fixtures/https/https_sni_case_insensitive_dynamic.toml
@@ -1,3 +1,8 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
+[log]
 logLevel = "DEBUG"
 
 [entrypoints]
diff --git a/integration/fixtures/https/https_sni_default_cert.toml b/integration/fixtures/https/https_sni_default_cert.toml
index d22f72d6d..757346226 100644
--- a/integration/fixtures/https/https_sni_default_cert.toml
+++ b/integration/fixtures/https/https_sni_default_cert.toml
@@ -1,5 +1,9 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
 [log]
-   logLevel = "DEBUG"
+logLevel = "DEBUG"
 
 [entrypoints]
   [entrypoints.web-secure]
diff --git a/integration/fixtures/https/https_sni_strict.toml b/integration/fixtures/https/https_sni_strict.toml
index d6fabefa2..653bd2cc5 100644
--- a/integration/fixtures/https/https_sni_strict.toml
+++ b/integration/fixtures/https/https_sni_strict.toml
@@ -1,5 +1,9 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
 [log]
-  logLevel = "DEBUG"
+logLevel = "DEBUG"
 
 [entrypoints]
   [entrypoints.web-secure]
diff --git a/integration/fixtures/https/rootcas/https.toml b/integration/fixtures/https/rootcas/https.toml
index f2a610a0f..0638a7f3b 100644
--- a/integration/fixtures/https/rootcas/https.toml
+++ b/integration/fixtures/https/rootcas/https.toml
@@ -1,7 +1,10 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
 [log]
 logLevel = "DEBUG"
 
-
 [serversTransport]
 # Use certificate in net/internal/testcert.go
 rootCAs =  [ """
diff --git a/integration/fixtures/https/rootcas/https_with_file.toml b/integration/fixtures/https/rootcas/https_with_file.toml
index bea7a169c..c528c25e7 100644
--- a/integration/fixtures/https/rootcas/https_with_file.toml
+++ b/integration/fixtures/https/rootcas/https_with_file.toml
@@ -1,3 +1,7 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
 [log]
 logLevel = "DEBUG"
 
diff --git a/integration/fixtures/k8s_crd.toml b/integration/fixtures/k8s_crd.toml
index 0c869061f..6d3473478 100644
--- a/integration/fixtures/k8s_crd.toml
+++ b/integration/fixtures/k8s_crd.toml
@@ -1,5 +1,9 @@
 [global]
-debug=true
+checkNewVersion = false
+sendAnonymousUsage = false
+
+[log]
+logLevel = "DEBUG"
 
 [entryPoints]
   [entryPoints.web]
diff --git a/integration/fixtures/k8s_default.toml b/integration/fixtures/k8s_default.toml
index 6ba4a1a65..c004d1603 100644
--- a/integration/fixtures/k8s_default.toml
+++ b/integration/fixtures/k8s_default.toml
@@ -1,5 +1,9 @@
 [global]
-debug=true
+checkNewVersion = false
+sendAnonymousUsage = false
+
+[log]
+logLevel = "DEBUG"
 
 [entryPoints]
   [entryPoints.web]
diff --git a/integration/fixtures/keep_trailing_slash.toml b/integration/fixtures/keep_trailing_slash.toml
deleted file mode 100644
index e03f4fa11..000000000
--- a/integration/fixtures/keep_trailing_slash.toml
+++ /dev/null
@@ -1,25 +0,0 @@
-keepTrailingSlash = {{ .KeepTrailingSlash }}
-
-[log]
-logLevel = "DEBUG"
-
-
-[entrypoints]
-  [entrypoints.web]
-  address = ":8000"
-
-[providers]
-   [providers.file]
-
-# rules
-[backends]
-  [backends.backend1]
-    [backends.backend1.servers.server1]
-       url = "http://172.17.0.2:80"
-       weight = 1
-
-[frontends]
-  [frontends.frontend1]
-     backend = "backend1"
-     [frontends.frontend1.routes.test_1]
-        rule = "Path(`/test/foo`)"
diff --git a/integration/fixtures/log_rotation_config.toml b/integration/fixtures/log_rotation_config.toml
index be7320b14..a819b79f2 100644
--- a/integration/fixtures/log_rotation_config.toml
+++ b/integration/fixtures/log_rotation_config.toml
@@ -1,30 +1,23 @@
-################################################################
-# Global configuration
-################################################################
-[accessLog]
-filePath = "access.log"
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
 
 [log]
 filePath = "traefik.log"
 logLevel = "ERROR"
 
+[accessLog]
+filePath = "access.log"
+
 [entrypoints]
   [entrypoints.web]
   address = ":8000"
   [entrypoints.api]
   address = ":7888"
 
-checkNewVersion = false
-
-################################################################
-# Api configuration backend
-################################################################
 [api]
 entryPoint = "api"
 
-################################################################
-# File configuration backend
-################################################################
 [providers]
    [providers.file]
 
diff --git a/integration/fixtures/marathon/simple.toml b/integration/fixtures/marathon/simple.toml
index 76c76f53f..a052ad2f7 100644
--- a/integration/fixtures/marathon/simple.toml
+++ b/integration/fixtures/marathon/simple.toml
@@ -1,3 +1,7 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
 [log]
 logLevel = "DEBUG"
 
diff --git a/integration/fixtures/multiple_provider.toml b/integration/fixtures/multiple_provider.toml
index c897695a7..b5f80b2e2 100644
--- a/integration/fixtures/multiple_provider.toml
+++ b/integration/fixtures/multiple_provider.toml
@@ -1,5 +1,9 @@
 [global]
-debug=true
+checkNewVersion = false
+sendAnonymousUsage = false
+
+[log]
+logLevel = "DEBUG"
 
 [entrypoints]
   [entrypoints.web]
diff --git a/integration/fixtures/multiprovider.toml b/integration/fixtures/multiprovider.toml
index 2753c4b30..e7537afb1 100644
--- a/integration/fixtures/multiprovider.toml
+++ b/integration/fixtures/multiprovider.toml
@@ -1,3 +1,7 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
 [log]
 logLevel = "DEBUG"
 
diff --git a/integration/fixtures/proxy-protocol/with.toml b/integration/fixtures/proxy-protocol/with.toml
index e762c1268..c761823fd 100644
--- a/integration/fixtures/proxy-protocol/with.toml
+++ b/integration/fixtures/proxy-protocol/with.toml
@@ -1,3 +1,7 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
 [log]
 logLevel = "DEBUG"
 
diff --git a/integration/fixtures/proxy-protocol/without.toml b/integration/fixtures/proxy-protocol/without.toml
index aef6638c9..77c15b59c 100644
--- a/integration/fixtures/proxy-protocol/without.toml
+++ b/integration/fixtures/proxy-protocol/without.toml
@@ -1,3 +1,7 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
 [log]
 logLevel = "DEBUG"
 
diff --git a/integration/fixtures/ratelimit/simple.toml b/integration/fixtures/ratelimit/simple.toml
index 8697df7a2..d9c979e12 100644
--- a/integration/fixtures/ratelimit/simple.toml
+++ b/integration/fixtures/ratelimit/simple.toml
@@ -1,3 +1,7 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
 [log]
 logLevel = "DEBUG"
 
diff --git a/integration/fixtures/reqacceptgrace.toml b/integration/fixtures/reqacceptgrace.toml
index 7bff129d8..c5b459829 100644
--- a/integration/fixtures/reqacceptgrace.toml
+++ b/integration/fixtures/reqacceptgrace.toml
@@ -1,3 +1,7 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
 [log]
 logLevel = "DEBUG"
 
@@ -12,6 +16,8 @@ logLevel = "DEBUG"
 [entrypoints.traefik.transport.lifeCycle]
     RequestAcceptGraceTimeout = "10s"
 
+[ping]
+
 [providers]
    [providers.file]
 
@@ -28,4 +34,3 @@ logLevel = "DEBUG"
         URL = "{{.Server}}"
         Weight = 1
 
-[ping]
diff --git a/integration/fixtures/rest/simple.toml b/integration/fixtures/rest/simple.toml
index f101729b3..f2896a229 100644
--- a/integration/fixtures/rest/simple.toml
+++ b/integration/fixtures/rest/simple.toml
@@ -1,3 +1,9 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
+[log]
+logLevel = "DEBUG"
 
 [entrypoints]
   [entrypoints.web]
@@ -5,8 +11,5 @@
 
 [api]
 
-[log]
-logLevel = "DEBUG"
-
 [providers]
    [providers.rest]
diff --git a/integration/fixtures/retry/simple.toml b/integration/fixtures/retry/simple.toml
index d195702d0..03b2cb8b4 100644
--- a/integration/fixtures/retry/simple.toml
+++ b/integration/fixtures/retry/simple.toml
@@ -1,3 +1,7 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
 [log]
 logLevel = "DEBUG"
 
diff --git a/integration/fixtures/simple_auth.toml b/integration/fixtures/simple_auth.toml
index a527b8216..2c4e48c6a 100644
--- a/integration/fixtures/simple_auth.toml
+++ b/integration/fixtures/simple_auth.toml
@@ -1,3 +1,7 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
 [log]
 logLevel = "DEBUG"
 
diff --git a/integration/fixtures/simple_default.toml b/integration/fixtures/simple_default.toml
index e5687a0c1..4be589581 100644
--- a/integration/fixtures/simple_default.toml
+++ b/integration/fixtures/simple_default.toml
@@ -1,3 +1,6 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
 
 [entrypoints]
   [entrypoints.web]
diff --git a/integration/fixtures/simple_hostresolver.toml b/integration/fixtures/simple_hostresolver.toml
index 29d0e10d4..053a89a6b 100644
--- a/integration/fixtures/simple_hostresolver.toml
+++ b/integration/fixtures/simple_hostresolver.toml
@@ -1,3 +1,7 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
 [log]
 logLevel = "DEBUG"
 
diff --git a/integration/fixtures/simple_stats.toml b/integration/fixtures/simple_stats.toml
index 59fd43d83..317b45e95 100644
--- a/integration/fixtures/simple_stats.toml
+++ b/integration/fixtures/simple_stats.toml
@@ -1,5 +1,9 @@
 [global]
-debug=true
+checkNewVersion = false
+sendAnonymousUsage = false
+
+[log]
+logLevel = "DEBUG"
 
 [entrypoints]
   [entrypoints.web]
diff --git a/integration/fixtures/simple_web.toml b/integration/fixtures/simple_web.toml
index 304d4722d..3eb2cfd4a 100644
--- a/integration/fixtures/simple_web.toml
+++ b/integration/fixtures/simple_web.toml
@@ -1,3 +1,7 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
 [log]
 logLevel = "DEBUG"
 
diff --git a/integration/fixtures/simple_whitelist.toml b/integration/fixtures/simple_whitelist.toml
index 95de6eebf..b6cbf1463 100644
--- a/integration/fixtures/simple_whitelist.toml
+++ b/integration/fixtures/simple_whitelist.toml
@@ -1,3 +1,7 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
 [log]
 logLevel = "DEBUG"
 
diff --git a/integration/fixtures/tcp/mixed.toml b/integration/fixtures/tcp/mixed.toml
index 778bc98ef..6fc65c777 100644
--- a/integration/fixtures/tcp/mixed.toml
+++ b/integration/fixtures/tcp/mixed.toml
@@ -1,3 +1,10 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
+[log]
+logLevel = "DEBUG"
+
 [entrypoints]
   [entrypoints.tcp]
     address = ":8093"
diff --git a/integration/fixtures/tcp/non-tls-fallback.toml b/integration/fixtures/tcp/non-tls-fallback.toml
index 93b792474..4c1b02e84 100644
--- a/integration/fixtures/tcp/non-tls-fallback.toml
+++ b/integration/fixtures/tcp/non-tls-fallback.toml
@@ -1,12 +1,16 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
+[log]
+logLevel = "DEBUG"
+
 [entrypoints]
   [entrypoints.tcp]
     address = ":8093"
 
 [api]
 
-[global]
-   debug = true
-
 [providers.file]
 
 [tcp]
diff --git a/integration/fixtures/tcp/non-tls.toml b/integration/fixtures/tcp/non-tls.toml
index 00405aa7e..a51dbe764 100644
--- a/integration/fixtures/tcp/non-tls.toml
+++ b/integration/fixtures/tcp/non-tls.toml
@@ -1,12 +1,16 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
+[log]
+logLevel = "DEBUG"
+
 [entrypoints]
   [entrypoints.tcp]
     address = ":8093"
 
 [api]
 
-[global]
-   debug = true
-
 [providers.file]
 
 [tcp]
diff --git a/integration/fixtures/timeout/forwarding_timeouts.toml b/integration/fixtures/timeout/forwarding_timeouts.toml
index 14844fac8..ff6411dcf 100644
--- a/integration/fixtures/timeout/forwarding_timeouts.toml
+++ b/integration/fixtures/timeout/forwarding_timeouts.toml
@@ -1,12 +1,14 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
 [log]
 logLevel = "DEBUG"
 
-
 [serversTransport.forwardingTimeouts]
   dialTimeout = "300ms"
   responseHeaderTimeout = "300ms"
 
-
 [entrypoints]
   [entrypoints.web]
     address = ":8000"
@@ -16,7 +18,6 @@ logLevel = "DEBUG"
 
 [api]
 
-
 [providers]
    [providers.file]
 
diff --git a/integration/fixtures/tlsclientheaders/simple.toml b/integration/fixtures/tlsclientheaders/simple.toml
index 758ca0b88..9a0051027 100644
--- a/integration/fixtures/tlsclientheaders/simple.toml
+++ b/integration/fixtures/tlsclientheaders/simple.toml
@@ -1,9 +1,10 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
 [log]
 logLevel = "DEBUG"
 
-[global]
-debug = true
-
 [serversTransport]
 rootCAs = [ """{{ .RootCertContent }}""" ]
 
diff --git a/integration/fixtures/tracing/simple.toml b/integration/fixtures/tracing/simple.toml
index 53bf8bbe2..1f33124b8 100644
--- a/integration/fixtures/tracing/simple.toml
+++ b/integration/fixtures/tracing/simple.toml
@@ -1,9 +1,10 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
 [log]
 logLevel = "DEBUG"
 
-[global]
-debug = true
-
 [api]
 
 [entrypoints]
diff --git a/integration/fixtures/traefik_log_config.toml b/integration/fixtures/traefik_log_config.toml
index 0ccbb383b..98f476735 100644
--- a/integration/fixtures/traefik_log_config.toml
+++ b/integration/fixtures/traefik_log_config.toml
@@ -1,13 +1,11 @@
-################################################################
-# Global configuration
-################################################################
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
 [log]
 logLevel = "DEBUG"
 filePath = "traefik.log"
 
-[global]
-checkNewVersion = false
-
 [accessLog]
   filePath = "access.log"
 
diff --git a/integration/fixtures/websocket/config.toml b/integration/fixtures/websocket/config.toml
index 52f8616fc..209d2abdf 100644
--- a/integration/fixtures/websocket/config.toml
+++ b/integration/fixtures/websocket/config.toml
@@ -1,3 +1,7 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
 [log]
 logLevel = "DEBUG"
 
diff --git a/integration/fixtures/websocket/config_https.toml b/integration/fixtures/websocket/config_https.toml
index 962c432d9..90fb733da 100644
--- a/integration/fixtures/websocket/config_https.toml
+++ b/integration/fixtures/websocket/config_https.toml
@@ -1,3 +1,7 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
 [log]
 logLevel = "DEBUG"
 
@@ -10,7 +14,6 @@ insecureSkipVerify=true
 
 [api]
 
-
 [providers]
    [providers.file]
 
diff --git a/integration/simple_test.go b/integration/simple_test.go
index e3c4060ca..e0d72ad04 100644
--- a/integration/simple_test.go
+++ b/integration/simple_test.go
@@ -432,30 +432,6 @@ func (s *SimpleSuite) TestXForwardedHeaders(c *check.C) {
 	c.Assert(err, checker.IsNil)
 }
 
-func (s *SimpleSuite) TestKeepTrailingSlash(c *check.C) {
-	file := s.adaptFile(c, "fixtures/keep_trailing_slash.toml", struct {
-		KeepTrailingSlash bool
-	}{true})
-	defer os.Remove(file)
-
-	cmd, output := s.traefikCmd(withConfigFile(file))
-	defer output(c)
-
-	err := cmd.Start()
-	c.Assert(err, checker.IsNil)
-	defer cmd.Process.Kill()
-
-	oldCheckRedirect := http.DefaultClient.CheckRedirect
-	http.DefaultClient.CheckRedirect = func(req *http.Request, via []*http.Request) error {
-		return http.ErrUseLastResponse
-	}
-
-	err = try.GetRequest("http://127.0.0.1:8000/test/foo/", 1*time.Second, try.StatusCodeIs(http.StatusNotFound))
-	c.Assert(err, checker.IsNil)
-
-	http.DefaultClient.CheckRedirect = oldCheckRedirect
-}
-
 func (s *SimpleSuite) TestMultiprovider(c *check.C) {
 	s.createComposeProject(c, "base")
 	s.composeProject.Start(c)