LPS-44676 Fix for unit test
LPS-44676 Fix for plugins
LPS-44676 Regenerate
LPS-45867 search portlet included in a theme does not generate its URLs escaped