master-qa-6225

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