LPS-47951 Use portlet keys

Rebased