bug #2483: set cdrom disk type in xen driver
bug #2585: user proper vnc parameters for HVM XEN
Merge branch 'bug-2483'
Merge branch 'bug-2585'