master-qa-8071

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