更改diskapi

更改diskapi
Merge branch 'master' of https://github.com/faylau/oVirt3.3WebAPITest

Conflicts:
	.settings/org.eclipse.core.resources.prefs