LPS-42880 Fix backport for 6.1.x
LPS-43258 Regen
akismet-portlet not up to date