Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2017-03-22-v3' into staging