master-bc-720

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