Merge remote-tracking branch 'remotes/ericb/tags/pull-qapi-2018-03-27-v2' into staging