Merge branch 'master' into qq-testing

62 files changed, 160 insertions, 828 deletions

diff --git a/test/backing_queue_SUITE.erl b/test/backing_queue_SUITE.erl
index 94cbd48e8c..5864c387c5 100644
--- a/test/backing_queue_SUITE.erl
+++ b/test/backing_queue_SUITE.erl
@@ -11,7 +11,7 @@
 %% The Original Code is RabbitMQ.
 %%
 %% The Initial Developer of the Original Code is GoPivotal, Inc.
-%% Copyright (c) 2011-2017 Pivotal Software, Inc.  All rights reserved.
+%% Copyright (c) 2011-2019 Pivotal Software, Inc.  All rights reserved.
 %%
 
 -module(backing_queue_SUITE).
diff --git a/test/channel_interceptor_SUITE.erl b/test/channel_interceptor_SUITE.erl
index 4081086f4f..e2711fda86 100644
--- a/test/channel_interceptor_SUITE.erl
+++ b/test/channel_interceptor_SUITE.erl
@@ -11,7 +11,7 @@
 %% The Original Code is RabbitMQ.
 %%
 %% The Initial Developer of the Original Code is GoPivotal, Inc.
-%% Copyright (c) 2016 Pivotal Software, Inc.  All rights reserved.
+%% Copyright (c) 2016-2019 Pivotal Software, Inc.  All rights reserved.
 %%
 
 -module(channel_interceptor_SUITE).
diff --git a/test/channel_operation_timeout_SUITE.erl b/test/channel_operation_timeout_SUITE.erl
index 7b41b9c225..9bfa0ae07a 100644
--- a/test/channel_operation_timeout_SUITE.erl
+++ b/test/channel_operation_timeout_SUITE.erl
@@ -11,7 +11,7 @@
 %% The Original Code is RabbitMQ.
 %%
 %% The Initial Developer of the Original Code is GoPivotal, Inc.
-%% Copyright (c) 2007-2015 Pivotal Software, Inc.  All rights reserved.
+%% Copyright (c) 2007-2019 Pivotal Software, Inc.  All rights reserved.
 %%
 
 -module(channel_operation_timeout_SUITE).
diff --git a/test/channel_operation_timeout_test_queue.erl b/test/channel_operation_timeout_test_queue.erl
index 59de0cb5c7..d414072e2c 100644
--- a/test/channel_operation_timeout_test_queue.erl
+++ b/test/channel_operation_timeout_test_queue.erl
@@ -11,7 +11,7 @@
 %% The Original Code is RabbitMQ.
 %%
 %% The Initial Developer of the Original Code is GoPivotal, Inc.
-%% Copyright (c) 2007-2017 Pivotal Software, Inc.  All rights reserved.
+%% Copyright (c) 2007-2019 Pivotal Software, Inc.  All rights reserved.
 %%
 
 -module(channel_operation_timeout_test_queue).
diff --git a/test/cluster_SUITE.erl b/test/cluster_SUITE.erl
index 62928aae9f..c52dc9ef64 100644
--- a/test/cluster_SUITE.erl
+++ b/test/cluster_SUITE.erl
@@ -11,7 +11,7 @@
 %% The Original Code is RabbitMQ.
 %%
 %% The Initial Developer of the Original Code is GoPivotal, Inc.
-%% Copyright (c) 2011-2017 Pivotal Software, Inc.  All rights reserved.
+%% Copyright (c) 2011-2019 Pivotal Software, Inc.  All rights reserved.
 %%
 
 -module(cluster_SUITE).
diff --git a/test/cluster_formation_locking_SUITE.erl b/test/cluster_formation_locking_SUITE.erl
index 25b2df308c..176113c496 100644
--- a/test/cluster_formation_locking_SUITE.erl
+++ b/test/cluster_formation_locking_SUITE.erl
@@ -11,7 +11,7 @@
 %% The Original Code is RabbitMQ.
 %%
 %% The Initial Developer of the Original Code is GoPivotal, Inc.
-%% Copyright (c) 2007-2017 Pivotal Software, Inc.  All rights reserved.
+%% Copyright (c) 2007-2019 Pivotal Software, Inc.  All rights reserved.
 %%
 -module(cluster_formation_locking_SUITE).
 
@@ -38,13 +38,13 @@ groups() ->
 init_per_testcase(Testcase, Config) when Testcase == init_with_lock_exits_after_errors;
                                          Testcase == init_with_lock_not_supported;
                                          Testcase == init_with_lock_supported ->
-    application:set_env(rabbit, cluster_formation, 
+    application:set_env(rabbit, cluster_formation,
                         [{peer_discover_backend, peer_discover_classic_config},
                          {lock_acquisition_failure_mode, fail}]),
     ok = meck:new(rabbit_peer_discovery_classic_config, [passthrough]),
     Config;
 init_per_testcase(init_with_lock_ignore_after_errors, Config) ->
-    application:set_env(rabbit, cluster_formation, 
+    application:set_env(rabbit, cluster_formation,
                         [{peer_discover_backend, peer_discover_classic_config},
                          {lock_acquisition_failure_mode, ignore}]),
     ok = meck:new(rabbit_peer_discovery_classic_config, [passthrough]),
@@ -52,7 +52,7 @@ init_per_testcase(init_with_lock_ignore_after_errors, Config) ->
 
 end_per_testcase(_, _) ->
     meck:unload(),
-    application:unset_env(rabbit, cluster_formation).    
+    application:unset_env(rabbit, cluster_formation).
 
 init_with_lock_exits_after_errors(_Config) ->
     meck:expect(rabbit_peer_discovery_classic_config, lock, fun(_) -> {error, "test error"} end),
diff --git a/test/cluster_rename_SUITE.erl b/test/cluster_rename_SUITE.erl
index dd8147e509..a7743a8891 100644
--- a/test/cluster_rename_SUITE.erl
+++ b/test/cluster_rename_SUITE.erl
@@ -11,7 +11,7 @@
 %% The Original Code is RabbitMQ.
 %%
 %% The Initial Developer of the Original Code is GoPivotal, Inc.
-%% Copyright (c) 2007-2017 Pivotal Software, Inc.  All rights reserved.
+%% Copyright (c) 2007-2019 Pivotal Software, Inc.  All rights reserved.
 %%
 
 -module(cluster_rename_SUITE).
diff --git a/test/clustering_management_SUITE.erl b/test/clustering_management_SUITE.erl
index 54f4bafbfd..120257feb9 100644
--- a/test/clustering_management_SUITE.erl
+++ b/test/clustering_management_SUITE.erl
@@ -11,7 +11,7 @@
 %% The Original Code is RabbitMQ.
 %%
 %% The Initial Developer of the Original Code is GoPivotal, Inc.
-%% Copyright (c) 2007-2017 Pivotal Software, Inc.  All rights reserved.
+%% Copyright (c) 2007-2019 Pivotal Software, Inc.  All rights reserved.
 %%
 
 -module(clustering_management_SUITE).
diff --git a/test/config_schema_SUITE.erl b/test/config_schema_SUITE.erl
index 4c143cd1aa..80363130d8 100644
--- a/test/config_schema_SUITE.erl
+++ b/test/config_schema_SUITE.erl
@@ -11,7 +11,7 @@
 %% The Original Code is RabbitMQ.
 %%
 %% The Initial Developer of the Original Code is GoPivotal, Inc.
-%% Copyright (c) 2016 Pivotal Software, Inc.  All rights reserved.
+%% Copyright (c) 2016-2019 Pivotal Software, Inc.  All rights reserved.
 %%
 
 -module(config_schema_SUITE).
@@ -61,4 +61,3 @@ run_snippets(Config) ->
 
 run_snippets1(Config) ->
     rabbit_ct_config_schema:run_snippets(Config).
-
diff --git a/test/config_schema_SUITE_data/rabbit.snippets b/test/config_schema_SUITE_data/rabbit.snippets
index a7a06aaadf..0cd274b757 100644
--- a/test/config_schema_SUITE_data/rabbit.snippets
+++ b/test/config_schema_SUITE_data/rabbit.snippets
@@ -1,56 +1,24 @@
 [{internal_auth_backend,
   "auth_backends.1 = internal",
-  [{rabbit,[{auth_backends,[rabbit_auth_backend_internal]}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+  [{rabbit,[{auth_backends,[rabbit_auth_backend_internal]}]}],
   []},
  {ldap_auth_backend,
   "auth_backends.1 = ldap",
-  [{rabbit,[{auth_backends,[rabbit_auth_backend_ldap]}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+  [{rabbit,[{auth_backends,[rabbit_auth_backend_ldap]}]}],
   []},
  {multiple_auth_backends,
  "auth_backends.1 = ldap
 auth_backends.2 = internal",
   [{rabbit,
        [{auth_backends,
-            [rabbit_auth_backend_ldap,rabbit_auth_backend_internal]}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+            [rabbit_auth_backend_ldap,rabbit_auth_backend_internal]}]}],
   []},
  {full_name_auth_backend,
   "auth_backends.1 = ldap
 # uses module name instead of a short alias, \"http\"
 auth_backends.2 = rabbit_auth_backend_http",
   [{rabbit,
-       [{auth_backends,[rabbit_auth_backend_ldap,rabbit_auth_backend_http]}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+       [{auth_backends,[rabbit_auth_backend_ldap,rabbit_auth_backend_http]}]}],
   []},
  {third_party_auth_backend,
   "auth_backends.1.authn = internal
@@ -58,30 +26,14 @@ auth_backends.2 = rabbit_auth_backend_http",
 auth_backends.1.authz = rabbit_auth_backend_ip_range",
   [{rabbit,
        [{auth_backends,
-            [{rabbit_auth_backend_internal,rabbit_auth_backend_ip_range}]}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+            [{rabbit_auth_backend_internal,rabbit_auth_backend_ip_range}]}]}],
   []},
  {authn_authz_backend,
  "auth_backends.1.authn = ldap
 auth_backends.1.authz = internal",
   [{rabbit,
        [{auth_backends,
-            [{rabbit_auth_backend_ldap,rabbit_auth_backend_internal}]}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+            [{rabbit_auth_backend_ldap,rabbit_auth_backend_internal}]}]}],
   []},
  {authn_authz_multiple_backends,
   "auth_backends.1.authn = ldap
@@ -90,29 +42,13 @@ auth_backends.2       = internal",
   [{rabbit,
        [{auth_backends,
             [{rabbit_auth_backend_ldap,rabbit_auth_backend_internal},
-             rabbit_auth_backend_internal]}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+             rabbit_auth_backend_internal]}]}],
   []},
  {authn_backend_only,
   "auth_backends.1.authn = ldap",
   [{rabbit,
        [{auth_backends,
-            [{rabbit_auth_backend_ldap,rabbit_auth_backend_ldap}]}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+            [{rabbit_auth_backend_ldap,rabbit_auth_backend_ldap}]}]}],
   []},
  {ssl_options,
   "ssl_options.cacertfile          = test/config_schema_SUITE_data/certs/cacert.pem
@@ -126,50 +62,15 @@ ssl_options.fail_if_no_peer_cert = true",
              {certfile,"test/config_schema_SUITE_data/certs/cert.pem"},
              {keyfile,"test/config_schema_SUITE_data/certs/key.pem"},
              {verify,verify_peer},
-             {fail_if_no_peer_cert,true}]}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+             {fail_if_no_peer_cert,true}]}]}],
   []},
  {tcp_listener,
   "listeners.tcp.default = 5673",
-    [{rabbit,[{tcp_listeners,[5673]}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
- []},
+    [{rabbit,[{tcp_listeners,[5673]}]}],[]},
  {ssl_listener,
-  "listeners.ssl = none",[{rabbit,[{ssl_listeners,[]}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
- []},
+  "listeners.ssl = none",[{rabbit,[{ssl_listeners,[]}]}],[]},
  {num_acceptors,
-  "num_acceptors.ssl = 1",[{rabbit,[{num_ssl_acceptors,1}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
- []},
+  "num_acceptors.ssl = 1",[{rabbit,[{num_ssl_acceptors,1}]}],[]},
  {default_user_settings,
   "default_user = guest
 default_pass = guest
@@ -181,15 +82,7 @@ default_permissions.write = .*",
        [{default_user,<<"guest">>},
         {default_pass,<<"guest">>},
         {default_user_tags,[administrator]},
-        {default_permissions,[<<".*">>,<<".*">>,<<".*">>]}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+        {default_permissions,[<<".*">>,<<".*">>,<<".*">>]}]}],
   []},
  {cluster_formation,
   "cluster_formation.peer_discovery_backend = rabbit_peer_discovery_classic_config
@@ -200,15 +93,7 @@ cluster_formation.node_type = disc",
        [{cluster_formation,
             [{peer_discovery_backend,rabbit_peer_discovery_classic_config},
              {node_type,disc}]},
-        {cluster_nodes,{[rabbit@hostname2,rabbit@hostname1],disc}}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+        {cluster_nodes,{[rabbit@hostname2,rabbit@hostname1],disc}}]}],
   []},
  {cluster_formation_disK,
   "cluster_formation.peer_discovery_backend = rabbit_peer_discovery_classic_config
@@ -219,248 +104,92 @@ cluster_formation.node_type = disc",
        [{cluster_formation,
             [{peer_discovery_backend,rabbit_peer_discovery_classic_config},
              {node_type,disc}]},
-        {cluster_nodes,{[rabbit@hostname2,rabbit@hostname1],disc}}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+        {cluster_nodes,{[rabbit@hostname2,rabbit@hostname1],disc}}]}],
   []},
  {cluster_formation_ram_ignored,
-  "cluster_formation.node_type = ram",[
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],[]},
+  "cluster_formation.node_type = ram",[],[]},
  {tcp_listen_options,
   "tcp_listen_options.backlog = 128
 tcp_listen_options.nodelay = true
 tcp_listen_options.exit_on_close = false",
   [{rabbit,
        [{tcp_listen_options,
-            [{backlog,128},{nodelay,true},{exit_on_close,false}]}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+            [{backlog,128},{nodelay,true},{exit_on_close,false}]}]}],
   []},
  {vm_memory_watermark_absolute,
   "vm_memory_high_watermark.absolute = 1073741824",
-  [{rabbit,[{vm_memory_high_watermark,{absolute,1073741824}}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+  [{rabbit,[{vm_memory_high_watermark,{absolute,1073741824}}]}],
   []},
  {vm_memory_watermark_absolute_units,
   "vm_memory_high_watermark.absolute = 1024MB",
-  [{rabbit,[{vm_memory_high_watermark,{absolute,"1024MB"}}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+  [{rabbit,[{vm_memory_high_watermark,{absolute,"1024MB"}}]}],
   []},
  {vm_memory_watermark_paging_ratio,
   "vm_memory_high_watermark_paging_ratio = 0.75
    vm_memory_high_watermark.relative = 0.4",
   [{rabbit,
        [{vm_memory_high_watermark_paging_ratio,0.75},
-        {vm_memory_high_watermark,0.4}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+        {vm_memory_high_watermark,0.4}]}],
   []},
  {memory_monitor_interval, "memory_monitor_interval = 5000",
   [{rabbit,
-       [{memory_monitor_interval, 5000}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+       [{memory_monitor_interval, 5000}]}],
   []},
  {vm_memory_calculation_strategy, "vm_memory_calculation_strategy = rss",
   [{rabbit,
-       [{vm_memory_calculation_strategy, rss}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+       [{vm_memory_calculation_strategy, rss}]}],
   []},
  {vm_memory_calculation_strategy, "vm_memory_calculation_strategy = erlang",
   [{rabbit,
-       [{vm_memory_calculation_strategy, erlang}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+       [{vm_memory_calculation_strategy, erlang}]}],
   []},
  {vm_memory_calculation_strategy, "vm_memory_calculation_strategy = allocated",
   [{rabbit,
-       [{vm_memory_calculation_strategy, allocated}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+       [{vm_memory_calculation_strategy, allocated}]}],
   []},
  {vm_memory_calculation_strategy, "vm_memory_calculation_strategy = legacy",
   [{rabbit,
-       [{vm_memory_calculation_strategy, legacy}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+       [{vm_memory_calculation_strategy, legacy}]}],
   []},
  {total_memory_available_override_value,
   "total_memory_available_override_value = 1000000000",
-  [{rabbit,[{total_memory_available_override_value, 1000000000}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+  [{rabbit,[{total_memory_available_override_value, 1000000000}]}],
   []},
  {total_memory_available_override_value_units,
   "total_memory_available_override_value = 1024MB",
-  [{rabbit,[{total_memory_available_override_value, "1024MB"}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+  [{rabbit,[{total_memory_available_override_value, "1024MB"}]}],
   []},
  {connection_max,
   "connection_max = 999",
-  [{rabbit,[{connection_max, 999}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+  [{rabbit,[{connection_max, 999}]}],
   []},
  {connection_max,
   "connection_max = infinity",
-  [{rabbit,[{connection_max, infinity}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+  [{rabbit,[{connection_max, infinity}]}],
   []},
  {channel_max,
   "channel_max = 16",
-  [{rabbit,[{channel_max, 16}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+  [{rabbit,[{channel_max, 16}]}],
+  []},
+ {max_message_size,
+  "max_message_size = 131072",
+  [{rabbit, [{max_message_size, 131072}]}],
   []},
  {listeners_tcp_ip,
   "listeners.tcp.1 = 192.168.1.99:5672",
-  [{rabbit,[{tcp_listeners,[{"192.168.1.99",5672}]}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+  [{rabbit,[{tcp_listeners,[{"192.168.1.99",5672}]}]}],
   []},
  {listeners_tcp_ip_multiple,
   "listeners.tcp.1 = 127.0.0.1:5672
    listeners.tcp.2 = ::1:5672",
-  [{rabbit,[{tcp_listeners,[{"127.0.0.1",5672},{"::1",5672}]}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+  [{rabbit,[{tcp_listeners,[{"127.0.0.1",5672},{"::1",5672}]}]}],
   []},
  {listeners_tcp_ip_all,"listeners.tcp.1 = :::5672",
-  [{rabbit,[{tcp_listeners,[{"::",5672}]}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+  [{rabbit,[{tcp_listeners,[{"::",5672}]}]}],
   []},
  {listeners_tcp_ipv6,
   "listeners.tcp.1 = fe80::2acf:e9ff:fe17:f97b:5672",
-  [{rabbit,[{tcp_listeners,[{"fe80::2acf:e9ff:fe17:f97b",5672}]}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+  [{rabbit,[{tcp_listeners,[{"fe80::2acf:e9ff:fe17:f97b",5672}]}]}],
   []},
  {tcp_options_sndbuf,
   "tcp_listen_options.backlog = 128
@@ -469,15 +198,7 @@ tcp_listen_options.exit_on_close = false",
    tcp_listen_options.recbuf = 196608",
   [{rabbit,
        [{tcp_listen_options,
-            [{backlog,128},{nodelay,true},{sndbuf,196608},{recbuf,196608}]}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+            [{backlog,128},{nodelay,true},{sndbuf,196608},{recbuf,196608}]}]}],
   []},
  {tcp_listen_options_nodelay_with_kernel,
   "tcp_listen_options.backlog = 4096
@@ -488,40 +209,16 @@ tcp_listen_options.exit_on_close = false",
   [{kernel,
        [{inet_default_connect_options,[{nodelay,true}]},
         {inet_default_listen_options,[{nodelay,true}]}]},
-   {rabbit,[{tcp_listen_options,[{backlog,4096},{nodelay,true}]}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+   {rabbit,[{tcp_listen_options,[{backlog,4096},{nodelay,true}]}]}],
   []},
  {tcp_listen_options_nodelay,
   "tcp_listen_options.backlog = 4096
    tcp_listen_options.nodelay = true",
-  [{rabbit,[{tcp_listen_options,[{backlog,4096},{nodelay,true}]}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+  [{rabbit,[{tcp_listen_options,[{backlog,4096},{nodelay,true}]}]}],
   []},
  {ssl_handshake_timeout,
   "ssl_handshake_timeout = 10000",
-  [{rabbit,[{ssl_handshake_timeout,10000}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+  [{rabbit,[{ssl_handshake_timeout,10000}]}],
   []},
  {cluster_partition_handling_pause_if_all_down,
   "cluster_partition_handling = pause_if_all_down
@@ -534,39 +231,15 @@ tcp_listen_options.exit_on_close = false",
    cluster_partition_handling.pause_if_all_down.nodes.2 = rabbit@myhost2",
   [{rabbit,
        [{cluster_partition_handling,
-            {pause_if_all_down,[rabbit@myhost2,rabbit@myhost1],ignore}}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+            {pause_if_all_down,[rabbit@myhost2,rabbit@myhost1],ignore}}]}],
   []},
  {cluster_partition_handling_autoheal,
   "cluster_partition_handling = autoheal",
-  [{rabbit,[{cluster_partition_handling,autoheal}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+  [{rabbit,[{cluster_partition_handling,autoheal}]}],
   []},
  {password_hashing,
   "password_hashing_module = rabbit_password_hashing_sha512",
-  [{rabbit,[{password_hashing_module,rabbit_password_hashing_sha512}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+  [{rabbit,[{password_hashing_module,rabbit_password_hashing_sha512}]}],
   []},
  {ssl_options_verify_peer,
   "listeners.ssl.1 = 5671
@@ -582,15 +255,7 @@ tcp_listen_options.exit_on_close = false",
              {certfile,"test/config_schema_SUITE_data/certs/cert.pem"},
              {keyfile,"test/config_schema_SUITE_data/certs/key.pem"},
              {verify,verify_peer},
-             {fail_if_no_peer_cert,false}]}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+             {fail_if_no_peer_cert,false}]}]}],
   []},
  {ssl_options_password,
   "listeners.ssl.1 = 5671
@@ -604,15 +269,7 @@ tcp_listen_options.exit_on_close = false",
             [{cacertfile,"test/config_schema_SUITE_data/certs/cacert.pem"},
              {certfile,"test/config_schema_SUITE_data/certs/cert.pem"},
              {keyfile,"test/config_schema_SUITE_data/certs/key.pem"},
-             {password,"t0p$3kRe7"}]}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+             {password,"t0p$3kRe7"}]}]}],
   []},
  {ssl_options_tls_ver_old,
   "listeners.ssl.1 = 5671
@@ -630,15 +287,7 @@ tcp_listen_options.exit_on_close = false",
             [{cacertfile,"test/config_schema_SUITE_data/certs/cacert.pem"},
              {certfile,"test/config_schema_SUITE_data/certs/cert.pem"},
              {keyfile,"test/config_schema_SUITE_data/certs/key.pem"},
-             {versions,['tlsv1.2','tlsv1.1',tlsv1]}]}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+             {versions,['tlsv1.2','tlsv1.1',tlsv1]}]}]}],
   []},
  {ssl_options_tls_ver_new,
   "listeners.ssl.1 = 5671
@@ -655,15 +304,7 @@ tcp_listen_options.exit_on_close = false",
             [{cacertfile,"test/config_schema_SUITE_data/certs/cacert.pem"},
              {certfile,"test/config_schema_SUITE_data/certs/cert.pem"},
              {keyfile,"test/config_schema_SUITE_data/certs/key.pem"},
-             {versions,['tlsv1.2','tlsv1.1']}]}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+             {versions,['tlsv1.2','tlsv1.1']}]}]}],
   []},
 
  {ssl_options_ciphers,
@@ -701,15 +342,7 @@ tcp_listen_options.exit_on_close = false",
              ]},
              {certfile,"test/config_schema_SUITE_data/certs/cert.pem"},
              {keyfile,"test/config_schema_SUITE_data/certs/key.pem"},
-             {versions,['tlsv1.2','tlsv1.1']}]}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+             {versions,['tlsv1.2','tlsv1.1']}]}]}],
   []},
 
  {ssl_options_allow_poodle,
@@ -728,15 +361,7 @@ tcp_listen_options.exit_on_close = false",
              {certfile,"test/config_schema_SUITE_data/certs/cert.pem"},
              {keyfile,"test/config_schema_SUITE_data/certs/key.pem"},
              {verify,verify_peer},
-             {fail_if_no_peer_cert,false}]}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+             {fail_if_no_peer_cert,false}]}]}],
   []},
  {ssl_options_depth,
   "listeners.ssl.1 = 5671
@@ -754,15 +379,7 @@ tcp_listen_options.exit_on_close = false",
              {keyfile,"test/config_schema_SUITE_data/certs/key.pem"},
              {depth,2},
              {verify,verify_peer},
-             {fail_if_no_peer_cert,false}]}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+             {fail_if_no_peer_cert,false}]}]}],
   []},
  {ssl_options_honor_cipher_order,
   "listeners.ssl.1 = 5671
@@ -782,15 +399,7 @@ tcp_listen_options.exit_on_close = false",
              {depth,2},
              {verify,verify_peer},
              {fail_if_no_peer_cert, false},
-             {honor_cipher_order, true}]}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+             {honor_cipher_order, true}]}]}],
   []},
  {ssl_options_honor_ecc_order,
   "listeners.ssl.1 = 5671
@@ -810,77 +419,29 @@ tcp_listen_options.exit_on_close = false",
              {depth,2},
              {verify,verify_peer},
              {fail_if_no_peer_cert, false},
-             {honor_ecc_order, true}]}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+             {honor_ecc_order, true}]}]}],
   []},
  {ssl_cert_login_from,
   "ssl_cert_login_from = common_name",
-  [{rabbit,[{ssl_cert_login_from,common_name}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+  [{rabbit,[{ssl_cert_login_from,common_name}]}],
   []},
  {tcp_listen_options_linger_on,
   "tcp_listen_options.linger.on = true
    tcp_listen_options.linger.timeout = 100",
-  [{rabbit,[{tcp_listen_options,[{linger,{true,100}}]}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+  [{rabbit,[{tcp_listen_options,[{linger,{true,100}}]}]}],
   []},
  {tcp_listen_options_linger_off,
   "tcp_listen_options.linger.on = false
    tcp_listen_options.linger.timeout = 100",
-  [{rabbit,[{tcp_listen_options,[{linger,{false,100}}]}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+  [{rabbit,[{tcp_listen_options,[{linger,{false,100}}]}]}],
   []},
  {tcp_listen_options_linger_on_notimeout,
   "tcp_listen_options.linger.on = true",
-  [{rabbit,[{tcp_listen_options,[{linger,{true,0}}]}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+  [{rabbit,[{tcp_listen_options,[{linger,{true,0}}]}]}],
   []},
  {tcp_listen_options_linger_timeout,
   "tcp_listen_options.linger.timeout = 100",
-  [{rabbit,[{tcp_listen_options,[{linger,{false,100}}]}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+  [{rabbit,[{tcp_listen_options,[{linger,{false,100}}]}]}],
   []},
 
  {cluster_formation_randomized_startup_delay_both_values,
@@ -888,45 +449,21 @@ tcp_listen_options.exit_on_close = false",
    cluster_formation.randomized_startup_delay_range.max = 30",
   [{rabbit, [{cluster_formation, [
                                   {randomized_startup_delay_range, {10, 30}}
-                                  ]}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+                                  ]}]}],
   []},
 
  {cluster_formation_randomized_startup_delay_min_only,
   "cluster_formation.randomized_startup_delay_range.min = 10",
   [{rabbit, [{cluster_formation, [
                                   {randomized_startup_delay_range, {10, 60}}
-                                  ]}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+                                  ]}]}],
   []},
 
  {cluster_formation_randomized_startup_delay_max_only,
   "cluster_formation.randomized_startup_delay_range.max = 30",
   [{rabbit, [{cluster_formation, [
                                   {randomized_startup_delay_range, {5, 30}}
-                                  ]}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+                                  ]}]}],
   []},
 
  {cluster_formation_dns,
@@ -937,15 +474,7 @@ tcp_listen_options.exit_on_close = false",
        [{cluster_formation,
             [{peer_discovery_dns,[{hostname,<<"192.168.0.2.xip.io">>}]},
              {peer_discovery_backend,rabbit_peer_discovery_dns},
-             {node_type,disc}]}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+             {node_type,disc}]}]}],
   []},
  {cluster_formation_classic,
   "cluster_formation.peer_discovery_backend = rabbit_peer_discovery_classic_config
@@ -953,15 +482,7 @@ tcp_listen_options.exit_on_close = false",
   [{rabbit,
        [{cluster_formation,
             [{peer_discovery_backend,rabbit_peer_discovery_classic_config},
-             {node_type,disc}]}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+             {node_type,disc}]}]}],
   []},
  {cluster_formation_classic_ram,
   "cluster_formation.peer_discovery_backend = rabbit_peer_discovery_classic_config
@@ -969,43 +490,19 @@ tcp_listen_options.exit_on_close = false",
   [{rabbit,
        [{cluster_formation,
             [{peer_discovery_backend,rabbit_peer_discovery_classic_config},
-             {node_type,ram}]}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+             {node_type,ram}]}]}],
   []},
  {background_gc_enabled,
   "background_gc_enabled = true
    background_gc_target_interval = 30000",
   [{rabbit,
-       [{background_gc_enabled,true},{background_gc_target_interval,30000}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+       [{background_gc_enabled,true},{background_gc_target_interval,30000}]}],
   []},
  {background_gc_disabled,
   "background_gc_enabled = false
    background_gc_target_interval = 30000",
   [{rabbit,
-       [{background_gc_enabled,false},{background_gc_target_interval,30000}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+       [{background_gc_enabled,false},{background_gc_target_interval,30000}]}],
   []},
  {credential_validator_length,
   "credential_validator.validation_backend = rabbit_credential_validator_min_password_length
@@ -1014,15 +511,7 @@ credential_validator.min_length = 10",
        [{credential_validator,
             [{validation_backend,
                  rabbit_credential_validator_min_password_length},
-             {min_length,10}]}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+             {min_length,10}]}]}],
   []},
  {credential_validator_regexp,
   "credential_validator.validation_backend = rabbit_credential_validator_password_regexp
@@ -1030,198 +519,78 @@ credential_validator.regexp = ^abc\\d+",
   [{rabbit,
        [{credential_validator,
             [{validation_backend,rabbit_credential_validator_password_regexp},
-             {regexp,"^abc\\d+"}]}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+             {regexp,"^abc\\d+"}]}]}],
   []},
  {proxy_protocol_on,
   "proxy_protocol = true",
-  [{rabbit,[{proxy_protocol,true}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],[]},
+  [{rabbit,[{proxy_protocol,true}]}],[]},
  {proxy_protocol_off,
   "proxy_protocol = false",
-  [{rabbit,[{proxy_protocol,false}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],[]},
+  [{rabbit,[{proxy_protocol,false}]}],[]},
  {log_debug_file,
   "log.file.level = debug",
-  [{rabbit,[{log, [{file, [{level, debug}]}]}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+  [{rabbit,[{log, [{file, [{level, debug}]}]}]}],
   []},
  {log_debug_console,
   "log.console = true
    log.console.level = debug",
-  [{rabbit,[{log, [{console, [{enabled, true}, {level, debug}]}]}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+  [{rabbit,[{log, [{console, [{enabled, true}, {level, debug}]}]}]}],
   []},
  {log_debug_exchange,
   "log.exchange = true
    log.exchange.level = debug",
-  [{rabbit,[{log, [{exchange, [{enabled, true}, {level, debug}]}]}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+  [{rabbit,[{log, [{exchange, [{enabled, true}, {level, debug}]}]}]}],
   []},
  {log_debug_syslog,
   "log.syslog = true
    log.syslog.level = debug",
-  [{rabbit,[{log, [{syslog, [{enabled, true}, {level, debug}]}]}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+  [{rabbit,[{log, [{syslog, [{enabled, true}, {level, debug}]}]}]}],
   []},
  {log_file_name,
   "log.file = file_name",
-  [{rabbit,[{log, [{file, [{file, "file_name"}]}]}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+  [{rabbit,[{log, [{file, [{file, "file_name"}]}]}]}],
   []},
  {log_file_disabled,
   "log.file = false",
-  [{rabbit,[{log, [{file, [{file, false}]}]}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+  [{rabbit,[{log, [{file, [{file, false}]}]}]}],
   []},
  {log_category_level,
   "log.connection.level = debug
    log.channel.level = error",
   [{rabbit,[{log, [{categories, [{connection, [{level, debug}]},
-                                 {channel, [{level, error}]}]}]}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+                                 {channel, [{level, error}]}]}]}]}],
   []},
  {log_category_file,
   "log.connection.file = file_name_connection
    log.channel.file = file_name_channel",
   [{rabbit,[{log, [{categories, [{connection, [{file, "file_name_connection"}]},
-                                 {channel, [{file, "file_name_channel"}]}]}]}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+                                 {channel, [{file, "file_name_channel"}]}]}]}]}],
   []},
  {delegate_count,
   "delegate_count = 64",
   [{rabbit, [
       {delegate_count, 64}
-    ]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+    ]}],
   []},
 
   {kernel_net_ticktime,
    "net_ticktime = 20",
    [{kernel, [
       {net_ticktime, 20}
-     ]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+     ]}],
    []},
 
   {kernel_inet_dist_listen_min,
    "inet_dist_listen_min = 16000",
    [{kernel, [
       {inet_dist_listen_min, 16000}
-     ]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+     ]}],
    []},
   {kernel_inet_dist_listen_max,
    "inet_dist_listen_max = 16100",
    [{kernel, [
       {inet_dist_listen_max, 16100}
-     ]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+     ]}],
    []},
 
   {log_syslog_settings,
@@ -1237,15 +606,7 @@ credential_validator.regexp = ^abc\\d+",
               {facility, user},
               {multiline_mode, true},
               {dest_host, "10.10.10.10"},
-              {dest_port, 123}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}
+              {dest_port, 123}]}
    ],
    []},
   {log_syslog_tcp,
@@ -1256,15 +617,7 @@ credential_validator.regexp = ^abc\\d+",
    [
     {rabbit,[{log, [{syslog, [{enabled, true}]}]}]},
     {syslog, [{protocol, {rfc5424, tcp}},
-              {dest_host, "syslog.my-network.com"}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}
+              {dest_host, "syslog.my-network.com"}]}
    ],
    []},
   {log_syslog_udp_default,
@@ -1272,15 +625,7 @@ credential_validator.regexp = ^abc\\d+",
     log.syslog.protocol = rfc3164",
    [
     {rabbit,[{log, [{syslog, [{enabled, true}]}]}]},
-    {syslog, [{protocol, {rfc3164, udp}}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}
+    {syslog, [{protocol, {rfc3164, udp}}]}
    ],
    []},
   {log_syslog_tls,
@@ -1297,14 +642,6 @@ credential_validator.regexp = ^abc\\d+",
                {fail_if_no_peer_cert,false},
                {cacertfile,"test/config_schema_SUITE_data/certs/cacert.pem"},
                {certfile,"test/config_schema_SUITE_data/certs/cert.pem"},
-               {keyfile,"test/config_schema_SUITE_data/certs/key.pem"}]}}]},
-   {sysmon_handler,
-    [{busy_dist_port,true},
-     {busy_port,true},
-     {gc_ms_limit,0},
-     {heap_word_limit,20055500},
-     {port_limit,2},
-     {process_limit,30},
-     {schedule_ms_limit,0}]}],
+               {keyfile,"test/config_schema_SUITE_data/certs/key.pem"}]}}]}],
   []}
 ].
diff --git a/test/crashing_queues_SUITE.erl b/test/crashing_queues_SUITE.erl
index fa0a695173..2d91083abc 100644
--- a/test/crashing_queues_SUITE.erl
+++ b/test/crashing_queues_SUITE.erl
@@ -11,7 +11,7 @@
 %% The Original Code is RabbitMQ.
 %%
 %% The Initial Developer of the Original Code is GoPivotal, Inc.
-%% Copyright (c) 2007-2017 Pivotal Software, Inc.  All rights reserved.
+%% Copyright (c) 2007-2019 Pivotal Software, Inc.  All rights reserved.
 %%
 
 -module(crashing_queues_SUITE).
diff --git a/test/credential_validation_SUITE.erl b/test/credential_validation_SUITE.erl
index 4f241197fc..0c499b2e86 100644
--- a/test/credential_validation_SUITE.erl
+++ b/test/credential_validation_SUITE.erl
@@ -11,7 +11,7 @@
 %% The Original Code is RabbitMQ.
 %%
 %% The Initial Developer of the Original Code is GoPivotal, Inc.
-%% Copyright (c) 2007-2017 Pivotal Software, Inc.  All rights reserved.
+%% Copyright (c) 2007-2019 Pivotal Software, Inc.  All rights reserved.
 %%
 
 -module(credential_validation_SUITE).
@@ -272,4 +272,3 @@ regexp_that_requires_length_of_at_most(N) when is_integer(N) ->
 
 validator_backend(Config) ->
     rabbit_ct_broker_helpers:rpc(Config, 0, rabbit_credential_validation, backend, []).
-
diff --git a/test/disconnect_detected_during_alarm_SUITE.erl b/test/disconnect_detected_during_alarm_SUITE.erl
index 42e221fb0f..4776c9e179 100644
--- a/test/disconnect_detected_during_alarm_SUITE.erl
+++ b/test/disconnect_detected_during_alarm_SUITE.erl
@@ -11,7 +11,7 @@
 %% The Original Code is RabbitMQ.
 %%
 %% The Initial Developer of the Original Code is GoPivotal, Inc.
-%% Copyright (c) 2011-2017 Pivotal Software, Inc.  All rights reserved.
+%% Copyright (c) 2011-2019 Pivotal Software, Inc.  All rights reserved.
 %%
 
 -module(disconnect_detected_during_alarm_SUITE).
diff --git a/test/dummy_event_receiver.erl b/test/dummy_event_receiver.erl
index 75db3678ce..0720db73a0 100644
--- a/test/dummy_event_receiver.erl
+++ b/test/dummy_event_receiver.erl
@@ -11,7 +11,7 @@
 %% The Original Code is RabbitMQ.
 %%
 %% The Initial Developer of the Original Code is GoPivotal, Inc.
-%% Copyright (c) 2007-2015 Pivotal Software, Inc.  All rights reserved.
+%% Copyright (c) 2007-2019 Pivotal Software, Inc.  All rights reserved.
 %%
 
 -module(dummy_event_receiver).
diff --git a/test/dummy_runtime_parameters.erl b/test/dummy_runtime_parameters.erl
index 0bf4b82d86..a314739d21 100644
--- a/test/dummy_runtime_parameters.erl
+++ b/test/dummy_runtime_parameters.erl
@@ -11,7 +11,7 @@
 %% The Original Code is RabbitMQ.
 %%
 %% The Initial Developer of the Original Code is GoPivotal, Inc.
-%% Copyright (c) 2007-2015 Pivotal Software, Inc.  All rights reserved.
+%% Copyright (c) 2007-2019 Pivotal Software, Inc.  All rights reserved.
 %%
 
 -module(dummy_runtime_parameters).
diff --git a/test/dummy_supervisor2.erl b/test/dummy_supervisor2.erl
index 9ca3f6329c..7f0588ec30 100644
--- a/test/dummy_supervisor2.erl
+++ b/test/dummy_supervisor2.erl
@@ -11,7 +11,7 @@
 %% The Original Code is RabbitMQ.
 %%
 %% The Initial Developer of the Original Code is GoPivotal, Inc.
-%% Copyright (c) 2011-2016 Pivotal Software, Inc.  All rights reserved.
+%% Copyright (c) 2011-2019 Pivotal Software, Inc.  All rights reserved.
 %%
 
 -module(dummy_supervisor2).
diff --git a/test/dynamic_ha_SUITE.erl b/test/dynamic_ha_SUITE.erl
index 1d455bb290..e41c07a888 100644
--- a/test/dynamic_ha_SUITE.erl
+++ b/test/dynamic_ha_SUITE.erl
@@ -11,7 +11,7 @@
 %% The Original Code is RabbitMQ.
 %%
 %% The Initial Developer of the Original Code is GoPivotal, Inc.
-%% Copyright (c) 2007-2017 Pivotal Software, Inc.  All rights reserved.
+%% Copyright (c) 2007-2019 Pivotal Software, Inc.  All rights reserved.
 %%
 
 -module(dynamic_ha_SUITE).
diff --git a/test/eager_sync_SUITE.erl b/test/eager_sync_SUITE.erl
index 7f28ea436d..f6c9002c51 100644
--- a/test/eager_sync_SUITE.erl
+++ b/test/eager_sync_SUITE.erl
@@ -11,7 +11,7 @@
 %% The Original Code is RabbitMQ.
 %%
 %% The Initial Developer of the Original Code is GoPivotal, Inc.
-%% Copyright (c) 2007-2017 Pivotal Software, Inc.  All rights reserved.
+%% Copyright (c) 2007-2019 Pivotal Software, Inc.  All rights reserved.
 %%
 
 -module(eager_sync_SUITE).
diff --git a/test/gm_SUITE.erl b/test/gm_SUITE.erl
index df73d8ac27..6236717196 100644
--- a/test/gm_SUITE.erl
+++ b/test/gm_SUITE.erl
@@ -11,7 +11,7 @@
 %% The Original Code is RabbitMQ.
 %%
 %% The Initial Developer of the Original Code is GoPivotal, Inc.
-%% Copyright (c) 2007-2015 Pivotal Software, Inc.  All rights reserved.
+%% Copyright (c) 2007-2019 Pivotal Software, Inc.  All rights reserved.
 %%
 
 -module(gm_SUITE).
diff --git a/test/health_check_SUITE.erl b/test/health_check_SUITE.erl
index 13373d79d4..1e5552e0e5 100644
--- a/test/health_check_SUITE.erl
+++ b/test/health_check_SUITE.erl
@@ -11,7 +11,7 @@
 %% The Original Code is RabbitMQ.
 %%
 %% The Initial Developer of the Original Code is GoPivotal, Inc.
-%% Copyright (c) 2016 Pivotal Software, Inc.  All rights reserved.
+%% Copyright (c) 2016-2019 Pivotal Software, Inc.  All rights reserved.
 %%
 -module(health_check_SUITE).
 
diff --git a/test/lazy_queue_SUITE.erl b/test/lazy_queue_SUITE.erl
index f6de560832..8dfc0d62ad 100644
--- a/test/lazy_queue_SUITE.erl
+++ b/test/lazy_queue_SUITE.erl
@@ -11,7 +11,7 @@
 %% The Original Code is RabbitMQ.
 %%
 %% The Initial Developer of the Original Code is GoPivotal, Inc.
-%% Copyright (c) 2007-2017 Pivotal Software, Inc.  All rights reserved.
+%% Copyright (c) 2007-2019 Pivotal Software, Inc.  All rights reserved.
 %%
 
 -module(lazy_queue_SUITE).
diff --git a/test/list_consumers_sanity_check_SUITE.erl b/test/list_consumers_sanity_check_SUITE.erl
index 3fa02b1de6..7d9444255b 100644
--- a/test/list_consumers_sanity_check_SUITE.erl
+++ b/test/list_consumers_sanity_check_SUITE.erl
@@ -11,7 +11,7 @@
 %% The Original Code is RabbitMQ.
 %%
 %% The Initial Developer of the Original Code is GoPivotal, Inc.
-%% Copyright (c) 2011-2017 Pivotal Software, Inc.  All rights reserved.
+%% Copyright (c) 2011-2019 Pivotal Software, Inc.  All rights reserved.
 %%
 
 -module(list_consumers_sanity_check_SUITE).
diff --git a/test/list_queues_online_and_offline_SUITE.erl b/test/list_queues_online_and_offline_SUITE.erl
index 4b56012a26..2d3823be0e 100644
--- a/test/list_queues_online_and_offline_SUITE.erl
+++ b/test/list_queues_online_and_offline_SUITE.erl
@@ -11,7 +11,7 @@
 %% The Original Code is RabbitMQ.
 %%
 %% The Initial Developer of the Original Code is GoPivotal, Inc.
-%% Copyright (c) 2011-2017 Pivotal Software, Inc.  All rights reserved.
+%% Copyright (c) 2011-2019 Pivotal Software, Inc.  All rights reserved.
 %%
 
 -module(list_queues_online_and_offline_SUITE).
diff --git a/test/many_node_ha_SUITE.erl b/test/many_node_ha_SUITE.erl
index c5c0382dc7..a6def781fa 100644
--- a/test/many_node_ha_SUITE.erl
+++ b/test/many_node_ha_SUITE.erl
@@ -11,7 +11,7 @@
 %% The Original Code is RabbitMQ.
 %%
 %% The Initial Developer of the Original Code is GoPivotal, Inc.
-%% Copyright (c) 2007-2017 Pivotal Software, Inc.  All rights reserved.
+%% Copyright (c) 2007-2019 Pivotal Software, Inc.  All rights reserved.
 %%
 
 -module(many_node_ha_SUITE).
@@ -114,4 +114,3 @@ kill_intermediate(Config) ->
     rabbit_ha_test_producer:await_response(ProducerPid),
     rabbit_ha_test_consumer:await_response(ConsumerPid),
     ok.
-
diff --git a/test/metrics_SUITE.erl b/test/metrics_SUITE.erl
index a66e9cec3c..44368b643d 100644
--- a/test/metrics_SUITE.erl
+++ b/test/metrics_SUITE.erl
@@ -11,7 +11,7 @@
 %% The Original Code is RabbitMQ.
 %%
 %% The Initial Developer of the Original Code is GoPivotal, Inc.
-%% Copyright (c) 2016 Pivotal Software, Inc.  All rights reserved.
+%% Copyright (c) 2016-2019 Pivotal Software, Inc.  All rights reserved.
 %%
 -module(metrics_SUITE).
 -compile(export_all).
diff --git a/test/mirrored_supervisor_SUITE.erl b/test/mirrored_supervisor_SUITE.erl
index 5ed17c90bb..d3cc080eeb 100644
--- a/test/mirrored_supervisor_SUITE.erl
+++ b/test/mirrored_supervisor_SUITE.erl
@@ -11,7 +11,7 @@
 %% The Original Code is RabbitMQ.
 %%
 %% The Initial Developer of the Original Code is GoPivotal, Inc.
-%% Copyright (c) 2011-2015 Pivotal Software, Inc.  All rights reserved.
+%% Copyright (c) 2011-2019 Pivotal Software, Inc.  All rights reserved.
 %%
 
 -module(mirrored_supervisor_SUITE).
@@ -332,4 +332,3 @@ init({fake_strategy_for_ignore, _ChildSpecs}) ->
 
 init({Strategy, ChildSpecs}) ->
     {ok, {{Strategy, 0, 1}, ChildSpecs}}.
-
diff --git a/test/mirrored_supervisor_SUITE_gs.erl b/test/mirrored_supervisor_SUITE_gs.erl
index 867754b4a2..5f65758416 100644
--- a/test/mirrored_supervisor_SUITE_gs.erl
+++ b/test/mirrored_supervisor_SUITE_gs.erl
@@ -11,7 +11,7 @@
 %% The Original Code is RabbitMQ.
 %%
 %% The Initial Developer of the Original Code is GoPivotal, Inc.
-%% Copyright (c) 2011-2015 Pivotal Software, Inc.  All rights reserved.
+%% Copyright (c) 2011-2019 Pivotal Software, Inc.  All rights reserved.
 %%
 
 -module(mirrored_supervisor_SUITE_gs).
diff --git a/test/msg_store_SUITE.erl b/test/msg_store_SUITE.erl
index 4eaa535a57..f384ee12ef 100644
--- a/test/msg_store_SUITE.erl
+++ b/test/msg_store_SUITE.erl
@@ -11,7 +11,7 @@
 %% The Original Code is RabbitMQ.
 %%
 %% The Initial Developer of the Original Code is GoPivotal, Inc.
-%% Copyright (c) 2011-2015 Pivotal Software, Inc.  All rights reserved.
+%% Copyright (c) 2011-2019 Pivotal Software, Inc.  All rights reserved.
 %%
 
 -module(msg_store_SUITE).
diff --git a/test/partitions_SUITE.erl b/test/partitions_SUITE.erl
index b09d05b550..ff8f7b4289 100644
--- a/test/partitions_SUITE.erl
+++ b/test/partitions_SUITE.erl
@@ -11,7 +11,7 @@
 %% The Original Code is RabbitMQ.
 %%
 %% The Initial Developer of the Original Code is GoPivotal, Inc.
-%% Copyright (c) 2011-2017 Pivotal Software, Inc.  All rights reserved.
+%% Copyright (c) 2011-2019 Pivotal Software, Inc.  All rights reserved.
 %%
 
 -module(partitions_SUITE).
diff --git a/test/peer_discovery_dns_SUITE.erl b/test/peer_discovery_dns_SUITE.erl
index 7deb38ba97..1690dde64c 100644
--- a/test/peer_discovery_dns_SUITE.erl
+++ b/test/peer_discovery_dns_SUITE.erl
@@ -11,7 +11,7 @@
 %% The Original Code is RabbitMQ.
 %%
 %% The Initial Developer of the Original Code is GoPivotal, Inc.
-%% Copyright (c) 2011-2016 Pivotal Software, Inc.  All rights reserved.
+%% Copyright (c) 2011-2019 Pivotal Software, Inc.  All rights reserved.
 %%
 
 -module(peer_discovery_dns_SUITE).
diff --git a/test/per_user_connection_tracking_SUITE.erl b/test/per_user_connection_tracking_SUITE.erl
index 7f93aef1ac..19650607ad 100644
--- a/test/per_user_connection_tracking_SUITE.erl
+++ b/test/per_user_connection_tracking_SUITE.erl
@@ -11,7 +11,7 @@
 %% The Original Code is RabbitMQ.
 %%
 %% The Initial Developer of the Original Code is GoPivotal, Inc.
-%% Copyright (c) 2011-2016 Pivotal Software, Inc.  All rights reserved.
+%% Copyright (c) 2011-2019 Pivotal Software, Inc.  All rights reserved.
 %%
 
 -module(per_user_connection_tracking_SUITE).
@@ -116,7 +116,7 @@ single_node_list_of_user(Config) ->
     Username2 = <<"guest2">>,
 
     Vhost = proplists:get_value(rmq_vhost, Config),
-    
+
     rabbit_ct_broker_helpers:add_user(Config, Username2),
     rabbit_ct_broker_helpers:set_full_permissions(Config, Username2, Vhost),
 
@@ -142,7 +142,7 @@ single_node_list_of_user(Config) ->
     [Username, Username] =
         lists:map(fun (#tracked_connection{username = U}) -> U end,
                   connections_in(Config, Username)),
-    
+
     close_connections([Conn2, Conn3, Conn5]),
     rabbit_ct_broker_helpers:delete_user(Config, Username2),
     ?assertEqual(0, length(all_connections(Config))).
@@ -152,7 +152,7 @@ single_node_user_deletion_forces_connection_closure(Config) ->
     Username2 = <<"guest2">>,
 
     Vhost = proplists:get_value(rmq_vhost, Config),
-    
+
     rabbit_ct_broker_helpers:add_user(Config, Username2),
     rabbit_ct_broker_helpers:set_full_permissions(Config, Username2, Vhost),
 
@@ -177,7 +177,7 @@ cluster_user_deletion_forces_connection_closure(Config) ->
     Username2 = <<"guest2">>,
 
     Vhost = proplists:get_value(rmq_vhost, Config),
-    
+
     rabbit_ct_broker_helpers:add_user(Config, Username2),
     rabbit_ct_broker_helpers:set_full_permissions(Config, Username2, Vhost),
 
diff --git a/test/per_vhost_connection_limit_SUITE.erl b/test/per_vhost_connection_limit_SUITE.erl
index 68deec12cb..db1b8d859d 100644
--- a/test/per_vhost_connection_limit_SUITE.erl
+++ b/test/per_vhost_connection_limit_SUITE.erl
@@ -11,7 +11,7 @@
 %% The Original Code is RabbitMQ.
 %%
 %% The Initial Developer of the Original Code is GoPivotal, Inc.
-%% Copyright (c) 2011-2016 Pivotal Software, Inc.  All rights reserved.
+%% Copyright (c) 2011-2019 Pivotal Software, Inc.  All rights reserved.
 %%
 
 -module(per_vhost_connection_limit_SUITE).
diff --git a/test/per_vhost_connection_limit_partitions_SUITE.erl b/test/per_vhost_connection_limit_partitions_SUITE.erl
index 20adf704a0..610ce33bba 100644
--- a/test/per_vhost_connection_limit_partitions_SUITE.erl
+++ b/test/per_vhost_connection_limit_partitions_SUITE.erl
@@ -11,7 +11,7 @@
 %% The Original Code is RabbitMQ.
 %%
 %% The Initial Developer of the Original Code is GoPivotal, Inc.
-%% Copyright (c) 2011-2015 Pivotal Software, Inc.  All rights reserved.
+%% Copyright (c) 2011-2019 Pivotal Software, Inc.  All rights reserved.
 %%
 
 -module(per_vhost_connection_limit_partitions_SUITE).
diff --git a/test/per_vhost_msg_store_SUITE.erl b/test/per_vhost_msg_store_SUITE.erl
index 4d88c84b7e..94c434deee 100644
--- a/test/per_vhost_msg_store_SUITE.erl
+++ b/test/per_vhost_msg_store_SUITE.erl
@@ -11,7 +11,7 @@
 %% The Original Code is RabbitMQ.
 %%
 %% The Initial Developer of the Original Code is GoPivotal, Inc.
-%% Copyright (c) 2007-2016 Pivotal Software, Inc.  All rights reserved.
+%% Copyright (c) 2007-2019 Pivotal Software, Inc.  All rights reserved.
 %%
 
 -module(per_vhost_msg_store_SUITE).
diff --git a/test/per_vhost_queue_limit_SUITE.erl b/test/per_vhost_queue_limit_SUITE.erl
index 1c6bea08dd..80de41797f 100644
--- a/test/per_vhost_queue_limit_SUITE.erl
+++ b/test/per_vhost_queue_limit_SUITE.erl
@@ -11,7 +11,7 @@
 %% The Original Code is RabbitMQ.
 %%
 %% The Initial Developer of the Original Code is GoPivotal, Inc.
-%% Copyright (c) 2011-2016 Pivotal Software, Inc.  All rights reserved.
+%% Copyright (c) 2011-2019 Pivotal Software, Inc.  All rights reserved.
 %%
 
 -module(per_vhost_queue_limit_SUITE).
diff --git a/test/plugin_versioning_SUITE.erl b/test/plugin_versioning_SUITE.erl
index e184aeac64..d8adc85071 100644
--- a/test/plugin_versioning_SUITE.erl
+++ b/test/plugin_versioning_SUITE.erl
@@ -11,7 +11,7 @@
 %% The Original Code is RabbitMQ.
 %%
 %% The Initial Developer of the Original Code is GoPivotal, Inc.
-%% Copyright (c) 2016 Pivotal Software, Inc.  All rights reserved.
+%% Copyright (c) 2016-2019 Pivotal Software, Inc.  All rights reserved.
 %%
 
 -module(plugin_versioning_SUITE).
diff --git a/test/policy_SUITE.erl b/test/policy_SUITE.erl
index 7cf3427db0..22ef8175f9 100644
--- a/test/policy_SUITE.erl
+++ b/test/policy_SUITE.erl
@@ -11,7 +11,7 @@
 %% The Original Code is RabbitMQ.
 %%
 %% The Initial Developer of the Original Code is GoPivotal, Inc.
-%% Copyright (c) 2011-2016 Pivotal Software, Inc.  All rights reserved.
+%% Copyright (c) 2011-2019 Pivotal Software, Inc.  All rights reserved.
 %%
 
 -module(policy_SUITE).
@@ -79,7 +79,7 @@ policy_ttl(Config) ->
     Q = <<"policy_ttl-queue">>,
     rabbit_ct_broker_helpers:set_policy(Config, 0, <<"ttl-policy">>,
         <<"policy_ttl-queue">>, <<"all">>, [{<<"message-ttl">>, 20}]),
-    
+
     declare(Ch, Q),
     publish(Ch, Q, lists:seq(1, 20)),
     timer:sleep(50),
@@ -100,7 +100,7 @@ operator_policy_ttl(Config) ->
         <<"policy_ttl-queue">>, <<"all">>, [{<<"message-ttl">>, 100000}]),
     rabbit_ct_broker_helpers:set_operator_policy(Config, 0, <<"ttl-policy-op">>,
         <<"policy_ttl-queue">>, <<"all">>, [{<<"message-ttl">>, 1}]),
-    
+
     declare(Ch, Q),
     publish(Ch, Q, lists:seq(1, 50)),
     timer:sleep(50),
diff --git a/test/priority_queue_SUITE.erl b/test/priority_queue_SUITE.erl
index 33906ee70b..9db866e3c6 100644
--- a/test/priority_queue_SUITE.erl
+++ b/test/priority_queue_SUITE.erl
@@ -11,7 +11,7 @@
 %% The Original Code is RabbitMQ.
 %%
 %% The Initial Developer of the Original Code is GoPivotal, Inc.
-%% Copyright (c) 2011-2016 Pivotal Software, Inc.  All rights reserved.
+%% Copyright (c) 2011-2019 Pivotal Software, Inc.  All rights reserved.
 %%
 
 -module(priority_queue_SUITE).
diff --git a/test/priority_queue_recovery_SUITE.erl b/test/priority_queue_recovery_SUITE.erl
index 9e2ffbd3fe..20f0082aab 100644
--- a/test/priority_queue_recovery_SUITE.erl
+++ b/test/priority_queue_recovery_SUITE.erl
@@ -11,7 +11,7 @@
 %% The Original Code is RabbitMQ.
 %%
 %% The Initial Developer of the Original Code is GoPivotal, Inc.
-%% Copyright (c) 2011-2016 Pivotal Software, Inc.  All rights reserved.
+%% Copyright (c) 2011-2019 Pivotal Software, Inc.  All rights reserved.
 %%
 
 -module(priority_queue_recovery_SUITE).
diff --git a/test/proxy_protocol_SUITE.erl b/test/proxy_protocol_SUITE.erl
index 84b94d72a8..787ff7446c 100644
--- a/test/proxy_protocol_SUITE.erl
+++ b/test/proxy_protocol_SUITE.erl
@@ -11,7 +11,7 @@
 %% The Original Code is RabbitMQ.
 %%
 %% The Initial Developer of the Original Code is GoPivotal, Inc.
-%% Copyright (c) 2017 Pivotal Software, Inc.  All rights reserved.
+%% Copyright (c) 2017-2019 Pivotal Software, Inc.  All rights reserved.
 %%
 
 -module(proxy_protocol_SUITE).
diff --git a/test/queue_master_location_SUITE.erl b/test/queue_master_location_SUITE.erl
index 94101567f6..d4c8da2bcb 100644
--- a/test/queue_master_location_SUITE.erl
+++ b/test/queue_master_location_SUITE.erl
@@ -11,7 +11,7 @@
 %% The Original Code is RabbitMQ.
 %%
 %% The Initial Developer of the Original Code is GoPivotal, Inc.
-%% Copyright (c) 2011-2015 Pivotal Software, Inc.  All rights reserved.
+%% Copyright (c) 2011-2019 Pivotal Software, Inc.  All rights reserved.
 %%
 
 -module(queue_master_location_SUITE).
diff --git a/test/quorum_queue_SUITE.erl b/test/quorum_queue_SUITE.erl
index b453f5cdb3..0beecf6c79 100644
--- a/test/quorum_queue_SUITE.erl
+++ b/test/quorum_queue_SUITE.erl
@@ -11,7 +11,7 @@
 %% The Original Code is RabbitMQ.
 %%
 %% The Initial Developer of the Original Code is GoPivotal, Inc.
-%% Copyright (c) 2018 Pivotal Software, Inc.  All rights reserved.
+%% Copyright (c) 2018-2019 Pivotal Software, Inc.  All rights reserved.
 %%
 
 -module(quorum_queue_SUITE).
@@ -1141,7 +1141,7 @@ test_dead_lettering(PolicySet, Config, Ch, Servers, RaName, Source, Destination)
     wait_for_messages_pending_ack(Servers, RaName, 0),
     wait_for_messages(Config, [[Destination, <<"0">>, <<"0">>, <<"0">>]]),
     DeliveryTag = consume(Ch, Source, false),
-    wait_for_messages_ready(Servers, RaName, 0), 
+    wait_for_messages_ready(Servers, RaName, 0),
     wait_for_messages_pending_ack(Servers, RaName, 1),
     wait_for_messages(Config, [[Destination, <<"0">>, <<"0">>, <<"0">>]]),
     amqp_channel:cast(Ch, #'basic.nack'{delivery_tag = DeliveryTag,
@@ -1829,7 +1829,7 @@ reconnect_consumer_and_publish(Config) ->
                                                 multiple     = false}),
             wait_for_messages_ready(Servers, RaName, 0),
             wait_for_messages_pending_ack(Servers, RaName, 1)
-    end, 
+    end,
     receive
         {#'basic.deliver'{delivery_tag = DeliveryTag2,
                           redelivered = true}, _} ->
@@ -2291,4 +2291,3 @@ get_message_bytes(Leader, QRes) ->
         _ ->
             []
     end.
-
diff --git a/test/rabbit_core_metrics_gc_SUITE.erl b/test/rabbit_core_metrics_gc_SUITE.erl
index 47d47290a4..5bbc95274f 100644
--- a/test/rabbit_core_metrics_gc_SUITE.erl
+++ b/test/rabbit_core_metrics_gc_SUITE.erl
@@ -11,7 +11,7 @@
 %% The Original Code is RabbitMQ.
 %%
 %% The Initial Developer of the Original Code is GoPivotal, Inc.
-%% Copyright (c) 2007-2017 Pivotal Software, Inc.  All rights reserved.
+%% Copyright (c) 2007-2019 Pivotal Software, Inc.  All rights reserved.
 %%
 
 -module(rabbit_core_metrics_gc_SUITE).
diff --git a/test/rabbit_dummy_protocol_connection_info.erl b/test/rabbit_dummy_protocol_connection_info.erl
index 3da963e057..759fef868d 100644
--- a/test/rabbit_dummy_protocol_connection_info.erl
+++ b/test/rabbit_dummy_protocol_connection_info.erl
@@ -11,7 +11,7 @@
 %% The Original Code is RabbitMQ.
 %%
 %% The Initial Developer of the Original Code is GoPivotal, Inc.
-%% Copyright (c) 2017 Pivotal Software, Inc.  All rights reserved.
+%% Copyright (c) 2017-2019 Pivotal Software, Inc.  All rights reserved.
 %%
 
 %% Dummy module to test rabbit_direct:extract_extra_auth_props
diff --git a/test/rabbit_ha_test_consumer.erl b/test/rabbit_ha_test_consumer.erl
index f0ddd9f839..8d61903308 100644
--- a/test/rabbit_ha_test_consumer.erl
+++ b/test/rabbit_ha_test_consumer.erl
@@ -11,7 +11,7 @@
 %% The Original Code is RabbitMQ.
 %%
 %% The Initial Developer of the Original Code is GoPivotal, Inc.
-%% Copyright (c) 2007-2017 Pivotal Software, Inc.  All rights reserved.
+%% Copyright (c) 2007-2019 Pivotal Software, Inc.  All rights reserved.
 %%
 -module(rabbit_ha_test_consumer).
 
diff --git a/test/rabbit_ha_test_producer.erl b/test/rabbit_ha_test_producer.erl
index b6c301cd0c..538d2213a2 100644
--- a/test/rabbit_ha_test_producer.erl
+++ b/test/rabbit_ha_test_producer.erl
@@ -11,7 +11,7 @@
 %% The Original Code is RabbitMQ.
 %%
 %% The Initial Developer of the Original Code is GoPivotal, Inc.
-%% Copyright (c) 2007-2017 Pivotal Software, Inc.  All rights reserved.
+%% Copyright (c) 2007-2019 Pivotal Software, Inc.  All rights reserved.
 %%
 -module(rabbit_ha_test_producer).
 
diff --git a/test/rabbitmqctl_integration_SUITE.erl b/test/rabbitmqctl_integration_SUITE.erl
index a5d3a0fd03..87d076f694 100644
--- a/test/rabbitmqctl_integration_SUITE.erl
+++ b/test/rabbitmqctl_integration_SUITE.erl
@@ -11,7 +11,7 @@
 %% The Original Code is RabbitMQ.
 %%
 %% The Initial Developer of the Original Code is GoPivotal, Inc.
-%% Copyright (c) 2016 Pivotal Software, Inc.  All rights reserved.
+%% Copyright (c) 2016-2019 Pivotal Software, Inc.  All rights reserved.
 %%
 -module(rabbitmqctl_integration_SUITE).
 
diff --git a/test/rabbitmqctl_shutdown_SUITE.erl b/test/rabbitmqctl_shutdown_SUITE.erl
index 25cc2fdef8..0debfde2b6 100644
--- a/test/rabbitmqctl_shutdown_SUITE.erl
+++ b/test/rabbitmqctl_shutdown_SUITE.erl
@@ -11,7 +11,7 @@
 %% The Original Code is RabbitMQ.
 %%
 %% The Initial Developer of the Original Code is GoPivotal, Inc.
-%% Copyright (c) 2017 Pivotal Software, Inc.  All rights reserved.
+%% Copyright (c) 2017-2019 Pivotal Software, Inc.  All rights reserved.
 %%
 -module(rabbitmqctl_shutdown_SUITE).
 
diff --git a/test/simple_ha_SUITE.erl b/test/simple_ha_SUITE.erl
index 41b6ec7a94..60c736747e 100644
--- a/test/simple_ha_SUITE.erl
+++ b/test/simple_ha_SUITE.erl
@@ -11,7 +11,7 @@
 %% The Original Code is RabbitMQ.
 %%
 %% The Initial Developer of the Original Code is GoPivotal, Inc.
-%% Copyright (c) 2007-2017 Pivotal Software, Inc.  All rights reserved.
+%% Copyright (c) 2007-2019 Pivotal Software, Inc.  All rights reserved.
 %%
 
 -module(simple_ha_SUITE).
diff --git a/test/single_active_consumer_SUITE.erl b/test/single_active_consumer_SUITE.erl
index 945229e372..25261042b2 100644
--- a/test/single_active_consumer_SUITE.erl
+++ b/test/single_active_consumer_SUITE.erl
@@ -11,7 +11,7 @@
 %% The Original Code is RabbitMQ.
 %%
 %% The Initial Developer of the Original Code is GoPivotal, Inc.
-%% Copyright (c) 2018 Pivotal Software, Inc.  All rights reserved.
+%% Copyright (c) 2018-2019 Pivotal Software, Inc.  All rights reserved.
 %%
 
 -module(single_active_consumer_SUITE).
diff --git a/test/sup_delayed_restart_SUITE.erl b/test/sup_delayed_restart_SUITE.erl
index 0dffe33068..5905419d91 100644
--- a/test/sup_delayed_restart_SUITE.erl
+++ b/test/sup_delayed_restart_SUITE.erl
@@ -11,7 +11,7 @@
 %% The Original Code is RabbitMQ.
 %%
 %% The Initial Developer of the Original Code is GoPivotal, Inc.
-%% Copyright (c) 2007-2015 Pivotal Software, Inc.  All rights reserved.
+%% Copyright (c) 2007-2019 Pivotal Software, Inc.  All rights reserved.
 %%
 
 -module(sup_delayed_restart_SUITE).
diff --git a/test/sync_detection_SUITE.erl b/test/sync_detection_SUITE.erl
index c606e050dd..f575d72d4d 100644
--- a/test/sync_detection_SUITE.erl
+++ b/test/sync_detection_SUITE.erl
@@ -11,7 +11,7 @@
 %% The Original Code is RabbitMQ.
 %%
 %% The Initial Developer of the Original Code is GoPivotal, Inc.
-%% Copyright (c) 2007-2017 Pivotal Software, Inc.  All rights reserved.
+%% Copyright (c) 2007-2019 Pivotal Software, Inc.  All rights reserved.
 %%
 
 -module(sync_detection_SUITE).
diff --git a/test/temp/rabbitmqadmin.py b/test/temp/rabbitmqadmin.py
index 1e7552b92c..eb4ac11219 100755
--- a/test/temp/rabbitmqadmin.py
+++ b/test/temp/rabbitmqadmin.py
@@ -13,7 +13,7 @@
 #   The Original Code is RabbitMQ Management Plugin.
 #
 #   The Initial Developer of the Original Code is GoPivotal, Inc.
-#   Copyright (c) 2010-2015 Pivotal Software, Inc.  All rights reserved.
+#   Copyright (c) 2010-2019 Pivotal Software, Inc.  All rights reserved.
 
 import sys
 if sys.version_info[0] < 2 or sys.version_info[1] < 6:
diff --git a/test/term_to_binary_compat_prop_SUITE.erl b/test/term_to_binary_compat_prop_SUITE.erl
index ba5069860a..250a7a7bf2 100644
--- a/test/term_to_binary_compat_prop_SUITE.erl
+++ b/test/term_to_binary_compat_prop_SUITE.erl
@@ -11,7 +11,7 @@
 %% The Original Code is RabbitMQ.
 %%
 %% The Initial Developer of the Original Code is GoPivotal, Inc.
-%% Copyright (c) 2017 Pivotal Software, Inc.  All rights reserved.
+%% Copyright (c) 2017-2019 Pivotal Software, Inc.  All rights reserved.
 %%
 
 
diff --git a/test/topic_permission_SUITE.erl b/test/topic_permission_SUITE.erl
index c656746432..6db2d988b9 100644
--- a/test/topic_permission_SUITE.erl
+++ b/test/topic_permission_SUITE.erl
@@ -11,7 +11,7 @@
 %% The Original Code is RabbitMQ.
 %%
 %% The Initial Developer of the Original Code is GoPivotal, Inc.
-%% Copyright (c) 2011-2016 Pivotal Software, Inc.  All rights reserved.
+%% Copyright (c) 2011-2019 Pivotal Software, Inc.  All rights reserved.
 %%
 
 -module(topic_permission_SUITE).
diff --git a/test/unit_SUITE.erl b/test/unit_SUITE.erl
index f74e18afb9..1c3b453c04 100644
--- a/test/unit_SUITE.erl
+++ b/test/unit_SUITE.erl
@@ -11,7 +11,7 @@
 %% The Original Code is RabbitMQ.
 %%
 %% The Initial Developer of the Original Code is GoPivotal, Inc.
-%% Copyright (c) 2011-2016 Pivotal Software, Inc.  All rights reserved.
+%% Copyright (c) 2011-2019 Pivotal Software, Inc.  All rights reserved.
 %%
 
 -module(unit_SUITE).
diff --git a/test/unit_inbroker_non_parallel_SUITE.erl b/test/unit_inbroker_non_parallel_SUITE.erl
index 56d692847f..e3e282f233 100644
--- a/test/unit_inbroker_non_parallel_SUITE.erl
+++ b/test/unit_inbroker_non_parallel_SUITE.erl
@@ -11,7 +11,7 @@
 %% The Original Code is RabbitMQ.
 %%
 %% The Initial Developer of the Original Code is GoPivotal, Inc.
-%% Copyright (c) 2011-2017 Pivotal Software, Inc.  All rights reserved.
+%% Copyright (c) 2011-2019 Pivotal Software, Inc.  All rights reserved.
 %%
 
 -module(unit_inbroker_non_parallel_SUITE).
diff --git a/test/unit_inbroker_parallel_SUITE.erl b/test/unit_inbroker_parallel_SUITE.erl
index 466df684af..0343e7d136 100644
--- a/test/unit_inbroker_parallel_SUITE.erl
+++ b/test/unit_inbroker_parallel_SUITE.erl
@@ -11,7 +11,7 @@
 %% The Original Code is RabbitMQ.
 %%
 %% The Initial Developer of the Original Code is GoPivotal, Inc.
-%% Copyright (c) 2011-2017 Pivotal Software, Inc.  All rights reserved.
+%% Copyright (c) 2011-2019 Pivotal Software, Inc.  All rights reserved.
 %%
 
 -module(unit_inbroker_parallel_SUITE).
diff --git a/test/unit_log_config_SUITE.erl b/test/unit_log_config_SUITE.erl
index b753c4075c..35b073e6fa 100644
--- a/test/unit_log_config_SUITE.erl
+++ b/test/unit_log_config_SUITE.erl
@@ -11,7 +11,7 @@
 %% The Original Code is RabbitMQ.
 %%
 %% The Initial Developer of the Original Code is GoPivotal, Inc.
-%% Copyright (c) 2016 Pivotal Software, Inc.  All rights reserved.
+%% Copyright (c) 2016-2019 Pivotal Software, Inc.  All rights reserved.
 %%
 
 -module(unit_log_config_SUITE).
diff --git a/test/unit_queue_consumers_SUITE.erl b/test/unit_queue_consumers_SUITE.erl
index 08d12e7ec5..08b2da4574 100644
--- a/test/unit_queue_consumers_SUITE.erl
+++ b/test/unit_queue_consumers_SUITE.erl
@@ -11,7 +11,7 @@
 %% The Original Code is RabbitMQ.
 %%
 %% The Initial Developer of the Original Code is GoPivotal, Inc.
-%% Copyright (c) 2018 Pivotal Software, Inc.  All rights reserved.
+%% Copyright (c) 2018-2019 Pivotal Software, Inc.  All rights reserved.
 %%
 
 -module(unit_queue_consumers_SUITE).
@@ -99,4 +99,4 @@ state(Consumers) ->
 function_for_process() ->
     receive
         _ -> ok
-    end.
\ No newline at end of file
+    end.
diff --git a/test/vhost_SUITE.erl b/test/vhost_SUITE.erl
index d339dc43b3..2de5819b54 100644
--- a/test/vhost_SUITE.erl
+++ b/test/vhost_SUITE.erl
@@ -11,7 +11,7 @@
 %% The Original Code is RabbitMQ.
 %%
 %% The Initial Developer of the Original Code is GoPivotal, Inc.
-%% Copyright (c) 2011-2016 Pivotal Software, Inc.  All rights reserved.
+%% Copyright (c) 2011-2019 Pivotal Software, Inc.  All rights reserved.
 %%
 
 -module(vhost_SUITE).
diff --git a/test/worker_pool_SUITE.erl b/test/worker_pool_SUITE.erl
index d15f42c504..8c9c5fa366 100644
--- a/test/worker_pool_SUITE.erl
+++ b/test/worker_pool_SUITE.erl
@@ -11,7 +11,7 @@
 %% The Original Code is RabbitMQ.
 %%
 %% The Initial Developer of the Original Code is GoPivotal, Inc.
-%% Copyright (c) 2007-2017 Pivotal Software, Inc.  All rights reserved.
+%% Copyright (c) 2007-2019 Pivotal Software, Inc.  All rights reserved.
 %%
 
 -module(worker_pool_SUITE).