Merge branch 'xen-netfront-xsa-403-follow-on'