Merge remote-tracking branch 'apache/4.15'

Author: shwstppr

services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java

@@ -3260,7 +3260,7 @@ private synchronized void checkSecondaryStorageResourceLimit(TemplateOrVolumePos
         long accountTemplateDirSize = 0;
         File accountTemplateDir = new File(rootDir + getTemplatePathForAccount(accountId));
         if (accountTemplateDir.exists()) {
-            FileUtils.sizeOfDirectory(accountTemplateDir);
+            accountTemplateDirSize = FileUtils.sizeOfDirectory(accountTemplateDir);
         }
         long accountVolumeDirSize = 0;
         File accountVolumeDir = new File(rootDir + getVolumePathForAccount(accountId));

ui/src/views/image/RegisterOrUploadTemplate.vue

@@ -837,6 +837,9 @@ export default {
             }
           }
         }
+        if (!('requireshvm' in params)) { // handled as default true by API
+          params.requireshvm = false
+        }
         if (this.currentForm === 'Create') {
           this.loading = true
           api('registerTemplate', params).then(json => {