master-qa-6558

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