master-qa-6272

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