Merge branch 'xen-netback-fix-multiple-extra-info-handling'