Apply WL-2953 changes to web-portlet
Merge pull request #11 from ox-it/WL-2953

Apply WL-2953 changes to web-portlet