LPS-41601

Heya Brian, PR for plugins sent here: https://github.com/brianchandotcom/liferay-plugins/pull/2236