master-qa-9333

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