master-qa-6380

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