LRDOCS-810 portlet localization fixes.

Hi Rich. This is ready for upstream master. Thanks.