Update version for v2.0.0 release

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Merge branch 'master' into disk-inject