merging trunk; adding error handling around image xml serialization
merging trunk; adding error handling around image xml serialization
citrix-openstack-build/oslo.versionedobjects,openstack/oslo.versionedobjects