LPS-33455 fix ambiguity
LPS-33132 Missed the assignment
LPS-30581 Fix incorrect javadoc commet
LPS-30581 Javadoc editing
LPS-30581 Regen
LPS-33132 Rejar
LPS-33503 Javadoc re-add
LPS-33478 As a content editor, I can see the entity I'm creating in the Asset Publisher directly when only one is available
LPS-33491 LDAP Server with NTLM compatibility level 5 fails LDAP import and SSO sign-in
LPS-32110 Remove unused variable definition.
LPS-32110 Add layout.ftl for two reasons:1) improve performance of ftl by decreasing the use of array from Freemarker 2) prepare for remove dependency in groups.ftl
LPS-32110 Calculate publicPageCount, remove the dependency in groups.ftl.
LPS-33447 Windows has a buggy nio socket half close impl, a shutdownInput/Output will cause a full socket reset on the peer side. Remove the half close logic in this test to be tolerant for windows.
LPS-33455 Use generic inference empty collection methods, don't use raw types
LPS-32400 - Add convert to PathConverter
LPS-32400 SF
LPS-33005 Rename JournalTemplateResourceParser to DDMTemplateResourceParser (no code changes)
LPS-33005 Rename JournalTemplateResource to DDMTemplateResource (no code changes)
LPS-33005 Support template embedding in any DDM Template

The journalTemplatesPath, JOURNAL_SEPARATOR variables are deprecated and the new templatesPath, TEMPLATE_SEPARATOR variables should be used instead. The old variables are kept for backwards compatibility.
LPS-33005 Display the template key in the edit template view