master-qa-8651

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