ox-html: Fix number of arguments when setting `org-html-format-headline-function'

* lisp/ox-html.el (org-html-format-headline--wrap): Fix number of
  arguments when setting `org-html-format-headline-function'.

Thanks to Jisang Yoo for reporting it.
Merge branch 'maint'
Fix error when filling consecutive comments

* lisp/org.el (org-fill-paragraph): Do not mix consecutive comments
  when filling any of them.
* testing/lisp/test-org.el: Add test.

Thanks to Samuel Wales for reporting it.
Merge branch 'maint'