bugfix: resolve pom error
add provisioning type to volumes_view

Conflicts:
	setup/db/db/schema-421to430.sql
alter disk offering view to support provisioning type

Conflicts:
	setup/db/db/schema-421to430.sql
make disk|service offering API return a provisioning type

Conflicts:
	api/src/org/apache/cloudstack/api/command/admin/offering/CreateDiskOfferingCmd.java
	api/src/org/apache/cloudstack/api/command/admin/offering/CreateServiceOfferingCmd.java
	api/src/org/apache/cloudstack/api/response/DiskOfferingResponse.java
	api/src/org/apache/cloudstack/api/response/ServiceOfferingResponse.java
	api/src/org/apache/cloudstack/api/response/VolumeResponse.java
	server/src/com/cloud/api/query/vo/DiskOfferingJoinVO.java
	server/src/com/cloud/api/query/vo/ServiceOfferingJoinVO.java
	server/src/com/cloud/api/query/vo/VolumeJoinVO.java
bugfix VirtualMachineManagerImplTest