LPS-37648

Another version of https://github.com/brianchandotcom/liferay-plugins/pull/1830, now without problems with rebasing. Sorry for the annoyance.