master-qa-6796

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