CLOUDSTACK-4114: Use RAW disk images for RBD instead of QCOW2
Remove .java.orig file

Left over from somebodies editor?