Merge branches 'upstream/core', 'upstream/xenfs' and 'upstream/evtchn' into upstream...