Apply WL-2953 changes to web-portlet