master-qa-9406

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