Add some patches from the ea-1268-staging to master

This is for xenopsd-xenlight, and won't affect the classic xenopsd.