LPS-32584 Error when propagating changes from a Site Template to a Site when using Page Templates

LayoutExportImportTest and PortletExportImportTest (uncommenting preference checking) pass with these changes.