Merged Alex's OpenNebula interface classes with the CloudClient code