master-bc-477

http://issues.liferay.com/browse/LIFERAYQA-4053