LPS-34838 6.2.x

http://issues.liferay.com/browse/LPS-34838

Unable to test 6.2.x because of LPS-35309.