[TECH SUPPORT] LPS-34181 Resend

Hi Nate,

I'm resending this after resolving conflicts and rebasing as you requested in https://github.com/natecavanaugh/liferay-portal/pull/1106

Regards,
G