CLOUDSTACK-5299: set hypervisor_type of volumes from image format if not set.
(cherry picked from commit 221aea573008a0b13d115f4949ea3eed2d574ac0)

Conflicts:

	server/src/com/cloud/api/query/dao/VolumeJoinDaoImpl.java
[UI] kvm vm snapshot not shown if kvm.snapshot.enabled is set to false
(cherry picked from commit 64c03dbc3129fe7b2c613f2981b3f645d88b449b)
CLOUDSTACK-5293: get vm disk statistics only from DISK (not for ISO/FLOPPY)
(cherry picked from commit d473d5a36a4c50793988081a52b602d58d95f302)
allow delete snapshot with ERROR state
(cherry picked from commit 81c07f179103e19a0607a6d1a718f28ffc1874ae)

Conflicts:

	engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/XenserverSnapshotStrategy.java
CLOUDSTACK-5310: fix issue: offering display twice in dropdown when create network
(cherry picked from commit 6ab27267beb11b63d968ca32203352d6a44ce39f)