LPS-33093 Apply same pattern to knowledge base portlet
LPS-33093 update language files
LPS-33320
LPS-33320 Use ServiceContext instead of ThemeDisplay
LPS-33320 SF
LPS-33320 Proper compatibility so 6.1.x code looks as much like master as possible (except for compat packages of course)
LPS-33320 Apply