Bug #2252: Guest XML incorrect for CDROM images in a ceph datastore

Also prepare a new DiskType for Gluster, which might be useful in the future
Merge branch 'bug-2252'