LPS-34804 avoid using deprecated method
LPS-36404 Bug when localized layout friendly urls starts with the same word
Revert "LPS-36418 Rollback test as it is blocking database connections"

This reverts commit 8e87f00bec83538f00189e211e145fb7709a36d9.
LPS-36418 A more robust way to prevent scheduler thread pool hanging.
LPS-36526 Avoid NPE. siteAdministrationURL can be null