master-qa-9284

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