master-qa-8186

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