master-qa-10420

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