LPS-45693 - SF

Hey @natecavanaugh, since @ipeychev is on vacation, I've rebased and resent https://github.com/natecavanaugh/liferay-portal/pull/2315

Thanks!