Merge branch 'Backroll' into Backroll-dev

Author: PeterBackroll

plugins/backup/backroll/src/main/java/org/apache/cloudstack/backup/BackrollBackupProvider.java

@@ -410,7 +410,7 @@ protected BackrollClient getClient(final Long zoneId) {
         logger.debug("Backroll Provider GetClient with zone id {}", zoneId);
         try {
             if (backrollClient == null) {
-                logger.debug("backroll client null - instanciation of new one ");
+                logger.debug("backroll client null - instantiation of new one ");
                 BackrollHttpClientProvider provider = new BackrollHttpClientProvider(BackrollUrlConfigKey.valueIn(zoneId), BackrollAppNameConfigKey.valueIn(zoneId), BackrollPasswordConfigKey.valueIn(zoneId), true, 300, 600);
                 backrollClient = new BackrollClient(provider);
             }

plugins/backup/backroll/src/main/java/org/apache/cloudstack/backup/backroll/model/BackrollVmBackup.java

@@ -40,4 +40,4 @@ public BackrollVmBackup(String id, String name, Date date) {
         this.name = name;
         this.date = date;
     }
-}
+}

plugins/backup/backroll/src/main/java/org/apache/cloudstack/backup/backroll/model/response/backup/BackrollBackupStatusResponse.java

@@ -30,4 +30,4 @@ public class BackrollBackupStatusResponse {
 
     @JsonProperty("status")
     public String status;
-}
+}