master-bc-271


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