master-bc-497

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