master-bc-435

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