(cherry picked from commit e23b10319f) Conflicts: plugins/storage/image/default/src/org/apache/cloudstack/storage/datastore/driver/CloudStackImageStoreDriverImpl.java server/src/com/cloud/storage/upload/UploadMonitorImpl.java
e23b10319f