Pushed to upstream

cc/ @juliocamarero.  Please see JIRA comments here: https://issues.liferay.com/browse/LPS-48692