LPS-41997 Improve sitemap to use xhtml:link
LPS-42000 Fix NPE when upgrading from 6.1 to 6.2 and there are portlet-preferences with SQL NULL value