master-qa-6599

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