master-qa-8982

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