master-qa-2838

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