master-qa-10360

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