master-qa-6414

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