master-bc-504

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