(cherry picked from commit 00096e66)

* Update test.

(cherry picked from commit ad051b7a)

XWIKI-22030: Improve escaping in XWiki.XWikiSyntaxMacrosList
(cherry picked from commit c3125d16)
(cherry picked from commit e93d2dc8)

* Fix POM version in new module after cherry-pick

XWIKI-20651: Pt_br (Pt_br) and Zh_tw (Zh_Tw) languages displayed in drop-downs which cause many "Invalid locale" warnings if selected

  * Fix bad API calls in integration test

(cherry picked from commit bcbe4796)

XWIKI-20651: Pt_br (Pt_br) and Zh_tw (Zh_Tw) languages displayed in drop-downs which cause many "Invalid locale" warnings if selected

  * Improve dateFormat test to force the timezone so that it covers this
    and don't fail on CI because of bad offset

(cherry picked from commit 3203d264)

XWIKI-20651: Pt_br (Pt_br) and Zh_tw (Zh_Tw) languages displayed in drop-downs which cause many "Invalid locale" warnings if selected

  * Fix bad API calls in tests

(cherry picked from commit b6948032)

XWIKI-20651: Pt_br (Pt_br) and Zh_tw (Zh_Tw) languages displayed in drop-downs which cause many "Invalid locale" warnings if selected

  * Fix LocalizationScriptService#getAvailableLocales to not use
    Locale(String) constructor but to rely instead on
LocaleUtils.toLocale
  * Fix the same mistake in other parts of XWiki

(cherry picked from commit 42edb78c)

(cherry picked from commit e40e37ff)

  * Iterate over all wikis when deleting filters related to a wiki
  * Fix unit test
  * Provide a migration to clean up filters related to deleted wikis
  * Provide unit test for the migration
  * Fix migration query after testing
  * Add a few comments over the query

(cherry picked from commit 858605a2)

  * Set the proper DB version for 16.4.x branch.
  * Rename the migration class for 16.4.x branch so that it remains consistent with DB version.
  * Rename the migration test too.

---------

Co-authored-by: Simon Urli <simon.urli@xwiki.com>

* Add a rule to never underline links in jstrees, when the onlyInlineLink preference is picked.

(cherry picked from commit 08f8ad82)

Co-authored-by: LucasC <lucas.charpentier@xwiki.com>

* Updated the default (english) hint to make it easier to use this feature

(cherry picked from commit ea740a9c)

XWIKI-21625: You shouldn't have to force the page lock to enter a realtime editing session
(cherry picked from commit 9127847a)

  * Ensure that an edition failure won't block other test because of the
    alert when leaving edition

(cherry picked from commit 3795d1b5)

XWIKI-21687: LoginIT.loginLogoutAsAdmin(TestUtils, TestReference) and LoginIT.loginWithInvalidCredentials(LogCaptureConfiguration) are flickering

(cherry picked from commit 0ddc451a)

* Use 100dvh as height instead of 100vh to make sure that the drawer is
  fully visible when the viewport is resized, e.g., due to the
  navigation bar. Use 100vh as fallback as dvh is still relatively new.

(cherry picked from commit 3aa2f06a)

XWIKI-22115: Filter boxes for Notifications Custom Filters LiveData are displayed in larger size in Chrome and Edge

* Adjust the styles of boolean filters to match those of list filters.

(cherry picked from commit df0baae0)

(cherry picked from commit 27b7b2e2)

(cherry picked from commit f5e07d8a)

(cherry picked from commit 1597139d)

  * Fix minor issue with integration test

(cherry picked from commit 2082368a)

  * Prevent flickering behaviour

(cherry picked from commit a43c615e)

* Refactor jsonResponse macro
* Add rawResponse macro
* Refactor Main.DatabaseSearch
* Refactor Main.SolrSearchMacros
* Refactor CKEditor.HTMLConverter
* Refactor XWiki.Notifications.Code.NotificationRSSService

(cherry picked from commit 67021db9)

(cherry picked from commit ee677ff9)

Fix missing parameters in Channel constructor.

(cherry picked from commit 85a705ef)

* Bulletproof the code that detects if we submit the raw content or the rendered content.

(cherry picked from commit 37464645)

* Move the caret at the start of the first nested editable when the selection is before a macro widget wrapper (after the content is refreshed).

(cherry picked from commit c23af57c)

* Take into account the macro descriptor
* Move the caret at the start of the first nested editable when the selection is before a macro widget wrapper (after the content is refreshed).

(cherry picked from commit 8671be3b)

XWIKI-22056: Inserted icons on each line via Quick Actions are merged into one line in view mode (#3145)

* Always ask for inline icons and wrap the icon in a paragraph if
  necessary to ensure that in standalone mode all icons are actually
  standalone.
* Add a test.

(cherry picked from commit 423f3cd4)

XWIKI-22215: XWikiDocument#getPreparedXDOM can run the preparation on the same XDOM instance in several threads

(cherry picked from commit 954c5107)

XWIKI-22137: Tour button on the bottom right in French doesn't display properly characters with accents  (#3144)

* Removed the json escaping from the button text content
* Refactored the button creation

Co-authored-by: Manuel Leduc <manuel.leduc@xwiki.com>
(cherry picked from commit cd2d7622)

  * Fix the page object selector

(cherry picked from commit 26dde0f6)

  * Ensure to remove the boolean filter properly like we do for list
    filters
  * Improve Page Object to select all kind of filters (input or select)
  * Ensure to cover manipulating boolean filters in integration test

(cherry picked from commit 0487a596)

[Backport stable-16.4.x] XWIKI-22200: Missing `set` from .bat scripts causes 'XWIKI_OPTS' to not be recognized (#3147)

[Backport stable-16.4.x] XWIKI-22200: Missing `set` from .bat scripts causes 'XWIKI_OPTS' to not be recognized

(cherry picked from commit 6cf699e6)