master-qa-6863

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