LPS-38244

ee-6.2.x: https://github.com/brianchandotcom/liferay-plugins-ee/pull/2356
ee-6.1.x: https://github.com/amosfong/liferay-plugins-ee/pull/281

I sent the ee-6.1.x to @amosfong because there were quite a few changes to osb-portlet