diff --git a/scripts/policy/frameworks/cluster/controller/util.zeek b/scripts/policy/frameworks/cluster/controller/util.zeek
new file mode 100644
index 0000000000..cfc87d6b63
--- /dev/null
+++ b/scripts/policy/frameworks/cluster/controller/util.zeek
@@ -0,0 +1,17 @@
+module ClusterController::Util;
+
+export {
+	global set_to_vector: function(ss: set[string]): vector of string;
+}
+
+function set_to_vector(ss: set[string]): vector of string
+	{
+	local res: vector of string;
+
+	for ( s in ss )
+		res[|res|] = s;
+
+	sort(res, strcmp);
+
+	return res;
+	}
diff --git a/scripts/test-all-policy.zeek b/scripts/test-all-policy.zeek
index ea36a239ef..bdc052d301 100644
--- a/scripts/test-all-policy.zeek
+++ b/scripts/test-all-policy.zeek
@@ -24,6 +24,7 @@
 # @load frameworks/cluster/controller/main.zeek
 @load frameworks/cluster/controller/request.zeek
 @load frameworks/cluster/controller/types.zeek
+@load frameworks/cluster/controller/util.zeek
 @load frameworks/dpd/detect-protocols.zeek
 @load frameworks/dpd/packet-segment-logging.zeek
 @load frameworks/intel/do_notice.zeek
diff --git a/testing/btest/Baseline/coverage.bare-mode-errors/errors b/testing/btest/Baseline/coverage.bare-mode-errors/errors
index ed8c1aa4a4..31f9346536 100644
--- a/testing/btest/Baseline/coverage.bare-mode-errors/errors
+++ b/testing/btest/Baseline/coverage.bare-mode-errors/errors
@@ -2,8 +2,8 @@
 ### NOTE: This file has been sorted with diff-sort.
 warning in <...>/extract-certs-pem.zeek, line 1: deprecated script loaded from <...>/__load__.zeek:12 "Remove in v5.1. Use log-certs-base64.zeek instead."
 warning in <...>/extract-certs-pem.zeek, line 1: deprecated script loaded from command line arguments "Remove in v5.1. Use log-certs-base64.zeek instead."
-warning in <...>/log-ocsp.zeek, line 1: deprecated script loaded from <...>/test-all-policy.zeek:58 ("Remove in v5.1. OCSP logging is now enabled by default")
-warning in <...>/log-ocsp.zeek, line 1: deprecated script loaded from <...>/test-all-policy.zeek:58 ("Remove in v5.1. OCSP logging is now enabled by default")
+warning in <...>/log-ocsp.zeek, line 1: deprecated script loaded from <...>/test-all-policy.zeek:59 ("Remove in v5.1. OCSP logging is now enabled by default")
+warning in <...>/log-ocsp.zeek, line 1: deprecated script loaded from <...>/test-all-policy.zeek:59 ("Remove in v5.1. OCSP logging is now enabled by default")
 warning in <...>/log-ocsp.zeek, line 1: deprecated script loaded from command line arguments ("Remove in v5.1. OCSP logging is now enabled by default")
 warning in <...>/notary.zeek, line 1: deprecated script loaded from <...>/__load__.zeek:4 ("Remove in v5.1. Please switch to other more modern approaches like SCT validation (validate-sct.zeek).")
 warning in <...>/notary.zeek, line 1: deprecated script loaded from command line arguments ("Remove in v5.1. Please switch to other more modern approaches like SCT validation (validate-sct.zeek).")