LPS-31847
Test Fixes - portlet/webcontentdisplay
SOS-1389
SOS-1389