master-qa-9264

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