diff --git a/resources/templates/provision/polycom/4.x/{$mac}.cfg b/resources/templates/provision/polycom/4.x/{$mac}.cfg
index c00155db74..d40c29c3d2 100644
--- a/resources/templates/provision/polycom/4.x/{$mac}.cfg
+++ b/resources/templates/provision/polycom/4.x/{$mac}.cfg
@@ -115,10 +115,10 @@
 		tcpIpApp.sntp.address="{$ntp_server_primary}"
 		tcpIpApp.sntp.gmtOffset.overrideDHCP="1"
 		tcpIpApp.sntp.gmtOffset="{$polycom_gmt_offset}"
-		{if $daylight_savings_enabled == "false"}
-		tcpIpApp.sntp.daylightSavings.enable="0"
-		{else}
+		{if $daylight_savings_enabled}
 		tcpIpApp.sntp.daylightSavings.enable="1"
+		{else}
+		tcpIpApp.sntp.daylightSavings.enable="0"
 		{/if}
 		tcpIpApp.sntp.daylightSavings.fixedDayEnable="0"
 		tcpIpApp.sntp.daylightSavings.start.month="{$daylight_savings_start_month}"
diff --git a/resources/templates/provision/polycom/5.x/{$mac}.cfg b/resources/templates/provision/polycom/5.x/{$mac}.cfg
index c13d9392d8..27760de660 100644
--- a/resources/templates/provision/polycom/5.x/{$mac}.cfg
+++ b/resources/templates/provision/polycom/5.x/{$mac}.cfg
@@ -126,10 +126,10 @@
 		tcpIpApp.sntp.address="{$ntp_server_primary}"
 		tcpIpApp.sntp.gmtOffset.overrideDHCP="1"
 		tcpIpApp.sntp.gmtOffset="{$polycom_gmt_offset}"
-		{if $daylight_savings_enabled == "false"}
-		tcpIpApp.sntp.daylightSavings.enable="0"
-		{else}
+		{if $daylight_savings_enabled}
 		tcpIpApp.sntp.daylightSavings.enable="1"
+		{else}
+		tcpIpApp.sntp.daylightSavings.enable="0"
 		{/if}
 		tcpIpApp.sntp.daylightSavings.fixedDayEnable="0"
 		tcpIpApp.sntp.daylightSavings.start.month="{$daylight_savings_start_month}"
@@ -144,7 +144,7 @@
 		tcpIpApp.sntp.daylightSavings.stop.dayOfWeek.lastInMonth="0"
 	/>
 	<DIALPLAN
-		{if $polycom_emergency_customized == "true"}
+		{if $polycom_emergency_customized}
 			dialplan.routing.server.1.address="{$polycom_emergency_server}"
 			dialplan.routing.server.1.port="{$polycom_emergency_port}"
 				{foreach $polycom_emergency_number as $number name=emergencynumbers}
diff --git a/resources/templates/provision/polycom/6.x/{$mac}.cfg b/resources/templates/provision/polycom/6.x/{$mac}.cfg
index c13d9392d8..27760de660 100644
--- a/resources/templates/provision/polycom/6.x/{$mac}.cfg
+++ b/resources/templates/provision/polycom/6.x/{$mac}.cfg
@@ -126,10 +126,10 @@
 		tcpIpApp.sntp.address="{$ntp_server_primary}"
 		tcpIpApp.sntp.gmtOffset.overrideDHCP="1"
 		tcpIpApp.sntp.gmtOffset="{$polycom_gmt_offset}"
-		{if $daylight_savings_enabled == "false"}
-		tcpIpApp.sntp.daylightSavings.enable="0"
-		{else}
+		{if $daylight_savings_enabled}
 		tcpIpApp.sntp.daylightSavings.enable="1"
+		{else}
+		tcpIpApp.sntp.daylightSavings.enable="0"
 		{/if}
 		tcpIpApp.sntp.daylightSavings.fixedDayEnable="0"
 		tcpIpApp.sntp.daylightSavings.start.month="{$daylight_savings_start_month}"
@@ -144,7 +144,7 @@
 		tcpIpApp.sntp.daylightSavings.stop.dayOfWeek.lastInMonth="0"
 	/>
 	<DIALPLAN
-		{if $polycom_emergency_customized == "true"}
+		{if $polycom_emergency_customized}
 			dialplan.routing.server.1.address="{$polycom_emergency_server}"
 			dialplan.routing.server.1.port="{$polycom_emergency_port}"
 				{foreach $polycom_emergency_number as $number name=emergencynumbers}
diff --git a/resources/templates/provision/polycom/duo/{$mac}.cfg b/resources/templates/provision/polycom/duo/{$mac}.cfg
index 4e5d1d7625..d5c441f5f8 100644
--- a/resources/templates/provision/polycom/duo/{$mac}.cfg
+++ b/resources/templates/provision/polycom/duo/{$mac}.cfg
@@ -115,10 +115,10 @@
 		tcpIpApp.sntp.address="{$ntp_server_primary}"
 		tcpIpApp.sntp.gmtOffset.overrideDHCP="1"
 		tcpIpApp.sntp.gmtOffset="{$polycom_gmt_offset}"
-		{if $daylight_savings_enabled == "false"}
-		tcpIpApp.sntp.daylightSavings.enable="0"
-		{else}
+		{if $daylight_savings_enabled}
 		tcpIpApp.sntp.daylightSavings.enable="1"
+		{else}
+		tcpIpApp.sntp.daylightSavings.enable="0"
 		{/if}
 		tcpIpApp.sntp.daylightSavings.fixedDayEnable="0"
 		tcpIpApp.sntp.daylightSavings.start.month="{$daylight_savings_start_month}"
diff --git a/resources/templates/provision/polycom/ip321/{$mac}.cfg b/resources/templates/provision/polycom/ip321/{$mac}.cfg
index db4de5f324..2be21b54e1 100644
--- a/resources/templates/provision/polycom/ip321/{$mac}.cfg
+++ b/resources/templates/provision/polycom/ip321/{$mac}.cfg
@@ -115,10 +115,10 @@
 		tcpIpApp.sntp.address="{$ntp_server_primary}"
 		tcpIpApp.sntp.gmtOffset.overrideDHCP="1"
 		tcpIpApp.sntp.gmtOffset="{$polycom_gmt_offset}"
-		{if $daylight_savings_enabled == "false"}
-		tcpIpApp.sntp.daylightSavings.enable="0"
-		{else}
+		{if $daylight_savings_enabled}
 		tcpIpApp.sntp.daylightSavings.enable="1"
+		{else}
+		tcpIpApp.sntp.daylightSavings.enable="0"
 		{/if}
 		tcpIpApp.sntp.daylightSavings.fixedDayEnable="0"
 		tcpIpApp.sntp.daylightSavings.start.month="{$daylight_savings_start_month}"
diff --git a/resources/templates/provision/polycom/ip331/{$mac}.cfg b/resources/templates/provision/polycom/ip331/{$mac}.cfg
index a33afafa3d..ca22da8d6b 100644
--- a/resources/templates/provision/polycom/ip331/{$mac}.cfg
+++ b/resources/templates/provision/polycom/ip331/{$mac}.cfg
@@ -115,10 +115,10 @@
 		tcpIpApp.sntp.address="{$ntp_server_primary}"
 		tcpIpApp.sntp.gmtOffset.overrideDHCP="1"
 		tcpIpApp.sntp.gmtOffset="{$polycom_gmt_offset}"
-		{if $daylight_savings_enabled == "false"}
-		tcpIpApp.sntp.daylightSavings.enable="0"
-		{else}
+		{if $daylight_savings_enabled}
 		tcpIpApp.sntp.daylightSavings.enable="1"
+		{else}
+		tcpIpApp.sntp.daylightSavings.enable="0"
 		{/if}
 		tcpIpApp.sntp.daylightSavings.fixedDayEnable="0"
 		tcpIpApp.sntp.daylightSavings.start.month="{$daylight_savings_start_month}"
diff --git a/resources/templates/provision/polycom/ip335/{$mac}.cfg b/resources/templates/provision/polycom/ip335/{$mac}.cfg
index a33afafa3d..ca22da8d6b 100644
--- a/resources/templates/provision/polycom/ip335/{$mac}.cfg
+++ b/resources/templates/provision/polycom/ip335/{$mac}.cfg
@@ -115,10 +115,10 @@
 		tcpIpApp.sntp.address="{$ntp_server_primary}"
 		tcpIpApp.sntp.gmtOffset.overrideDHCP="1"
 		tcpIpApp.sntp.gmtOffset="{$polycom_gmt_offset}"
-		{if $daylight_savings_enabled == "false"}
-		tcpIpApp.sntp.daylightSavings.enable="0"
-		{else}
+		{if $daylight_savings_enabled}
 		tcpIpApp.sntp.daylightSavings.enable="1"
+		{else}
+		tcpIpApp.sntp.daylightSavings.enable="0"
 		{/if}
 		tcpIpApp.sntp.daylightSavings.fixedDayEnable="0"
 		tcpIpApp.sntp.daylightSavings.start.month="{$daylight_savings_start_month}"
diff --git a/resources/templates/provision/polycom/ip450/{$mac}.cfg b/resources/templates/provision/polycom/ip450/{$mac}.cfg
index 388ad00721..164944e68b 100644
--- a/resources/templates/provision/polycom/ip450/{$mac}.cfg
+++ b/resources/templates/provision/polycom/ip450/{$mac}.cfg
@@ -115,10 +115,10 @@
 		tcpIpApp.sntp.address="{$ntp_server_primary}"
 		tcpIpApp.sntp.gmtOffset.overrideDHCP="1"
 		tcpIpApp.sntp.gmtOffset="{$polycom_gmt_offset}"
-		{if $daylight_savings_enabled == "false"}
-		tcpIpApp.sntp.daylightSavings.enable="0"
-		{else}
+		{if $daylight_savings_enabled}
 		tcpIpApp.sntp.daylightSavings.enable="1"
+		{else}
+		tcpIpApp.sntp.daylightSavings.enable="0"
 		{/if}
 		tcpIpApp.sntp.daylightSavings.fixedDayEnable="0"
 		tcpIpApp.sntp.daylightSavings.start.month="{$daylight_savings_start_month}"
diff --git a/resources/templates/provision/polycom/ip5000/{$mac}.cfg b/resources/templates/provision/polycom/ip5000/{$mac}.cfg
index f5e67fdb07..f43c76cf30 100644
--- a/resources/templates/provision/polycom/ip5000/{$mac}.cfg
+++ b/resources/templates/provision/polycom/ip5000/{$mac}.cfg
@@ -115,10 +115,10 @@
 		tcpIpApp.sntp.address="{$ntp_server_primary}"
 		tcpIpApp.sntp.gmtOffset.overrideDHCP="1"
 		tcpIpApp.sntp.gmtOffset="{$polycom_gmt_offset}"
-		{if $daylight_savings_enabled == "false"}
-		tcpIpApp.sntp.daylightSavings.enable="0"
-		{else}
+		{if $daylight_savings_enabled}
 		tcpIpApp.sntp.daylightSavings.enable="1"
+		{else}
+		tcpIpApp.sntp.daylightSavings.enable="0"
 		{/if}
 		tcpIpApp.sntp.daylightSavings.fixedDayEnable="0"
 		tcpIpApp.sntp.daylightSavings.start.month="{$daylight_savings_start_month}"
diff --git a/resources/templates/provision/polycom/ip550/{$mac}.cfg b/resources/templates/provision/polycom/ip550/{$mac}.cfg
index f62d9bab94..138142faff 100644
--- a/resources/templates/provision/polycom/ip550/{$mac}.cfg
+++ b/resources/templates/provision/polycom/ip550/{$mac}.cfg
@@ -115,10 +115,10 @@
 		tcpIpApp.sntp.address="{$ntp_server_primary}"
 		tcpIpApp.sntp.gmtOffset.overrideDHCP="1"
 		tcpIpApp.sntp.gmtOffset="{$polycom_gmt_offset}"
-		{if $daylight_savings_enabled == "false"}
-		tcpIpApp.sntp.daylightSavings.enable="0"
-		{else}
+		{if $daylight_savings_enabled}
 		tcpIpApp.sntp.daylightSavings.enable="1"
+		{else}
+		tcpIpApp.sntp.daylightSavings.enable="0"
 		{/if}
 		tcpIpApp.sntp.daylightSavings.fixedDayEnable="0"
 		tcpIpApp.sntp.daylightSavings.start.month="{$daylight_savings_start_month}"
diff --git a/resources/templates/provision/polycom/ip560/{$mac}.cfg b/resources/templates/provision/polycom/ip560/{$mac}.cfg
index 2a51d777f4..32e8b0835e 100644
--- a/resources/templates/provision/polycom/ip560/{$mac}.cfg
+++ b/resources/templates/provision/polycom/ip560/{$mac}.cfg
@@ -115,10 +115,10 @@
 		tcpIpApp.sntp.address="{$ntp_server_primary}"
 		tcpIpApp.sntp.gmtOffset.overrideDHCP="1"
 		tcpIpApp.sntp.gmtOffset="{$polycom_gmt_offset}"
-		{if $daylight_savings_enabled == "false"}
-		tcpIpApp.sntp.daylightSavings.enable="0"
-		{else}
+		{if $daylight_savings_enabled}
 		tcpIpApp.sntp.daylightSavings.enable="1"
+		{else}
+		tcpIpApp.sntp.daylightSavings.enable="0"
 		{/if}
 		tcpIpApp.sntp.daylightSavings.fixedDayEnable="0"
 		tcpIpApp.sntp.daylightSavings.start.month="{$daylight_savings_start_month}"
diff --git a/resources/templates/provision/polycom/ip6000/{$mac}.cfg b/resources/templates/provision/polycom/ip6000/{$mac}.cfg
index 367d1c6cbe..22694682c4 100644
--- a/resources/templates/provision/polycom/ip6000/{$mac}.cfg
+++ b/resources/templates/provision/polycom/ip6000/{$mac}.cfg
@@ -115,10 +115,10 @@
 		tcpIpApp.sntp.address="{$ntp_server_primary}"
 		tcpIpApp.sntp.gmtOffset.overrideDHCP="1"
 		tcpIpApp.sntp.gmtOffset="{$polycom_gmt_offset}"
-		{if $daylight_savings_enabled == "false"}
-		tcpIpApp.sntp.daylightSavings.enable="0"
-		{else}
+		{if $daylight_savings_enabled}
 		tcpIpApp.sntp.daylightSavings.enable="1"
+		{else}
+		tcpIpApp.sntp.daylightSavings.enable="0"
 		{/if}
 		tcpIpApp.sntp.daylightSavings.fixedDayEnable="0"
 		tcpIpApp.sntp.daylightSavings.start.month="{$daylight_savings_start_month}"
diff --git a/resources/templates/provision/polycom/ip650/{$mac}.cfg b/resources/templates/provision/polycom/ip650/{$mac}.cfg
index 0d0b16eb3a..6628371a46 100644
--- a/resources/templates/provision/polycom/ip650/{$mac}.cfg
+++ b/resources/templates/provision/polycom/ip650/{$mac}.cfg
@@ -115,10 +115,10 @@
 		tcpIpApp.sntp.address="{$ntp_server_primary}"
 		tcpIpApp.sntp.gmtOffset.overrideDHCP="1"
 		tcpIpApp.sntp.gmtOffset="{$polycom_gmt_offset}"
-		{if $daylight_savings_enabled == "false"}
-		tcpIpApp.sntp.daylightSavings.enable="0"
-		{else}
+		{if $daylight_savings_enabled}
 		tcpIpApp.sntp.daylightSavings.enable="1"
+		{else}
+		tcpIpApp.sntp.daylightSavings.enable="0"
 		{/if}
 		tcpIpApp.sntp.daylightSavings.fixedDayEnable="0"
 		tcpIpApp.sntp.daylightSavings.start.month="{$daylight_savings_start_month}"
diff --git a/resources/templates/provision/polycom/ip670/{$mac}.cfg b/resources/templates/provision/polycom/ip670/{$mac}.cfg
index 5e78a2b54d..9e60259c20 100644
--- a/resources/templates/provision/polycom/ip670/{$mac}.cfg
+++ b/resources/templates/provision/polycom/ip670/{$mac}.cfg
@@ -115,10 +115,10 @@
 		tcpIpApp.sntp.address="{$ntp_server_primary}"
 		tcpIpApp.sntp.gmtOffset.overrideDHCP="1"
 		tcpIpApp.sntp.gmtOffset="{$polycom_gmt_offset}"
-		{if $daylight_savings_enabled == "false"}
-		tcpIpApp.sntp.daylightSavings.enable="0"
-		{else}
+		{if $daylight_savings_enabled}
 		tcpIpApp.sntp.daylightSavings.enable="1"
+		{else}
+		tcpIpApp.sntp.daylightSavings.enable="0"
 		{/if}
 		tcpIpApp.sntp.daylightSavings.fixedDayEnable="0"
 		tcpIpApp.sntp.daylightSavings.start.month="{$daylight_savings_start_month}"
diff --git a/resources/templates/provision/polycom/ip7000/{$mac}.cfg b/resources/templates/provision/polycom/ip7000/{$mac}.cfg
index 4c52d4ae0f..39c6439b98 100644
--- a/resources/templates/provision/polycom/ip7000/{$mac}.cfg
+++ b/resources/templates/provision/polycom/ip7000/{$mac}.cfg
@@ -115,10 +115,10 @@
 		tcpIpApp.sntp.address="{$ntp_server_primary}"
 		tcpIpApp.sntp.gmtOffset.overrideDHCP="1"
 		tcpIpApp.sntp.gmtOffset="{$polycom_gmt_offset}"
-		{if $daylight_savings_enabled == "false"}
-		tcpIpApp.sntp.daylightSavings.enable="0"
-		{else}
+		{if $daylight_savings_enabled}
 		tcpIpApp.sntp.daylightSavings.enable="1"
+		{else}
+		tcpIpApp.sntp.daylightSavings.enable="0"
 		{/if}
 		tcpIpApp.sntp.daylightSavings.fixedDayEnable="0"
 		tcpIpApp.sntp.daylightSavings.start.month="{$daylight_savings_start_month}"
diff --git a/resources/templates/provision/polycom/vvx101/{$mac}.cfg b/resources/templates/provision/polycom/vvx101/{$mac}.cfg
index bc0e0a321b..37eee064f6 100644
--- a/resources/templates/provision/polycom/vvx101/{$mac}.cfg
+++ b/resources/templates/provision/polycom/vvx101/{$mac}.cfg
@@ -126,10 +126,10 @@
 		tcpIpApp.sntp.address="{$ntp_server_primary}"
 		tcpIpApp.sntp.gmtOffset.overrideDHCP="1"
 		tcpIpApp.sntp.gmtOffset="{$polycom_gmt_offset}"
-		{if $daylight_savings_enabled == "false"}
-		tcpIpApp.sntp.daylightSavings.enable="0"
-		{else}
+		{if $daylight_savings_enabled}
 		tcpIpApp.sntp.daylightSavings.enable="1"
+		{else}
+		tcpIpApp.sntp.daylightSavings.enable="0"
 		{/if}
 		tcpIpApp.sntp.daylightSavings.fixedDayEnable="0"
 		tcpIpApp.sntp.daylightSavings.start.month="{$daylight_savings_start_month}"
@@ -144,7 +144,7 @@
 		tcpIpApp.sntp.daylightSavings.stop.dayOfWeek.lastInMonth="0"
 	/>
 	<DIALPLAN
-		{if $polycom_emergency_customized == "true"}
+		{if $polycom_emergency_customized}
 			dialplan.routing.server.1.address="{$polycom_emergency_server}"
 			dialplan.routing.server.1.port="{$polycom_emergency_port}"
 				{foreach $polycom_emergency_number as $number name=emergencynumbers}
diff --git a/resources/templates/provision/polycom/vvx150/{$mac}.cfg b/resources/templates/provision/polycom/vvx150/{$mac}.cfg
index 5b87ea8304..0830dedc81 100644
--- a/resources/templates/provision/polycom/vvx150/{$mac}.cfg
+++ b/resources/templates/provision/polycom/vvx150/{$mac}.cfg
@@ -126,10 +126,10 @@
 		tcpIpApp.sntp.address="{$ntp_server_primary}"
 		tcpIpApp.sntp.gmtOffset.overrideDHCP="1"
 		tcpIpApp.sntp.gmtOffset="{$polycom_gmt_offset}"
-		{if $daylight_savings_enabled == "false"}
-		tcpIpApp.sntp.daylightSavings.enable="0"
-		{else}
+		{if $daylight_savings_enabled}
 		tcpIpApp.sntp.daylightSavings.enable="1"
+		{else}
+		tcpIpApp.sntp.daylightSavings.enable="0"
 		{/if}
 		tcpIpApp.sntp.daylightSavings.fixedDayEnable="0"
 		tcpIpApp.sntp.daylightSavings.start.month="{$daylight_savings_start_month}"
@@ -144,7 +144,7 @@
 		tcpIpApp.sntp.daylightSavings.stop.dayOfWeek.lastInMonth="0"
 	/>
 	<DIALPLAN
-		{if $polycom_emergency_customized == "true"}
+		{if $polycom_emergency_customized}
 			dialplan.routing.server.1.address="{$polycom_emergency_server}"
 			dialplan.routing.server.1.port="{$polycom_emergency_port}"
 				{foreach $polycom_emergency_number as $number name=emergencynumbers}
diff --git a/resources/templates/provision/polycom/vvx1500/{$mac}.cfg b/resources/templates/provision/polycom/vvx1500/{$mac}.cfg
index 88e453d32d..be43928552 100644
--- a/resources/templates/provision/polycom/vvx1500/{$mac}.cfg
+++ b/resources/templates/provision/polycom/vvx1500/{$mac}.cfg
@@ -126,10 +126,10 @@
 		tcpIpApp.sntp.address="{$ntp_server_primary}"
 		tcpIpApp.sntp.gmtOffset.overrideDHCP="1"
 		tcpIpApp.sntp.gmtOffset="{$polycom_gmt_offset}"
-		{if $daylight_savings_enabled == "false"}
-		tcpIpApp.sntp.daylightSavings.enable="0"
-		{else}
+		{if $daylight_savings_enabled}
 		tcpIpApp.sntp.daylightSavings.enable="1"
+		{else}
+		tcpIpApp.sntp.daylightSavings.enable="0"
 		{/if}
 		tcpIpApp.sntp.daylightSavings.fixedDayEnable="0"
 		tcpIpApp.sntp.daylightSavings.start.month="{$daylight_savings_start_month}"
@@ -144,7 +144,7 @@
 		tcpIpApp.sntp.daylightSavings.stop.dayOfWeek.lastInMonth="0"
 	/>
 	<DIALPLAN
-		{if $polycom_emergency_customized == "true"}
+		{if $polycom_emergency_customized}
 			dialplan.routing.server.1.address="{$polycom_emergency_server}"
 			dialplan.routing.server.1.port="{$polycom_emergency_port}"
 				{foreach $polycom_emergency_number as $number name=emergencynumbers}
diff --git a/resources/templates/provision/polycom/vvx201/{$mac}.cfg b/resources/templates/provision/polycom/vvx201/{$mac}.cfg
index ac81acc904..1429fd7245 100644
--- a/resources/templates/provision/polycom/vvx201/{$mac}.cfg
+++ b/resources/templates/provision/polycom/vvx201/{$mac}.cfg
@@ -126,10 +126,10 @@
 		tcpIpApp.sntp.address="{$ntp_server_primary}"
 		tcpIpApp.sntp.gmtOffset.overrideDHCP="1"
 		tcpIpApp.sntp.gmtOffset="{$polycom_gmt_offset}"
-		{if $daylight_savings_enabled == "false"}
-		tcpIpApp.sntp.daylightSavings.enable="0"
-		{else}
+		{if $daylight_savings_enabled}
 		tcpIpApp.sntp.daylightSavings.enable="1"
+		{else}
+		tcpIpApp.sntp.daylightSavings.enable="0"
 		{/if}
 		tcpIpApp.sntp.daylightSavings.fixedDayEnable="0"
 		tcpIpApp.sntp.daylightSavings.start.month="{$daylight_savings_start_month}"
@@ -144,7 +144,7 @@
 		tcpIpApp.sntp.daylightSavings.stop.dayOfWeek.lastInMonth="0"
 	/>
 	<DIALPLAN
-		{if $polycom_emergency_customized == "true"}
+		{if $polycom_emergency_customized}
 			dialplan.routing.server.1.address="{$polycom_emergency_server}"
 			dialplan.routing.server.1.port="{$polycom_emergency_port}"
 				{foreach $polycom_emergency_number as $number name=emergencynumbers}
diff --git a/resources/templates/provision/polycom/vvx250/{$mac}.cfg b/resources/templates/provision/polycom/vvx250/{$mac}.cfg
index 544ce309c9..8f946e8132 100644
--- a/resources/templates/provision/polycom/vvx250/{$mac}.cfg
+++ b/resources/templates/provision/polycom/vvx250/{$mac}.cfg
@@ -126,10 +126,10 @@
 		tcpIpApp.sntp.address="{$ntp_server_primary}"
 		tcpIpApp.sntp.gmtOffset.overrideDHCP="1"
 		tcpIpApp.sntp.gmtOffset="{$polycom_gmt_offset}"
-		{if $daylight_savings_enabled == "false"}
-		tcpIpApp.sntp.daylightSavings.enable="0"
-		{else}
+		{if $daylight_savings_enabled}
 		tcpIpApp.sntp.daylightSavings.enable="1"
+		{else}
+		tcpIpApp.sntp.daylightSavings.enable="0"
 		{/if}
 		tcpIpApp.sntp.daylightSavings.fixedDayEnable="0"
 		tcpIpApp.sntp.daylightSavings.start.month="{$daylight_savings_start_month}"
@@ -144,7 +144,7 @@
 		tcpIpApp.sntp.daylightSavings.stop.dayOfWeek.lastInMonth="0"
 	/>
 	<DIALPLAN
-		{if $polycom_emergency_customized == "true"}
+		{if $polycom_emergency_customized}
 			dialplan.routing.server.1.address="{$polycom_emergency_server}"
 			dialplan.routing.server.1.port="{$polycom_emergency_port}"
 				{foreach $polycom_emergency_number as $number name=emergencynumbers}
diff --git a/resources/templates/provision/polycom/vvx300/{$mac}.cfg b/resources/templates/provision/polycom/vvx300/{$mac}.cfg
index 8b6661ae9c..a55272ce89 100644
--- a/resources/templates/provision/polycom/vvx300/{$mac}.cfg
+++ b/resources/templates/provision/polycom/vvx300/{$mac}.cfg
@@ -126,10 +126,10 @@
 		tcpIpApp.sntp.address="{$ntp_server_primary}"
 		tcpIpApp.sntp.gmtOffset.overrideDHCP="1"
 		tcpIpApp.sntp.gmtOffset="{$polycom_gmt_offset}"
-		{if $daylight_savings_enabled == "false"}
-		tcpIpApp.sntp.daylightSavings.enable="0"
-		{else}
+		{if $daylight_savings_enabled}
 		tcpIpApp.sntp.daylightSavings.enable="1"
+		{else}
+		tcpIpApp.sntp.daylightSavings.enable="0"
 		{/if}
 		tcpIpApp.sntp.daylightSavings.fixedDayEnable="0"
 		tcpIpApp.sntp.daylightSavings.start.month="{$daylight_savings_start_month}"
@@ -144,7 +144,7 @@
 		tcpIpApp.sntp.daylightSavings.stop.dayOfWeek.lastInMonth="0"
 	/>
 	<DIALPLAN
-		{if $polycom_emergency_customized == "true"}
+		{if $polycom_emergency_customized}
 			dialplan.routing.server.1.address="{$polycom_emergency_server}"
 			dialplan.routing.server.1.port="{$polycom_emergency_port}"
 				{foreach $polycom_emergency_number as $number name=emergencynumbers}
diff --git a/resources/templates/provision/polycom/vvx301/{$mac}.cfg b/resources/templates/provision/polycom/vvx301/{$mac}.cfg
index 3f812f6735..ee3161b795 100644
--- a/resources/templates/provision/polycom/vvx301/{$mac}.cfg
+++ b/resources/templates/provision/polycom/vvx301/{$mac}.cfg
@@ -126,10 +126,10 @@
 		tcpIpApp.sntp.address="{$ntp_server_primary}"
 		tcpIpApp.sntp.gmtOffset.overrideDHCP="1"
 		tcpIpApp.sntp.gmtOffset="{$polycom_gmt_offset}"
-		{if $daylight_savings_enabled == "false"}
-		tcpIpApp.sntp.daylightSavings.enable="0"
-		{else}
+		{if $daylight_savings_enabled}
 		tcpIpApp.sntp.daylightSavings.enable="1"
+		{else}
+		tcpIpApp.sntp.daylightSavings.enable="0"
 		{/if}
 		tcpIpApp.sntp.daylightSavings.fixedDayEnable="0"
 		tcpIpApp.sntp.daylightSavings.start.month="{$daylight_savings_start_month}"
@@ -144,7 +144,7 @@
 		tcpIpApp.sntp.daylightSavings.stop.dayOfWeek.lastInMonth="0"
 	/>
 	<DIALPLAN
-		{if $polycom_emergency_customized == "true"}
+		{if $polycom_emergency_customized}
 			dialplan.routing.server.1.address="{$polycom_emergency_server}"
 			dialplan.routing.server.1.port="{$polycom_emergency_port}"
 				{foreach $polycom_emergency_number as $number name=emergencynumbers}
diff --git a/resources/templates/provision/polycom/vvx310/{$mac}.cfg b/resources/templates/provision/polycom/vvx310/{$mac}.cfg
index 51ade7be24..a9391040b1 100644
--- a/resources/templates/provision/polycom/vvx310/{$mac}.cfg
+++ b/resources/templates/provision/polycom/vvx310/{$mac}.cfg
@@ -126,10 +126,10 @@
 		tcpIpApp.sntp.address="{$ntp_server_primary}"
 		tcpIpApp.sntp.gmtOffset.overrideDHCP="1"
 		tcpIpApp.sntp.gmtOffset="{$polycom_gmt_offset}"
-		{if $daylight_savings_enabled == "false"}
-		tcpIpApp.sntp.daylightSavings.enable="0"
-		{else}
+		{if $daylight_savings_enabled}
 		tcpIpApp.sntp.daylightSavings.enable="1"
+		{else}
+		tcpIpApp.sntp.daylightSavings.enable="0"
 		{/if}
 		tcpIpApp.sntp.daylightSavings.fixedDayEnable="0"
 		tcpIpApp.sntp.daylightSavings.start.month="{$daylight_savings_start_month}"
@@ -144,7 +144,7 @@
 		tcpIpApp.sntp.daylightSavings.stop.dayOfWeek.lastInMonth="0"
 	/>
 	<DIALPLAN
-		{if $polycom_emergency_customized == "true"}
+		{if $polycom_emergency_customized}
 			dialplan.routing.server.1.address="{$polycom_emergency_server}"
 			dialplan.routing.server.1.port="{$polycom_emergency_port}"
 				{foreach $polycom_emergency_number as $number name=emergencynumbers}
diff --git a/resources/templates/provision/polycom/vvx311/{$mac}.cfg b/resources/templates/provision/polycom/vvx311/{$mac}.cfg
index 3161b010ad..4c042ae0a9 100644
--- a/resources/templates/provision/polycom/vvx311/{$mac}.cfg
+++ b/resources/templates/provision/polycom/vvx311/{$mac}.cfg
@@ -126,10 +126,10 @@
 		tcpIpApp.sntp.address="{$ntp_server_primary}"
 		tcpIpApp.sntp.gmtOffset.overrideDHCP="1"
 		tcpIpApp.sntp.gmtOffset="{$polycom_gmt_offset}"
-		{if $daylight_savings_enabled == "false"}
-		tcpIpApp.sntp.daylightSavings.enable="0"
-		{else}
+		{if $daylight_savings_enabled}
 		tcpIpApp.sntp.daylightSavings.enable="1"
+		{else}
+		tcpIpApp.sntp.daylightSavings.enable="0"
 		{/if}
 		tcpIpApp.sntp.daylightSavings.fixedDayEnable="0"
 		tcpIpApp.sntp.daylightSavings.start.month="{$daylight_savings_start_month}"
@@ -144,7 +144,7 @@
 		tcpIpApp.sntp.daylightSavings.stop.dayOfWeek.lastInMonth="0"
 	/>
 	<DIALPLAN
-		{if $polycom_emergency_customized == "true"}
+		{if $polycom_emergency_customized}
 			dialplan.routing.server.1.address="{$polycom_emergency_server}"
 			dialplan.routing.server.1.port="{$polycom_emergency_port}"
 				{foreach $polycom_emergency_number as $number name=emergencynumbers}
diff --git a/resources/templates/provision/polycom/vvx350/{$mac}.cfg b/resources/templates/provision/polycom/vvx350/{$mac}.cfg
index db0141a10f..5bdc5aa44d 100644
--- a/resources/templates/provision/polycom/vvx350/{$mac}.cfg
+++ b/resources/templates/provision/polycom/vvx350/{$mac}.cfg
@@ -126,10 +126,10 @@
 		tcpIpApp.sntp.address="{$ntp_server_primary}"
 		tcpIpApp.sntp.gmtOffset.overrideDHCP="1"
 		tcpIpApp.sntp.gmtOffset="{$polycom_gmt_offset}"
-		{if $daylight_savings_enabled == "false"}
-		tcpIpApp.sntp.daylightSavings.enable="0"
-		{else}
+		{if $daylight_savings_enabled}
 		tcpIpApp.sntp.daylightSavings.enable="1"
+		{else}
+		tcpIpApp.sntp.daylightSavings.enable="0"
 		{/if}
 		tcpIpApp.sntp.daylightSavings.fixedDayEnable="0"
 		tcpIpApp.sntp.daylightSavings.start.month="{$daylight_savings_start_month}"
@@ -144,7 +144,7 @@
 		tcpIpApp.sntp.daylightSavings.stop.dayOfWeek.lastInMonth="0"
 	/>
 	<DIALPLAN
-		{if $polycom_emergency_customized == "true"}
+		{if $polycom_emergency_customized}
 			dialplan.routing.server.1.address="{$polycom_emergency_server}"
 			dialplan.routing.server.1.port="{$polycom_emergency_port}"
 				{foreach $polycom_emergency_number as $number name=emergencynumbers}
diff --git a/resources/templates/provision/polycom/vvx400/{$mac}.cfg b/resources/templates/provision/polycom/vvx400/{$mac}.cfg
index e5466e8043..9b160250b9 100644
--- a/resources/templates/provision/polycom/vvx400/{$mac}.cfg
+++ b/resources/templates/provision/polycom/vvx400/{$mac}.cfg
@@ -126,10 +126,10 @@
 		tcpIpApp.sntp.address="{$ntp_server_primary}"
 		tcpIpApp.sntp.gmtOffset.overrideDHCP="1"
 		tcpIpApp.sntp.gmtOffset="{$polycom_gmt_offset}"
-		{if $daylight_savings_enabled == "false"}
-		tcpIpApp.sntp.daylightSavings.enable="0"
-		{else}
+		{if $daylight_savings_enabled}
 		tcpIpApp.sntp.daylightSavings.enable="1"
+		{else}
+		tcpIpApp.sntp.daylightSavings.enable="0"
 		{/if}
 		tcpIpApp.sntp.daylightSavings.fixedDayEnable="0"
 		tcpIpApp.sntp.daylightSavings.start.month="{$daylight_savings_start_month}"
@@ -144,7 +144,7 @@
 		tcpIpApp.sntp.daylightSavings.stop.dayOfWeek.lastInMonth="0"
 	/>
 	<DIALPLAN
-		{if $polycom_emergency_customized == "true"}
+		{if $polycom_emergency_customized}
 			dialplan.routing.server.1.address="{$polycom_emergency_server}"
 			dialplan.routing.server.1.port="{$polycom_emergency_port}"
 				{foreach $polycom_emergency_number as $number name=emergencynumbers}
diff --git a/resources/templates/provision/polycom/vvx401/{$mac}.cfg b/resources/templates/provision/polycom/vvx401/{$mac}.cfg
index 0efbc53e40..8c67abd087 100644
--- a/resources/templates/provision/polycom/vvx401/{$mac}.cfg
+++ b/resources/templates/provision/polycom/vvx401/{$mac}.cfg
@@ -126,10 +126,10 @@
 		tcpIpApp.sntp.address="{$ntp_server_primary}"
 		tcpIpApp.sntp.gmtOffset.overrideDHCP="1"
 		tcpIpApp.sntp.gmtOffset="{$polycom_gmt_offset}"
-		{if $daylight_savings_enabled == "false"}
-		tcpIpApp.sntp.daylightSavings.enable="0"
-		{else}
+		{if $daylight_savings_enabled}
 		tcpIpApp.sntp.daylightSavings.enable="1"
+		{else}
+		tcpIpApp.sntp.daylightSavings.enable="0"
 		{/if}
 		tcpIpApp.sntp.daylightSavings.fixedDayEnable="0"
 		tcpIpApp.sntp.daylightSavings.start.month="{$daylight_savings_start_month}"
@@ -144,7 +144,7 @@
 		tcpIpApp.sntp.daylightSavings.stop.dayOfWeek.lastInMonth="0"
 	/>
 	<DIALPLAN
-		{if $polycom_emergency_customized == "true"}
+		{if $polycom_emergency_customized}
 			dialplan.routing.server.1.address="{$polycom_emergency_server}"
 			dialplan.routing.server.1.port="{$polycom_emergency_port}"
 				{foreach $polycom_emergency_number as $number name=emergencynumbers}
diff --git a/resources/templates/provision/polycom/vvx410/{$mac}.cfg b/resources/templates/provision/polycom/vvx410/{$mac}.cfg
index 1942d32859..4f954d3119 100644
--- a/resources/templates/provision/polycom/vvx410/{$mac}.cfg
+++ b/resources/templates/provision/polycom/vvx410/{$mac}.cfg
@@ -126,10 +126,10 @@
 		tcpIpApp.sntp.address="{$ntp_server_primary}"
 		tcpIpApp.sntp.gmtOffset.overrideDHCP="1"
 		tcpIpApp.sntp.gmtOffset="{$polycom_gmt_offset}"
-		{if $daylight_savings_enabled == "false"}
-		tcpIpApp.sntp.daylightSavings.enable="0"
-		{else}
+		{if $daylight_savings_enabled}
 		tcpIpApp.sntp.daylightSavings.enable="1"
+		{else}
+		tcpIpApp.sntp.daylightSavings.enable="0"
 		{/if}
 		tcpIpApp.sntp.daylightSavings.fixedDayEnable="0"
 		tcpIpApp.sntp.daylightSavings.start.month="{$daylight_savings_start_month}"
@@ -144,7 +144,7 @@
 		tcpIpApp.sntp.daylightSavings.stop.dayOfWeek.lastInMonth="0"
 	/>
 	<DIALPLAN
-		{if $polycom_emergency_customized == "true"}
+		{if $polycom_emergency_customized}
 			dialplan.routing.server.1.address="{$polycom_emergency_server}"
 			dialplan.routing.server.1.port="{$polycom_emergency_port}"
 				{foreach $polycom_emergency_number as $number name=emergencynumbers}
diff --git a/resources/templates/provision/polycom/vvx411/{$mac}.cfg b/resources/templates/provision/polycom/vvx411/{$mac}.cfg
index 361542aa10..48af5ebe9e 100644
--- a/resources/templates/provision/polycom/vvx411/{$mac}.cfg
+++ b/resources/templates/provision/polycom/vvx411/{$mac}.cfg
@@ -126,10 +126,10 @@
 		tcpIpApp.sntp.address="{$ntp_server_primary}"
 		tcpIpApp.sntp.gmtOffset.overrideDHCP="1"
 		tcpIpApp.sntp.gmtOffset="{$polycom_gmt_offset}"
-		{if $daylight_savings_enabled == "false"}
-		tcpIpApp.sntp.daylightSavings.enable="0"
-		{else}
+		{if $daylight_savings_enabled}
 		tcpIpApp.sntp.daylightSavings.enable="1"
+		{else}
+		tcpIpApp.sntp.daylightSavings.enable="0"
 		{/if}
 		tcpIpApp.sntp.daylightSavings.fixedDayEnable="0"
 		tcpIpApp.sntp.daylightSavings.start.month="{$daylight_savings_start_month}"
@@ -144,7 +144,7 @@
 		tcpIpApp.sntp.daylightSavings.stop.dayOfWeek.lastInMonth="0"
 	/>
 	<DIALPLAN
-		{if $polycom_emergency_customized == "true"}
+		{if $polycom_emergency_customized}
 			dialplan.routing.server.1.address="{$polycom_emergency_server}"
 			dialplan.routing.server.1.port="{$polycom_emergency_port}"
 				{foreach $polycom_emergency_number as $number name=emergencynumbers}
diff --git a/resources/templates/provision/polycom/vvx450/{$mac}.cfg b/resources/templates/provision/polycom/vvx450/{$mac}.cfg
index 2ae0bcfdb6..2a8a66c0bc 100644
--- a/resources/templates/provision/polycom/vvx450/{$mac}.cfg
+++ b/resources/templates/provision/polycom/vvx450/{$mac}.cfg
@@ -126,10 +126,10 @@
 		tcpIpApp.sntp.address="{$ntp_server_primary}"
 		tcpIpApp.sntp.gmtOffset.overrideDHCP="1"
 		tcpIpApp.sntp.gmtOffset="{$polycom_gmt_offset}"
-		{if $daylight_savings_enabled == "false"}
-		tcpIpApp.sntp.daylightSavings.enable="0"
-		{else}
+		{if $daylight_savings_enabled}
 		tcpIpApp.sntp.daylightSavings.enable="1"
+		{else}
+		tcpIpApp.sntp.daylightSavings.enable="0"
 		{/if}
 		tcpIpApp.sntp.daylightSavings.fixedDayEnable="0"
 		tcpIpApp.sntp.daylightSavings.start.month="{$daylight_savings_start_month}"
@@ -144,7 +144,7 @@
 		tcpIpApp.sntp.daylightSavings.stop.dayOfWeek.lastInMonth="0"
 	/>
 	<DIALPLAN
-		{if $polycom_emergency_customized == "true"}
+		{if $polycom_emergency_customized}
 			dialplan.routing.server.1.address="{$polycom_emergency_server}"
 			dialplan.routing.server.1.port="{$polycom_emergency_port}"
 				{foreach $polycom_emergency_number as $number name=emergencynumbers}
diff --git a/resources/templates/provision/polycom/vvx500/{$mac}.cfg b/resources/templates/provision/polycom/vvx500/{$mac}.cfg
index 4366bc871f..1abcee91f4 100644
--- a/resources/templates/provision/polycom/vvx500/{$mac}.cfg
+++ b/resources/templates/provision/polycom/vvx500/{$mac}.cfg
@@ -126,10 +126,10 @@
 		tcpIpApp.sntp.address="{$ntp_server_primary}"
 		tcpIpApp.sntp.gmtOffset.overrideDHCP="1"
 		tcpIpApp.sntp.gmtOffset="{$polycom_gmt_offset}"
-		{if $daylight_savings_enabled == "false"}
-		tcpIpApp.sntp.daylightSavings.enable="0"
-		{else}
+		{if $daylight_savings_enabled}
 		tcpIpApp.sntp.daylightSavings.enable="1"
+		{else}
+		tcpIpApp.sntp.daylightSavings.enable="0"
 		{/if}
 		tcpIpApp.sntp.daylightSavings.fixedDayEnable="0"
 		tcpIpApp.sntp.daylightSavings.start.month="{$daylight_savings_start_month}"
@@ -144,7 +144,7 @@
 		tcpIpApp.sntp.daylightSavings.stop.dayOfWeek.lastInMonth="0"
 	/>
 	<DIALPLAN
-		{if $polycom_emergency_customized == "true"}
+		{if $polycom_emergency_customized}
 			dialplan.routing.server.1.address="{$polycom_emergency_server}"
 			dialplan.routing.server.1.port="{$polycom_emergency_port}"
 				{foreach $polycom_emergency_number as $number name=emergencynumbers}
diff --git a/resources/templates/provision/polycom/vvx501/{$mac}.cfg b/resources/templates/provision/polycom/vvx501/{$mac}.cfg
index e5d1c269a9..de3d1e3c31 100644
--- a/resources/templates/provision/polycom/vvx501/{$mac}.cfg
+++ b/resources/templates/provision/polycom/vvx501/{$mac}.cfg
@@ -126,10 +126,10 @@
 		tcpIpApp.sntp.address="{$ntp_server_primary}"
 		tcpIpApp.sntp.gmtOffset.overrideDHCP="1"
 		tcpIpApp.sntp.gmtOffset="{$polycom_gmt_offset}"
-		{if $daylight_savings_enabled == "false"}
-		tcpIpApp.sntp.daylightSavings.enable="0"
-		{else}
+		{if $daylight_savings_enabled}
 		tcpIpApp.sntp.daylightSavings.enable="1"
+		{else}
+		tcpIpApp.sntp.daylightSavings.enable="0"
 		{/if}
 		tcpIpApp.sntp.daylightSavings.fixedDayEnable="0"
 		tcpIpApp.sntp.daylightSavings.start.month="{$daylight_savings_start_month}"
@@ -144,7 +144,7 @@
 		tcpIpApp.sntp.daylightSavings.stop.dayOfWeek.lastInMonth="0"
 	/>
 	<DIALPLAN
-		{if $polycom_emergency_customized == "true"}
+		{if $polycom_emergency_customized}
 			dialplan.routing.server.1.address="{$polycom_emergency_server}"
 			dialplan.routing.server.1.port="{$polycom_emergency_port}"
 				{foreach $polycom_emergency_number as $number name=emergencynumbers}
diff --git a/resources/templates/provision/polycom/vvx600/{$mac}.cfg b/resources/templates/provision/polycom/vvx600/{$mac}.cfg
index 5e2ed3a467..ecf5cff69f 100644
--- a/resources/templates/provision/polycom/vvx600/{$mac}.cfg
+++ b/resources/templates/provision/polycom/vvx600/{$mac}.cfg
@@ -126,10 +126,10 @@
 		tcpIpApp.sntp.address="{$ntp_server_primary}"
 		tcpIpApp.sntp.gmtOffset.overrideDHCP="1"
 		tcpIpApp.sntp.gmtOffset="{$polycom_gmt_offset}"
-		{if $daylight_savings_enabled == "false"}
-		tcpIpApp.sntp.daylightSavings.enable="0"
-		{else}
+		{if $daylight_savings_enabled}
 		tcpIpApp.sntp.daylightSavings.enable="1"
+		{else}
+		tcpIpApp.sntp.daylightSavings.enable="0"
 		{/if}
 		tcpIpApp.sntp.daylightSavings.fixedDayEnable="0"
 		tcpIpApp.sntp.daylightSavings.start.month="{$daylight_savings_start_month}"
@@ -144,7 +144,7 @@
 		tcpIpApp.sntp.daylightSavings.stop.dayOfWeek.lastInMonth="0"
 	/>
 	<DIALPLAN
-		{if $polycom_emergency_customized == "true"}
+		{if $polycom_emergency_customized}
 			dialplan.routing.server.1.address="{$polycom_emergency_server}"
 			dialplan.routing.server.1.port="{$polycom_emergency_port}"
 				{foreach $polycom_emergency_number as $number name=emergencynumbers}
diff --git a/resources/templates/provision/polycom/vvx601/{$mac}.cfg b/resources/templates/provision/polycom/vvx601/{$mac}.cfg
index abc587e777..4f9bfe1c4c 100644
--- a/resources/templates/provision/polycom/vvx601/{$mac}.cfg
+++ b/resources/templates/provision/polycom/vvx601/{$mac}.cfg
@@ -126,10 +126,10 @@
 		tcpIpApp.sntp.address="{$ntp_server_primary}"
 		tcpIpApp.sntp.gmtOffset.overrideDHCP="1"
 		tcpIpApp.sntp.gmtOffset="{$polycom_gmt_offset}"
-		{if $daylight_savings_enabled == "false"}
-		tcpIpApp.sntp.daylightSavings.enable="0"
-		{else}
+		{if $daylight_savings_enabled}
 		tcpIpApp.sntp.daylightSavings.enable="1"
+		{else}
+		tcpIpApp.sntp.daylightSavings.enable="0"
 		{/if}
 		tcpIpApp.sntp.daylightSavings.fixedDayEnable="0"
 		tcpIpApp.sntp.daylightSavings.start.month="{$daylight_savings_start_month}"
@@ -144,7 +144,7 @@
 		tcpIpApp.sntp.daylightSavings.stop.dayOfWeek.lastInMonth="0"
 	/>
 	<DIALPLAN
-		{if $polycom_emergency_customized == "true"}
+		{if $polycom_emergency_customized}
 			dialplan.routing.server.1.address="{$polycom_emergency_server}"
 			dialplan.routing.server.1.port="{$polycom_emergency_port}"
 				{foreach $polycom_emergency_number as $number name=emergencynumbers}