Fixed converge edit_line bundle not deleting lines containing marker

In my testing with 3.16, the deletion doesn't work today, so `converge` is not functioning properly.

(cherry picked from commit fae4505)

Ticket: CFE-3482
Changelog: Title

Author: tzz

lib/files.cf

@@ -1066,37 +1066,41 @@ bundle edit_line converge(marker, lines)
 #
 # @param marker The marker (not a regular expression; will be escaped)
 # @param lines The lines to insert; all must contain `marker`
+#
+# **Example:**
+#
+# ```cf3
+# bundle agent pam_d_su_include
+# #@brief Ensure /etc/pam.d/su has includes configured properly
+# {
+#   files:
+#     ubuntu::
+#       "/etc/pam.d/su"
+#         edit_line => converge( "@include", "@include common-auth
+# @include common-account
+# @include common-session");
+# }
+# ```
+#
+# **History:**
+#
+# * Introduced in 3.6.0
 {
   vars:
       "regex" string => escape($(marker));
 
   delete_lines:
-      "$(regex)" comment => "Delete lines matching the marker";
+      ".*$(regex).*" comment => "Delete lines matching the marker";
   insert_lines:
       "$(lines)" comment => "Insert the given lines";
 }
 
 bundle edit_line converge_prepend(marker, lines)
-# @brief Converge `lines` marked with `marker` to start of content.
+# @brief Converge `lines` marked with `marker` to start of content
 #
 # Any content marked with `marker` is removed, then `lines` are
 # inserted at *start* of content.  Every `line` should contain `marker`.
 #
-# This is helpful for files where order matters, like `pam.d/common-auth`,
-# and you want the content at the top. If you want to maintain the order
-# of multiple lines, pass one item with a newline in it like this:
-#
-# **Example:**
-#
-# ```cf3
-# files:
-#   "/etc/pam.conf"
-#     edit_line => converge_prepend("session", "session required pam_loginuid.so
-#session required pam_env.so
-#session required pam_env.so envfile=/etc/default/locale
-#session required pam_limits.so");
-# ```
-#
 # @param marker The marker (not a regular expression; will be escaped)
 # @param lines The lines to insert; all must contain `marker`
 #