master-bc-270

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