master-qa-6421

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