master-qa-6559

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