master-qa-8823

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