master-qa-8980

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