Default value of force should be false for template delete operation (apache#7731)

* default value of force should be false

* Added force flag in tests

(cherry picked from commit a9f3af8)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Author: harikrishna-patnala

api/src/main/java/org/apache/cloudstack/api/command/user/template/DeleteTemplateCmd.java

@@ -16,6 +16,7 @@
 // under the License.
 package org.apache.cloudstack.api.command.user.template;
 
+import org.apache.commons.lang3.BooleanUtils;
 import org.apache.log4j.Logger;
 
 import org.apache.cloudstack.api.APICommand;
@@ -67,8 +68,9 @@ public Long getZoneId() {
     }
 
     public boolean isForced() {
-        return (forced != null) ? forced : true;
+        return BooleanUtils.toBooleanDefaultIfNull(forced, false);
     }
+
     /////////////////////////////////////////////////////
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////

test/integration/smoke/test_templates.py

@@ -115,6 +115,7 @@ def tearDown(self):
                 cmd = deleteTemplate.deleteTemplateCmd()
                 cmd.id = temp.id
                 cmd.zoneid = self.zone.id
+                cmd.forced = True
                 self.apiclient.deleteTemplate(cmd)
         except Exception as e:
             raise Exception("Warning: Exception during cleanup : %s" % e)