master-qa-8125

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