master-qa-8133

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