master-qa-6368

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