6.2.x-bc-867

https://issues.liferay.com/browse/LIFERAYQA-5871