master-qa-8167

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