master-qa-9624

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