master-qa-10306

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