master-qa-8166

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