From ed3d33b851b8adb00915f01bea8bd4797779b306 Mon Sep 17 00:00:00 2001
From: Joe LeVeque <jolevequ@microsoft.com>
Date: Thu, 13 Jul 2017 01:02:55 +0000
Subject: [PATCH] Remove extra trailing newlines at EOF. Files now end with a
 single newline

---
 device/accton/x86_64-accton_as7512_32x-r0/plugins/eeprom.py     | 1 -
 .../x86_64-accton_as7712_32x-r0/Accton-AS7712-32X/sai.profile   | 1 -
 .../x86_64-accton_as7716_32x-r0/Accton-AS7716-32X/sai.profile   | 1 -
 device/arista/x86_64-arista_7050_qx32/plugins/led_control.py    | 1 -
 device/arista/x86_64-arista_7050_qx32s/plugins/led_control.py   | 1 -
 device/arista/x86_64-arista_7050_qx32s/sensors.conf             | 1 -
 device/arista/x86_64-arista_7060_cx32s/sensors.conf             | 1 -
 device/dell/x86_64-dell_z9100_c2538-r0/plugins/eeprom.py        | 1 -
 device/ingrasys/x86_64-ingrasys_s8900_54xc-r0/fancontrol        | 1 -
 device/ingrasys/x86_64-ingrasys_s8900_54xc-r0/plugins/eeprom.py | 1 -
 device/ingrasys/x86_64-ingrasys_s8900_64xc-r0/fancontrol        | 1 -
 device/ingrasys/x86_64-ingrasys_s8900_64xc-r0/plugins/eeprom.py | 1 -
 device/ingrasys/x86_64-ingrasys_s8900_64xc-r0/sensors.conf      | 1 -
 device/ingrasys/x86_64-ingrasys_s9100-r0/fancontrol             | 1 -
 device/mellanox/x86_64-mlnx_msn2100-r0/plugins/eeprom.py        | 1 -
 device/mellanox/x86_64-mlnx_msn2410-r0/plugins/eeprom.py        | 1 -
 device/mellanox/x86_64-mlnx_msn2700-r0/plugins/eeprom.py        | 1 -
 device/mellanox/x86_64-mlnx_msn2740-r0/plugins/eeprom.py        | 1 -
 dockers/docker-base/Dockerfile.j2                               | 1 -
 dockers/docker-base/LICENSE                                     | 1 -
 dockers/docker-base/etc/rsyslog.conf                            | 1 -
 dockers/docker-basic_router/Dockerfile                          | 1 -
 dockers/docker-basic_router/start.sh                            | 1 -
 dockers/docker-basic_router/supervisord.conf                    | 1 -
 dockers/docker-database/Dockerfile.j2                           | 1 -
 dockers/docker-database/base_image_files/redis-cli              | 1 -
 dockers/docker-database/supervisord.conf                        | 1 -
 dockers/docker-dhcp-relay/Dockerfile.j2                         | 1 -
 dockers/docker-dhcp-relay/isc-dhcp-relay.j2                     | 1 -
 dockers/docker-dhcp-relay/isc-dhcp-relay.sh                     | 1 -
 dockers/docker-dhcp-relay/start.sh                              | 1 -
 dockers/docker-dhcp-relay/supervisord.conf                      | 1 -
 dockers/docker-fpm-frr/config.sh                                | 1 -
 dockers/docker-fpm-gobgp/Dockerfile.j2                          | 1 -
 dockers/docker-fpm-gobgp/start.sh                               | 1 -
 dockers/docker-fpm-gobgp/supervisord.conf                       | 1 -
 dockers/docker-fpm-quagga/Dockerfile.j2                         | 1 -
 dockers/docker-fpm-quagga/start.sh                              | 1 -
 dockers/docker-fpm-quagga/supervisord.conf                      | 1 -
 dockers/docker-lldp-sv2/Dockerfile.j2                           | 1 -
 dockers/docker-lldp-sv2/start.sh                                | 1 -
 dockers/docker-lldp-sv2/supervisord.conf                        | 1 -
 dockers/docker-orchagent/Dockerfile.j2                          | 1 -
 dockers/docker-orchagent/orchagent.sh                           | 1 -
 dockers/docker-orchagent/swssconfig.sh                          | 1 -
 dockers/docker-platform-monitor/Dockerfile.j2                   | 1 -
 dockers/docker-platform-monitor/lm-sensors.sh                   | 1 -
 dockers/docker-platform-monitor/start.sh                        | 1 -
 dockers/docker-platform-monitor/supervisord.conf                | 1 -
 dockers/docker-saiserver-brcm/Dockerfile                        | 1 -
 dockers/docker-saiserver-brcm/start.sh                          | 1 -
 dockers/docker-saiserver-brcm/supervisord.conf                  | 1 -
 dockers/docker-saiserver-cavm/Dockerfile                        | 1 -
 dockers/docker-saiserver-cavm/start.sh                          | 1 -
 dockers/docker-saiserver-cavm/supervisord.conf                  | 1 -
 dockers/docker-saiserver-mlnx/Dockerfile                        | 1 -
 dockers/docker-saiserver-mlnx/start.sh                          | 1 -
 dockers/docker-saiserver-mlnx/supervisord.conf                  | 1 -
 dockers/docker-snmp-sv2/Dockerfile.j2                           | 1 -
 dockers/docker-snmp-sv2/start.sh                                | 1 -
 dockers/docker-snmp-sv2/supervisord.conf                        | 1 -
 dockers/docker-teamd/Dockerfile.j2                              | 1 -
 dockers/docker-teamd/base_image_files/teamdctl                  | 1 -
 dockers/docker-teamd/start.sh                                   | 1 -
 dockers/docker-teamd/supervisord.conf                           | 1 -
 dockers/docker-teamd/teamd.sh                                   | 1 -
 files/build_templates/docker_image_ctl.j2                       | 1 -
 files/build_templates/sonic_debian_extension.j2                 | 1 -
 files/dhcp/dhclient.conf                                        | 1 -
 files/dhcp/sethostname                                          | 1 -
 files/image_config/bash/bash.bashrc                             | 2 --
 files/image_config/cron.d/logrotate                             | 1 -
 files/image_config/interfaces/init_interfaces                   | 1 -
 files/image_config/interfaces/interfaces-config.service         | 1 -
 files/image_config/logrotate.d/rsyslog                          | 1 -
 files/image_config/ntp/ntp-config.service                       | 1 -
 files/image_config/rsyslog/rsyslog-config.service               | 1 -
 files/image_config/rsyslog/rsyslog.conf.j2                      | 1 -
 files/image_config/rsyslog/rsyslog.d/00-sonic.conf              | 1 -
 files/image_config/rsyslog/rsyslog.d/99-default.conf            | 1 -
 files/image_config/snmp/snmp.yml                                | 1 -
 files/image_config/sudoers/sudoers                              | 1 -
 files/image_config/systemd/journald.conf                        | 1 -
 files/image_config/updategraph/updategraph                      | 1 -
 platform/broadcom/docker-syncd-brcm-rpc/Dockerfile.j2           | 1 -
 platform/broadcom/docker-syncd-brcm.mk                          | 1 -
 platform/broadcom/docker-syncd-brcm/Dockerfile.j2               | 1 -
 platform/broadcom/docker-syncd-brcm/base_image_files/bcmcmd     | 1 -
 platform/broadcom/docker-syncd-brcm/start.sh                    | 1 -
 platform/broadcom/docker-syncd-brcm/supervisord.conf            | 1 -
 platform/cavium/cavm-platform-modules.mk                        | 1 -
 platform/cavium/cavm_platform_modules/Makefile                  | 1 -
 platform/cavium/docker-syncd-cavm/profile.ini                   | 1 -
 platform/cavium/docker-syncd-cavm/start.sh                      | 1 -
 platform/cavium/docker-syncd-cavm/supervisord.conf              | 1 -
 platform/cavium/rules.mk                                        | 1 -
 platform/centec/docker-syncd-centec-rpc/Dockerfile.j2           | 1 -
 platform/centec/docker-syncd-centec/Dockerfile.j2               | 1 -
 platform/centec/docker-syncd-centec/start.sh                    | 1 -
 platform/centec/docker-syncd-centec/supervisord.conf            | 1 -
 platform/generic/aboot-image.mk                                 | 1 -
 platform/mellanox/docker-syncd-mlnx-rpc/Dockerfile.j2           | 1 -
 platform/mellanox/docker-syncd-mlnx/Dockerfile.j2               | 1 -
 platform/mellanox/docker-syncd-mlnx/supervisord.conf            | 1 -
 platform/p4/docker-sonic-p4/rsyslog.conf                        | 1 -
 rules/docker-fpm-frr.mk                                         | 1 -
 rules/isc-dhcp.mk                                               | 1 -
 rules/python3.mk                                                | 1 -
 src/isc-dhcp/Makefile                                           | 1 -
 src/sonic-config-engine/openconfig_acl.py                       | 2 --
 src/sonic-config-engine/sonic-cfggen                            | 1 -
 src/sonic-config-engine/sonic_platform.py                       | 1 -
 src/sonic-device-data/src/debian/rules                          | 1 -
 src/supervisor/Makefile                                         | 1 -
 114 files changed, 116 deletions(-)

diff --git a/device/accton/x86_64-accton_as7512_32x-r0/plugins/eeprom.py b/device/accton/x86_64-accton_as7512_32x-r0/plugins/eeprom.py
index 26990541231f..6e2c0c8bb96f 100644
--- a/device/accton/x86_64-accton_as7512_32x-r0/plugins/eeprom.py
+++ b/device/accton/x86_64-accton_as7512_32x-r0/plugins/eeprom.py
@@ -30,4 +30,3 @@ class board(eeprom_tlvinfo.TlvInfoDecoder):
     def __init__(self, name, path, cpld_root, ro):
         self.eeprom_path = "/sys/bus/i2c/devices/1-0057/eeprom"
         super(board, self).__init__(self.eeprom_path, 0, '', True)
-
diff --git a/device/accton/x86_64-accton_as7712_32x-r0/Accton-AS7712-32X/sai.profile b/device/accton/x86_64-accton_as7712_32x-r0/Accton-AS7712-32X/sai.profile
index 5ed350f24d7f..dc74eef4d54b 100644
--- a/device/accton/x86_64-accton_as7712_32x-r0/Accton-AS7712-32X/sai.profile
+++ b/device/accton/x86_64-accton_as7712_32x-r0/Accton-AS7712-32X/sai.profile
@@ -1,2 +1 @@
 SAI_INIT_CONFIG_FILE=/etc/bcm/th-as7712-32x100G.config.bcm
-
diff --git a/device/accton/x86_64-accton_as7716_32x-r0/Accton-AS7716-32X/sai.profile b/device/accton/x86_64-accton_as7716_32x-r0/Accton-AS7716-32X/sai.profile
index fb1105b47f7a..de1e16b49544 100644
--- a/device/accton/x86_64-accton_as7716_32x-r0/Accton-AS7716-32X/sai.profile
+++ b/device/accton/x86_64-accton_as7716_32x-r0/Accton-AS7716-32X/sai.profile
@@ -1,2 +1 @@
 SAI_INIT_CONFIG_FILE=/etc/bcm/th-as7716-32x100G.config.bcm
-
diff --git a/device/arista/x86_64-arista_7050_qx32/plugins/led_control.py b/device/arista/x86_64-arista_7050_qx32/plugins/led_control.py
index b7eac3796723..1c69d8109f57 100644
--- a/device/arista/x86_64-arista_7050_qx32/plugins/led_control.py
+++ b/device/arista/x86_64-arista_7050_qx32/plugins/led_control.py
@@ -86,4 +86,3 @@ def __init__(self):
             led_sysfs_path = self.LED_SYSFS_PATH_NO_BREAKOUT.format(qsfp_index)
             with open(led_sysfs_path, 'w') as led_file:
                 led_file.write("%d" % self.LED_COLOR_OFF)
-
diff --git a/device/arista/x86_64-arista_7050_qx32s/plugins/led_control.py b/device/arista/x86_64-arista_7050_qx32s/plugins/led_control.py
index 582eaacbf918..839092ee1d4b 100644
--- a/device/arista/x86_64-arista_7050_qx32s/plugins/led_control.py
+++ b/device/arista/x86_64-arista_7050_qx32s/plugins/led_control.py
@@ -81,4 +81,3 @@ def __init__(self):
             led_sysfs_path = self.LED_SYSFS_PATH_NO_BREAKOUT.format(qsfp_index + self.LED_QSFP_OFFSET)
             with open(led_sysfs_path, 'w') as led_file:
                 led_file.write("%d" % self.LED_COLOR_OFF)
-
diff --git a/device/arista/x86_64-arista_7050_qx32s/sensors.conf b/device/arista/x86_64-arista_7050_qx32s/sensors.conf
index fc5f5c8c3e8e..cf4977f1cc12 100644
--- a/device/arista/x86_64-arista_7050_qx32s/sensors.conf
+++ b/device/arista/x86_64-arista_7050_qx32s/sensors.conf
@@ -46,4 +46,3 @@ chip "pmbus-i2c-5-58"
     label temp1 "Power supply 2 hotspot sensor"
     label temp2 "Power supply 2 inlet temp sensor"
     label temp3 "Power supply 2 sensor"
-
diff --git a/device/arista/x86_64-arista_7060_cx32s/sensors.conf b/device/arista/x86_64-arista_7060_cx32s/sensors.conf
index 3b4dd2385322..20ebbeb5bbc7 100644
--- a/device/arista/x86_64-arista_7060_cx32s/sensors.conf
+++ b/device/arista/x86_64-arista_7060_cx32s/sensors.conf
@@ -44,4 +44,3 @@ chip "pmbus-i2c-5-58"
     label temp1 "Power supply 2 hotspot sensor"
     label temp2 "Power supply 2 inlet temp sensor"
     label temp3 "Power supply 2 sensor"
-
diff --git a/device/dell/x86_64-dell_z9100_c2538-r0/plugins/eeprom.py b/device/dell/x86_64-dell_z9100_c2538-r0/plugins/eeprom.py
index 0e6b1bcfafcb..8d1d13f4b7cc 100644
--- a/device/dell/x86_64-dell_z9100_c2538-r0/plugins/eeprom.py
+++ b/device/dell/x86_64-dell_z9100_c2538-r0/plugins/eeprom.py
@@ -20,4 +20,3 @@ class board(eeprom_tlvinfo.TlvInfoDecoder):
     def __init__(self, name, path, cpld_root, ro):
         self.eeprom_path = "/sys/class/i2c-adapter/i2c-2/2-0050/eeprom"
         super(board, self).__init__(self.eeprom_path, 0, '', True)
-
diff --git a/device/ingrasys/x86_64-ingrasys_s8900_54xc-r0/fancontrol b/device/ingrasys/x86_64-ingrasys_s8900_54xc-r0/fancontrol
index 05a71e8d999c..827b0539546f 100644
--- a/device/ingrasys/x86_64-ingrasys_s8900_54xc-r0/fancontrol
+++ b/device/ingrasys/x86_64-ingrasys_s8900_54xc-r0/fancontrol
@@ -9,4 +9,3 @@ MINTEMP=hwmon2/device/pwm2=20 hwmon2/device/pwm1=20
 MAXTEMP=hwmon2/device/pwm2=60 hwmon2/device/pwm1=60
 MINSTART=hwmon2/device/pwm2=75 hwmon2/device/pwm1=75
 MINSTOP=hwmon2/device/pwm2=22 hwmon2/device/pwm1=22
-
diff --git a/device/ingrasys/x86_64-ingrasys_s8900_54xc-r0/plugins/eeprom.py b/device/ingrasys/x86_64-ingrasys_s8900_54xc-r0/plugins/eeprom.py
index 2013aeddddb4..414ff38221bf 100644
--- a/device/ingrasys/x86_64-ingrasys_s8900_54xc-r0/plugins/eeprom.py
+++ b/device/ingrasys/x86_64-ingrasys_s8900_54xc-r0/plugins/eeprom.py
@@ -20,4 +20,3 @@ class board(eeprom_tlvinfo.TlvInfoDecoder):
     def __init__(self, name, path, cpld_root, ro):
         self.eeprom_path = "/sys/class/i2c-adapter/i2c-17/17-0054/eeprom"
         super(board, self).__init__(self.eeprom_path, 0, '', True)
-
diff --git a/device/ingrasys/x86_64-ingrasys_s8900_64xc-r0/fancontrol b/device/ingrasys/x86_64-ingrasys_s8900_64xc-r0/fancontrol
index d5d5fa82b2d2..cb07a7a07f4a 100644
--- a/device/ingrasys/x86_64-ingrasys_s8900_64xc-r0/fancontrol
+++ b/device/ingrasys/x86_64-ingrasys_s8900_64xc-r0/fancontrol
@@ -8,4 +8,3 @@ MINTEMP=hwmon2/device/pwm1=20 hwmon2/device/pwm2=20
 MAXTEMP=hwmon2/device/pwm1=60 hwmon2/device/pwm2=60
 MINSTART=hwmon2/device/pwm1=150 hwmon2/device/pwm2=150
 MINSTOP=hwmon2/device/pwm1=0 hwmon2/device/pwm2=0
-
diff --git a/device/ingrasys/x86_64-ingrasys_s8900_64xc-r0/plugins/eeprom.py b/device/ingrasys/x86_64-ingrasys_s8900_64xc-r0/plugins/eeprom.py
index c23edf5e772e..1b8de3f16bca 100644
--- a/device/ingrasys/x86_64-ingrasys_s8900_64xc-r0/plugins/eeprom.py
+++ b/device/ingrasys/x86_64-ingrasys_s8900_64xc-r0/plugins/eeprom.py
@@ -20,4 +20,3 @@ class board(eeprom_tlvinfo.TlvInfoDecoder):
     def __init__(self, name, path, cpld_root, ro):
         self.eeprom_path = "/sys/class/i2c-adapter/i2c-7/7-0054/eeprom"
         super(board, self).__init__(self.eeprom_path, 0, '', True)
-
diff --git a/device/ingrasys/x86_64-ingrasys_s8900_64xc-r0/sensors.conf b/device/ingrasys/x86_64-ingrasys_s8900_64xc-r0/sensors.conf
index d4b5a7bd0c8a..374bd3a64f04 100644
--- a/device/ingrasys/x86_64-ingrasys_s8900_64xc-r0/sensors.conf
+++ b/device/ingrasys/x86_64-ingrasys_s8900_64xc-r0/sensors.conf
@@ -53,4 +53,3 @@ chip "tmp75-i2c-*-49"
     label temp1 "FAN Temp2"
     set temp1_max 50
     set temp1_crit 70
-
diff --git a/device/ingrasys/x86_64-ingrasys_s9100-r0/fancontrol b/device/ingrasys/x86_64-ingrasys_s9100-r0/fancontrol
index 05a71e8d999c..827b0539546f 100644
--- a/device/ingrasys/x86_64-ingrasys_s9100-r0/fancontrol
+++ b/device/ingrasys/x86_64-ingrasys_s9100-r0/fancontrol
@@ -9,4 +9,3 @@ MINTEMP=hwmon2/device/pwm2=20 hwmon2/device/pwm1=20
 MAXTEMP=hwmon2/device/pwm2=60 hwmon2/device/pwm1=60
 MINSTART=hwmon2/device/pwm2=75 hwmon2/device/pwm1=75
 MINSTOP=hwmon2/device/pwm2=22 hwmon2/device/pwm1=22
-
diff --git a/device/mellanox/x86_64-mlnx_msn2100-r0/plugins/eeprom.py b/device/mellanox/x86_64-mlnx_msn2100-r0/plugins/eeprom.py
index d792d1770367..3650d9c8b70b 100644
--- a/device/mellanox/x86_64-mlnx_msn2100-r0/plugins/eeprom.py
+++ b/device/mellanox/x86_64-mlnx_msn2100-r0/plugins/eeprom.py
@@ -30,4 +30,3 @@ class board(eeprom_tlvinfo.TlvInfoDecoder):
     def __init__(self, name, path, cpld_root, ro):
         self.eeprom_path = "/bsp/eeprom/sys_eeprom"
         super(board, self).__init__(self.eeprom_path, 0, '', True)
-
diff --git a/device/mellanox/x86_64-mlnx_msn2410-r0/plugins/eeprom.py b/device/mellanox/x86_64-mlnx_msn2410-r0/plugins/eeprom.py
index d792d1770367..3650d9c8b70b 100644
--- a/device/mellanox/x86_64-mlnx_msn2410-r0/plugins/eeprom.py
+++ b/device/mellanox/x86_64-mlnx_msn2410-r0/plugins/eeprom.py
@@ -30,4 +30,3 @@ class board(eeprom_tlvinfo.TlvInfoDecoder):
     def __init__(self, name, path, cpld_root, ro):
         self.eeprom_path = "/bsp/eeprom/sys_eeprom"
         super(board, self).__init__(self.eeprom_path, 0, '', True)
-
diff --git a/device/mellanox/x86_64-mlnx_msn2700-r0/plugins/eeprom.py b/device/mellanox/x86_64-mlnx_msn2700-r0/plugins/eeprom.py
index d792d1770367..3650d9c8b70b 100644
--- a/device/mellanox/x86_64-mlnx_msn2700-r0/plugins/eeprom.py
+++ b/device/mellanox/x86_64-mlnx_msn2700-r0/plugins/eeprom.py
@@ -30,4 +30,3 @@ class board(eeprom_tlvinfo.TlvInfoDecoder):
     def __init__(self, name, path, cpld_root, ro):
         self.eeprom_path = "/bsp/eeprom/sys_eeprom"
         super(board, self).__init__(self.eeprom_path, 0, '', True)
-
diff --git a/device/mellanox/x86_64-mlnx_msn2740-r0/plugins/eeprom.py b/device/mellanox/x86_64-mlnx_msn2740-r0/plugins/eeprom.py
index d792d1770367..3650d9c8b70b 100644
--- a/device/mellanox/x86_64-mlnx_msn2740-r0/plugins/eeprom.py
+++ b/device/mellanox/x86_64-mlnx_msn2740-r0/plugins/eeprom.py
@@ -30,4 +30,3 @@ class board(eeprom_tlvinfo.TlvInfoDecoder):
     def __init__(self, name, path, cpld_root, ro):
         self.eeprom_path = "/bsp/eeprom/sys_eeprom"
         super(board, self).__init__(self.eeprom_path, 0, '', True)
-
diff --git a/dockers/docker-base/Dockerfile.j2 b/dockers/docker-base/Dockerfile.j2
index 18761f3caacd..ff52cf88e7d3 100644
--- a/dockers/docker-base/Dockerfile.j2
+++ b/dockers/docker-base/Dockerfile.j2
@@ -75,4 +75,3 @@ RUN apt-get clean -y; apt-get autoclean -y; apt-get autoremove -y
 RUN rm -rf /var/lib/apt/lists/*
 
 RUN rm -rf /tmp/*
-
diff --git a/dockers/docker-base/LICENSE b/dockers/docker-base/LICENSE
index 1d7131f729e9..03d8f31e513c 100644
--- a/dockers/docker-base/LICENSE
+++ b/dockers/docker-base/LICENSE
@@ -11,4 +11,3 @@ distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
-
diff --git a/dockers/docker-base/etc/rsyslog.conf b/dockers/docker-base/etc/rsyslog.conf
index 1132ad55ec3c..8cd8928e2b14 100644
--- a/dockers/docker-base/etc/rsyslog.conf
+++ b/dockers/docker-base/etc/rsyslog.conf
@@ -65,4 +65,3 @@ $IncludeConfig /etc/rsyslog.d/*.conf
 ###############
 #### RULES ####
 ###############
-
diff --git a/dockers/docker-basic_router/Dockerfile b/dockers/docker-basic_router/Dockerfile
index fa8fbd496172..7d7c724920c2 100644
--- a/dockers/docker-basic_router/Dockerfile
+++ b/dockers/docker-basic_router/Dockerfile
@@ -20,4 +20,3 @@ COPY ["start.sh", "/usr/bin/"]
 COPY ["supervisord.conf", "/etc/supervisor/conf.d/"]
 
 ENTRYPOINT ["/usr/bin/supervisord"]
-
diff --git a/dockers/docker-basic_router/start.sh b/dockers/docker-basic_router/start.sh
index 925076231ccf..a4d378ef77d9 100755
--- a/dockers/docker-basic_router/start.sh
+++ b/dockers/docker-basic_router/start.sh
@@ -3,4 +3,3 @@
 rm -f /var/run/rsyslogd.pid
 
 supervisorctl start rsyslogd
-
diff --git a/dockers/docker-basic_router/supervisord.conf b/dockers/docker-basic_router/supervisord.conf
index 76f9a1968786..bfa84fdcdfb5 100644
--- a/dockers/docker-basic_router/supervisord.conf
+++ b/dockers/docker-basic_router/supervisord.conf
@@ -18,4 +18,3 @@ autostart=false
 autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
-
diff --git a/dockers/docker-database/Dockerfile.j2 b/dockers/docker-database/Dockerfile.j2
index 1049f5bf1bfe..8397a3acfd22 100644
--- a/dockers/docker-database/Dockerfile.j2
+++ b/dockers/docker-database/Dockerfile.j2
@@ -35,4 +35,3 @@ RUN sed -ri 's/^(save .*$)/# \1/g;
 COPY ["supervisord.conf", "/etc/supervisor/conf.d/"]
 
 ENTRYPOINT ["/usr/bin/supervisord"]
-
diff --git a/dockers/docker-database/base_image_files/redis-cli b/dockers/docker-database/base_image_files/redis-cli
index 646992f65abd..103dd9e02536 100755
--- a/dockers/docker-database/base_image_files/redis-cli
+++ b/dockers/docker-database/base_image_files/redis-cli
@@ -1,4 +1,3 @@
 #!/bin/bash
 
 docker exec -it database redis-cli "$@"
-
diff --git a/dockers/docker-database/supervisord.conf b/dockers/docker-database/supervisord.conf
index 2c78d9c39311..8f90e1ed6285 100644
--- a/dockers/docker-database/supervisord.conf
+++ b/dockers/docker-database/supervisord.conf
@@ -10,4 +10,3 @@ autostart=true
 autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
-
diff --git a/dockers/docker-dhcp-relay/Dockerfile.j2 b/dockers/docker-dhcp-relay/Dockerfile.j2
index 1a7b7854d554..a7e1a1cffb9d 100644
--- a/dockers/docker-dhcp-relay/Dockerfile.j2
+++ b/dockers/docker-dhcp-relay/Dockerfile.j2
@@ -27,4 +27,3 @@ COPY ["supervisord.conf", "/etc/supervisor/conf.d/"]
 COPY ["isc-dhcp-relay.j2", "/usr/share/sonic/templates/"]
 
 ENTRYPOINT ["/usr/bin/supervisord"]
-
diff --git a/dockers/docker-dhcp-relay/isc-dhcp-relay.j2 b/dockers/docker-dhcp-relay/isc-dhcp-relay.j2
index 3b76073fa8c6..1c50b685ebda 100644
--- a/dockers/docker-dhcp-relay/isc-dhcp-relay.j2
+++ b/dockers/docker-dhcp-relay/isc-dhcp-relay.j2
@@ -26,4 +26,3 @@ INTERFACES="
 
 # '-a' option provides option 82 circuit_id and remote_id information
 OPTIONS="-a %h:%p %P"
-
diff --git a/dockers/docker-dhcp-relay/isc-dhcp-relay.sh b/dockers/docker-dhcp-relay/isc-dhcp-relay.sh
index 07efa351578f..2224b8a0fe00 100755
--- a/dockers/docker-dhcp-relay/isc-dhcp-relay.sh
+++ b/dockers/docker-dhcp-relay/isc-dhcp-relay.sh
@@ -16,4 +16,3 @@ if test "$INTERFACES" != ""; then
 fi
 
 exec /usr/sbin/dhcrelay -d -q ${OPTIONS} ${IFCMD} ${SERVERS}
-
diff --git a/dockers/docker-dhcp-relay/start.sh b/dockers/docker-dhcp-relay/start.sh
index a847428ffba6..5c2e9de09703 100755
--- a/dockers/docker-dhcp-relay/start.sh
+++ b/dockers/docker-dhcp-relay/start.sh
@@ -40,4 +40,3 @@ done
 
 # Start the DHCP relay
 supervisorctl start isc-dhcp-relay
-
diff --git a/dockers/docker-dhcp-relay/supervisord.conf b/dockers/docker-dhcp-relay/supervisord.conf
index 512762f2a5b4..ed1f75d1aed6 100644
--- a/dockers/docker-dhcp-relay/supervisord.conf
+++ b/dockers/docker-dhcp-relay/supervisord.conf
@@ -26,4 +26,3 @@ autostart=false
 autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
-
diff --git a/dockers/docker-fpm-frr/config.sh b/dockers/docker-fpm-frr/config.sh
index a57cba3cb46a..d795bcefa701 100755
--- a/dockers/docker-fpm-frr/config.sh
+++ b/dockers/docker-fpm-frr/config.sh
@@ -14,4 +14,3 @@ chmod 0755 /usr/sbin/bgp-unisolate
 
 mkdir -p /var/sonic
 echo "# Config files managed by sonic-config-engine" >/var/sonic/config_status
-
diff --git a/dockers/docker-fpm-gobgp/Dockerfile.j2 b/dockers/docker-fpm-gobgp/Dockerfile.j2
index 64877ee9286d..1e333d9026c0 100644
--- a/dockers/docker-fpm-gobgp/Dockerfile.j2
+++ b/dockers/docker-fpm-gobgp/Dockerfile.j2
@@ -26,4 +26,3 @@ COPY ["*.j2", "/usr/share/sonic/templates/"]
 COPY ["daemons", "/etc/quagga/"]
 
 ENTRYPOINT ["/usr/bin/supervisord"]
-
diff --git a/dockers/docker-fpm-gobgp/start.sh b/dockers/docker-fpm-gobgp/start.sh
index 25b26179bb58..636fceea0cbd 100755
--- a/dockers/docker-fpm-gobgp/start.sh
+++ b/dockers/docker-fpm-gobgp/start.sh
@@ -23,4 +23,3 @@ supervisorctl start rsyslogd
 service quagga start
 
 supervisorctl start fpmsyncd
-
diff --git a/dockers/docker-fpm-gobgp/supervisord.conf b/dockers/docker-fpm-gobgp/supervisord.conf
index 34fca6756821..4e635f4093d4 100644
--- a/dockers/docker-fpm-gobgp/supervisord.conf
+++ b/dockers/docker-fpm-gobgp/supervisord.conf
@@ -34,4 +34,3 @@ autostart=false
 autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
-
diff --git a/dockers/docker-fpm-quagga/Dockerfile.j2 b/dockers/docker-fpm-quagga/Dockerfile.j2
index 2a7268a0019e..ffced8161a5b 100644
--- a/dockers/docker-fpm-quagga/Dockerfile.j2
+++ b/dockers/docker-fpm-quagga/Dockerfile.j2
@@ -28,4 +28,3 @@ COPY ["*.j2", "/usr/share/sonic/templates/"]
 COPY ["daemons", "/etc/quagga/"]
 
 ENTRYPOINT ["/usr/bin/supervisord"]
-
diff --git a/dockers/docker-fpm-quagga/start.sh b/dockers/docker-fpm-quagga/start.sh
index c7df6f20999d..a72a96425f66 100755
--- a/dockers/docker-fpm-quagga/start.sh
+++ b/dockers/docker-fpm-quagga/start.sh
@@ -27,4 +27,3 @@ supervisorctl start rsyslogd
 service quagga start
 
 supervisorctl start fpmsyncd
-
diff --git a/dockers/docker-fpm-quagga/supervisord.conf b/dockers/docker-fpm-quagga/supervisord.conf
index db069bd93787..f2c9bdce7e6d 100644
--- a/dockers/docker-fpm-quagga/supervisord.conf
+++ b/dockers/docker-fpm-quagga/supervisord.conf
@@ -26,4 +26,3 @@ autostart=false
 autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
-
diff --git a/dockers/docker-lldp-sv2/Dockerfile.j2 b/dockers/docker-lldp-sv2/Dockerfile.j2
index 84002f37e7ee..158d5b52ffe7 100644
--- a/dockers/docker-lldp-sv2/Dockerfile.j2
+++ b/dockers/docker-lldp-sv2/Dockerfile.j2
@@ -35,4 +35,3 @@ COPY ["lldpd.conf.j2", "/usr/share/sonic/templates/"]
 COPY ["lldpd", "/etc/default/"]
 
 ENTRYPOINT ["/usr/bin/supervisord"]
-
diff --git a/dockers/docker-lldp-sv2/start.sh b/dockers/docker-lldp-sv2/start.sh
index ea3b7f45175c..63c8d32c34e6 100755
--- a/dockers/docker-lldp-sv2/start.sh
+++ b/dockers/docker-lldp-sv2/start.sh
@@ -11,4 +11,3 @@ supervisorctl start rsyslogd
 supervisorctl start lldpd
 supervisorctl start lldpd-conf-reload
 supervisorctl start lldp-syncd
-
diff --git a/dockers/docker-lldp-sv2/supervisord.conf b/dockers/docker-lldp-sv2/supervisord.conf
index dcac7a8645f5..505b72d18227 100644
--- a/dockers/docker-lldp-sv2/supervisord.conf
+++ b/dockers/docker-lldp-sv2/supervisord.conf
@@ -47,4 +47,3 @@ autostart=false
 autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
-
diff --git a/dockers/docker-orchagent/Dockerfile.j2 b/dockers/docker-orchagent/Dockerfile.j2
index e4e155163076..73fb087401ab 100755
--- a/dockers/docker-orchagent/Dockerfile.j2
+++ b/dockers/docker-orchagent/Dockerfile.j2
@@ -32,4 +32,3 @@ COPY ["ipinip.json.j2", "/usr/share/sonic/templates/"]
 COPY ["mirror.json.j2", "/usr/share/sonic/templates/"]
 
 ENTRYPOINT ["/usr/bin/supervisord"]
-
diff --git a/dockers/docker-orchagent/orchagent.sh b/dockers/docker-orchagent/orchagent.sh
index 01b980b99c1a..8dc1b859ee25 100755
--- a/dockers/docker-orchagent/orchagent.sh
+++ b/dockers/docker-orchagent/orchagent.sh
@@ -19,4 +19,3 @@ elif [ "$ASIC" == "cavium" ]; then
 fi
 
 exec /usr/bin/orchagent ${ORCHAGENT_ARGS}
-
diff --git a/dockers/docker-orchagent/swssconfig.sh b/dockers/docker-orchagent/swssconfig.sh
index 301a0ff4f351..768417779e2d 100755
--- a/dockers/docker-orchagent/swssconfig.sh
+++ b/dockers/docker-orchagent/swssconfig.sh
@@ -58,4 +58,3 @@ for file in $SWSSCONFIG_ARGS; do
 done
 
 config_acl
-
diff --git a/dockers/docker-platform-monitor/Dockerfile.j2 b/dockers/docker-platform-monitor/Dockerfile.j2
index 423181a3c589..b6406b3e3a6a 100755
--- a/dockers/docker-platform-monitor/Dockerfile.j2
+++ b/dockers/docker-platform-monitor/Dockerfile.j2
@@ -59,4 +59,3 @@ COPY ["start.sh", "lm-sensors.sh", "/usr/bin/"]
 COPY ["supervisord.conf", "/etc/supervisor/conf.d/"]
 
 ENTRYPOINT ["/usr/bin/supervisord"]
-
diff --git a/dockers/docker-platform-monitor/lm-sensors.sh b/dockers/docker-platform-monitor/lm-sensors.sh
index 1eafc81eeb63..61e90c09a8e3 100755
--- a/dockers/docker-platform-monitor/lm-sensors.sh
+++ b/dockers/docker-platform-monitor/lm-sensors.sh
@@ -9,4 +9,3 @@
 # Currently, there is no way to run sensord in the foreground, so we
 # can't use supervisord. Instead, we just start the service for now.
 service sensord start
-
diff --git a/dockers/docker-platform-monitor/start.sh b/dockers/docker-platform-monitor/start.sh
index cfcf17e4a192..fb87083f5cc6 100755
--- a/dockers/docker-platform-monitor/start.sh
+++ b/dockers/docker-platform-monitor/start.sh
@@ -23,4 +23,3 @@ if [ -e /usr/share/sonic/platform/fancontrol ]; then
 fi
 
 supervisorctl start ledd
-
diff --git a/dockers/docker-platform-monitor/supervisord.conf b/dockers/docker-platform-monitor/supervisord.conf
index 2753dceb652d..6fb73450afec 100644
--- a/dockers/docker-platform-monitor/supervisord.conf
+++ b/dockers/docker-platform-monitor/supervisord.conf
@@ -41,4 +41,3 @@ priority=5
 autostart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
-
diff --git a/dockers/docker-saiserver-brcm/Dockerfile b/dockers/docker-saiserver-brcm/Dockerfile
index 3a839a7a6df0..a3088e7ffabd 100755
--- a/dockers/docker-saiserver-brcm/Dockerfile
+++ b/dockers/docker-saiserver-brcm/Dockerfile
@@ -25,4 +25,3 @@ COPY ["profile.ini", "portmap.ini", "/etc/sai/"]
 RUN apt-get clean -y; apt-get autoclean -y; apt-get autoremove -y; rm -rf /deps
 
 ENTRYPOINT ["/usr/bin/supervisord"]
-
diff --git a/dockers/docker-saiserver-brcm/start.sh b/dockers/docker-saiserver-brcm/start.sh
index f023775f0674..494c0e9126c2 100755
--- a/dockers/docker-saiserver-brcm/start.sh
+++ b/dockers/docker-saiserver-brcm/start.sh
@@ -15,4 +15,3 @@ supervisorctl start rsyslogd
 start_bcm
 
 supervisorctl start saiserver
-
diff --git a/dockers/docker-saiserver-brcm/supervisord.conf b/dockers/docker-saiserver-brcm/supervisord.conf
index e09ac3cbb449..cb67a0fc9a47 100644
--- a/dockers/docker-saiserver-brcm/supervisord.conf
+++ b/dockers/docker-saiserver-brcm/supervisord.conf
@@ -26,4 +26,3 @@ autostart=false
 autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
-
diff --git a/dockers/docker-saiserver-cavm/Dockerfile b/dockers/docker-saiserver-cavm/Dockerfile
index 9203690ad02a..2f667c8038ed 100644
--- a/dockers/docker-saiserver-cavm/Dockerfile
+++ b/dockers/docker-saiserver-cavm/Dockerfile
@@ -28,4 +28,3 @@ RUN apt-get clean -y; apt-get autoclean -y; apt-get autoremove -y
 RUN rm -rf deps
 
 ENTRYPOINT ["/usr/bin/supervisord"]
-
diff --git a/dockers/docker-saiserver-cavm/start.sh b/dockers/docker-saiserver-cavm/start.sh
index 16457d13e03a..09cc0ddb5416 100755
--- a/dockers/docker-saiserver-cavm/start.sh
+++ b/dockers/docker-saiserver-cavm/start.sh
@@ -5,4 +5,3 @@ rm -f /var/run/rsyslogd.pid
 supervisorctl start rsyslogd
 
 supervisorctl start saiserver
-
diff --git a/dockers/docker-saiserver-cavm/supervisord.conf b/dockers/docker-saiserver-cavm/supervisord.conf
index e09ac3cbb449..cb67a0fc9a47 100644
--- a/dockers/docker-saiserver-cavm/supervisord.conf
+++ b/dockers/docker-saiserver-cavm/supervisord.conf
@@ -26,4 +26,3 @@ autostart=false
 autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
-
diff --git a/dockers/docker-saiserver-mlnx/Dockerfile b/dockers/docker-saiserver-mlnx/Dockerfile
index 39d0fa176987..f908c05742e3 100755
--- a/dockers/docker-saiserver-mlnx/Dockerfile
+++ b/dockers/docker-saiserver-mlnx/Dockerfile
@@ -36,4 +36,3 @@ RUN apt-get clean -y; apt-get autoclean -y; apt-get autoremove -y
 RUN rm -rf /deps
 
 ENTRYPOINT ["/usr/bin/supervisord"]
-
diff --git a/dockers/docker-saiserver-mlnx/start.sh b/dockers/docker-saiserver-mlnx/start.sh
index 57ee5036ded3..58a0c316add3 100755
--- a/dockers/docker-saiserver-mlnx/start.sh
+++ b/dockers/docker-saiserver-mlnx/start.sh
@@ -13,4 +13,3 @@ supervisorctl start rsyslogd
 start_mlnx
 
 supervisorctl start saiserver
-
diff --git a/dockers/docker-saiserver-mlnx/supervisord.conf b/dockers/docker-saiserver-mlnx/supervisord.conf
index e09ac3cbb449..cb67a0fc9a47 100644
--- a/dockers/docker-saiserver-mlnx/supervisord.conf
+++ b/dockers/docker-saiserver-mlnx/supervisord.conf
@@ -26,4 +26,3 @@ autostart=false
 autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
-
diff --git a/dockers/docker-snmp-sv2/Dockerfile.j2 b/dockers/docker-snmp-sv2/Dockerfile.j2
index 73f5c257a5c4..2ab867031874 100644
--- a/dockers/docker-snmp-sv2/Dockerfile.j2
+++ b/dockers/docker-snmp-sv2/Dockerfile.j2
@@ -47,4 +47,3 @@ COPY ["*.j2", "/usr/share/sonic/templates/"]
 EXPOSE 161/udp 162/udp
 
 ENTRYPOINT ["/usr/bin/supervisord"]
-
diff --git a/dockers/docker-snmp-sv2/start.sh b/dockers/docker-snmp-sv2/start.sh
index 7e178351b159..ffbe8f196722 100755
--- a/dockers/docker-snmp-sv2/start.sh
+++ b/dockers/docker-snmp-sv2/start.sh
@@ -15,4 +15,3 @@ rm -f /var/run/rsyslogd.pid
 supervisorctl start rsyslogd
 supervisorctl start snmpd
 supervisorctl start snmp-subagent
-
diff --git a/dockers/docker-snmp-sv2/supervisord.conf b/dockers/docker-snmp-sv2/supervisord.conf
index 6c3685b32cdb..60313c57f813 100644
--- a/dockers/docker-snmp-sv2/supervisord.conf
+++ b/dockers/docker-snmp-sv2/supervisord.conf
@@ -34,4 +34,3 @@ autostart=false
 autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
-
diff --git a/dockers/docker-teamd/Dockerfile.j2 b/dockers/docker-teamd/Dockerfile.j2
index 73de6bd47a78..f604433a6c3f 100644
--- a/dockers/docker-teamd/Dockerfile.j2
+++ b/dockers/docker-teamd/Dockerfile.j2
@@ -30,4 +30,3 @@ RUN apt-get clean -y; apt-get autoclean -y; apt-get autoremove -y
 RUN rm -rf /debs
 
 ENTRYPOINT ["/usr/bin/supervisord"]
-
diff --git a/dockers/docker-teamd/base_image_files/teamdctl b/dockers/docker-teamd/base_image_files/teamdctl
index c7f59d321454..9dd188d18cba 100755
--- a/dockers/docker-teamd/base_image_files/teamdctl
+++ b/dockers/docker-teamd/base_image_files/teamdctl
@@ -1,4 +1,3 @@
 #!/bin/bash
 
 docker exec -i teamd teamdctl "$@"
-
diff --git a/dockers/docker-teamd/start.sh b/dockers/docker-teamd/start.sh
index 0f6a8c9f9ceb..fe4bfe1c584f 100755
--- a/dockers/docker-teamd/start.sh
+++ b/dockers/docker-teamd/start.sh
@@ -27,4 +27,3 @@ rm -f /var/run/rsyslogd.pid
 supervisorctl start rsyslogd
 
 supervisorctl start teamd
-
diff --git a/dockers/docker-teamd/supervisord.conf b/dockers/docker-teamd/supervisord.conf
index 2db52ebd073f..48ef0ca9f29e 100644
--- a/dockers/docker-teamd/supervisord.conf
+++ b/dockers/docker-teamd/supervisord.conf
@@ -26,4 +26,3 @@ autostart=false
 autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
-
diff --git a/dockers/docker-teamd/teamd.sh b/dockers/docker-teamd/teamd.sh
index 2c7c716b00b7..37b617150a04 100755
--- a/dockers/docker-teamd/teamd.sh
+++ b/dockers/docker-teamd/teamd.sh
@@ -36,4 +36,3 @@ while true; do
     fi
     sleep 1
 done
-
diff --git a/files/build_templates/docker_image_ctl.j2 b/files/build_templates/docker_image_ctl.j2
index 9a1f79c4ed5a..3ae3acaed33b 100644
--- a/files/build_templates/docker_image_ctl.j2
+++ b/files/build_templates/docker_image_ctl.j2
@@ -38,4 +38,3 @@ case "$1" in
         exit 1
         ;;
 esac
-
diff --git a/files/build_templates/sonic_debian_extension.j2 b/files/build_templates/sonic_debian_extension.j2
index 647a73b5ce1c..77c5457327cc 100644
--- a/files/build_templates/sonic_debian_extension.j2
+++ b/files/build_templates/sonic_debian_extension.j2
@@ -221,4 +221,3 @@ sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get autor
 sudo cp {{src}} $FILESYSTEM_ROOT/{{dst}}
 {% endif -%}
 {% endfor -%}
-
diff --git a/files/dhcp/dhclient.conf b/files/dhcp/dhclient.conf
index 363a67b50f9e..6a542e069fab 100644
--- a/files/dhcp/dhclient.conf
+++ b/files/dhcp/dhclient.conf
@@ -22,4 +22,3 @@ request subnet-mask, broadcast-address, time-offset, routers,
         dhcp6.name-servers, dhcp6.domain-search, interface-mtu,
         rfc3442-classless-static-routes, ntp-servers, 
         snmp-community, minigraph-url, acl-url;
-
diff --git a/files/dhcp/sethostname b/files/dhcp/sethostname
index 57f96ce63612..8cef73239455 100644
--- a/files/dhcp/sethostname
+++ b/files/dhcp/sethostname
@@ -10,4 +10,3 @@ case $reason in
         fi
         ;;
 esac
-
diff --git a/files/image_config/bash/bash.bashrc b/files/image_config/bash/bash.bashrc
index b531c88a0601..f59cc1bf6470 100644
--- a/files/image_config/bash/bash.bashrc
+++ b/files/image_config/bash/bash.bashrc
@@ -53,5 +53,3 @@ if [ -x /usr/lib/command-not-found -o -x /usr/share/command-not-found/command-no
         fi
     }
 fi
-
-
diff --git a/files/image_config/cron.d/logrotate b/files/image_config/cron.d/logrotate
index 877e0cb6d5d7..9e1335cbd43e 100644
--- a/files/image_config/cron.d/logrotate
+++ b/files/image_config/cron.d/logrotate
@@ -1,3 +1,2 @@
 # Attempt to rotate system logs once per minute
 * * * * * root /usr/sbin/logrotate /etc/logrotate.d/rsyslog
-
diff --git a/files/image_config/interfaces/init_interfaces b/files/image_config/interfaces/init_interfaces
index b13a36df47f8..e0bbad746a4a 100644
--- a/files/image_config/interfaces/init_interfaces
+++ b/files/image_config/interfaces/init_interfaces
@@ -8,4 +8,3 @@ iface lo inet loopback
 # The management network interface
 auto eth0
 iface eth0 inet dhcp
-
diff --git a/files/image_config/interfaces/interfaces-config.service b/files/image_config/interfaces/interfaces-config.service
index 92a82aeee0b8..0cc7f2981505 100644
--- a/files/image_config/interfaces/interfaces-config.service
+++ b/files/image_config/interfaces/interfaces-config.service
@@ -8,4 +8,3 @@ ExecStart=/usr/bin/interfaces-config.sh
 
 [Install]
 WantedBy=multi-user.target
-
diff --git a/files/image_config/logrotate.d/rsyslog b/files/image_config/logrotate.d/rsyslog
index 4693288f18cc..5101b0e41fd2 100644
--- a/files/image_config/logrotate.d/rsyslog
+++ b/files/image_config/logrotate.d/rsyslog
@@ -60,4 +60,3 @@
         kill -HUP $(cat /var/run/rsyslogd.pid)
     endscript
 }
-
diff --git a/files/image_config/ntp/ntp-config.service b/files/image_config/ntp/ntp-config.service
index 5cfcc72f328d..948e7f4953c8 100644
--- a/files/image_config/ntp/ntp-config.service
+++ b/files/image_config/ntp/ntp-config.service
@@ -8,4 +8,3 @@ ExecStart=/usr/bin/ntp-config.sh
 
 [Install]
 WantedBy=multi-user.target
-
diff --git a/files/image_config/rsyslog/rsyslog-config.service b/files/image_config/rsyslog/rsyslog-config.service
index 37f7bc04c650..ad72e9c2ea9a 100644
--- a/files/image_config/rsyslog/rsyslog-config.service
+++ b/files/image_config/rsyslog/rsyslog-config.service
@@ -8,4 +8,3 @@ ExecStart=/usr/bin/rsyslog-config.sh
 
 [Install]
 WantedBy=multi-user.target
-
diff --git a/files/image_config/rsyslog/rsyslog.conf.j2 b/files/image_config/rsyslog/rsyslog.conf.j2
index 008f9f10e6f0..54e2eec3f999 100644
--- a/files/image_config/rsyslog/rsyslog.conf.j2
+++ b/files/image_config/rsyslog/rsyslog.conf.j2
@@ -68,4 +68,3 @@ $IncludeConfig /etc/rsyslog.d/*.conf
 ###############
 #### RULES ####
 ###############
-
diff --git a/files/image_config/rsyslog/rsyslog.d/00-sonic.conf b/files/image_config/rsyslog/rsyslog.d/00-sonic.conf
index 20d18e5d226d..bc0bbbaf1e61 100644
--- a/files/image_config/rsyslog/rsyslog.d/00-sonic.conf
+++ b/files/image_config/rsyslog/rsyslog.d/00-sonic.conf
@@ -19,4 +19,3 @@ if $programname contains "teamd_" then {
     /var/log/teamd.log
     stop
 }
-
diff --git a/files/image_config/rsyslog/rsyslog.d/99-default.conf b/files/image_config/rsyslog/rsyslog.d/99-default.conf
index cfb1e1d3b881..51049e7473a8 100644
--- a/files/image_config/rsyslog/rsyslog.d/99-default.conf
+++ b/files/image_config/rsyslog/rsyslog.d/99-default.conf
@@ -68,4 +68,3 @@ daemon.*;mail.*;\
         news.err;\
         *.=debug;*.=info;\
         *.=notice;*.=warn       |/dev/xconsole
-
diff --git a/files/image_config/snmp/snmp.yml b/files/image_config/snmp/snmp.yml
index 86f76c3a5cc3..117619975fbb 100644
--- a/files/image_config/snmp/snmp.yml
+++ b/files/image_config/snmp/snmp.yml
@@ -1,3 +1,2 @@
 snmp_rocommunity: public
 snmp_location: public
-
diff --git a/files/image_config/sudoers/sudoers b/files/image_config/sudoers/sudoers
index de62c7dd446b..cfff38b5027d 100644
--- a/files/image_config/sudoers/sudoers
+++ b/files/image_config/sudoers/sudoers
@@ -40,4 +40,3 @@ root    ALL=(ALL:ALL) ALL
 # See sudoers(5) for more information on "#include" directives:
 
 #includedir /etc/sudoers.d
-
diff --git a/files/image_config/systemd/journald.conf b/files/image_config/systemd/journald.conf
index c32fbae57051..0f3d1b5ec25b 100644
--- a/files/image_config/systemd/journald.conf
+++ b/files/image_config/systemd/journald.conf
@@ -33,4 +33,3 @@ RuntimeMaxUse=50M
 #MaxLevelKMsg=notice
 #MaxLevelConsole=info
 #MaxLevelWall=emerg
-
diff --git a/files/image_config/updategraph/updategraph b/files/image_config/updategraph/updategraph
index a46a5f73a0cf..7240d913c76d 100755
--- a/files/image_config/updategraph/updategraph
+++ b/files/image_config/updategraph/updategraph
@@ -86,4 +86,3 @@ if [ -n "$ACL_URL" ]; then
 else
     echo "Skip ACL config download."
 fi
-
diff --git a/platform/broadcom/docker-syncd-brcm-rpc/Dockerfile.j2 b/platform/broadcom/docker-syncd-brcm-rpc/Dockerfile.j2
index ebe3dda1c14d..c8f0590023ed 100644
--- a/platform/broadcom/docker-syncd-brcm-rpc/Dockerfile.j2
+++ b/platform/broadcom/docker-syncd-brcm-rpc/Dockerfile.j2
@@ -49,4 +49,3 @@ RUN apt-get update \
 COPY ["ptf_nn_agent.conf", "/etc/supervisor/conf.d/"]
 
 ENTRYPOINT ["/usr/bin/supervisord"]
-
diff --git a/platform/broadcom/docker-syncd-brcm.mk b/platform/broadcom/docker-syncd-brcm.mk
index aeee6479a84f..6ef1587adecd 100644
--- a/platform/broadcom/docker-syncd-brcm.mk
+++ b/platform/broadcom/docker-syncd-brcm.mk
@@ -17,4 +17,3 @@ $(DOCKER_SYNCD_BRCM)_RUN_OPT += -v /var/run/docker-syncd:/var/run/sswsyncd
 $(DOCKER_SYNCD_BRCM)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro
 
 $(DOCKER_SYNCD_BRCM)_BASE_IMAGE_FILES += bcmcmd:/usr/bin/bcmcmd
-
diff --git a/platform/broadcom/docker-syncd-brcm/Dockerfile.j2 b/platform/broadcom/docker-syncd-brcm/Dockerfile.j2
index 2b5fc8c87d0b..76af952cef18 100755
--- a/platform/broadcom/docker-syncd-brcm/Dockerfile.j2
+++ b/platform/broadcom/docker-syncd-brcm/Dockerfile.j2
@@ -29,4 +29,3 @@ RUN apt-get clean -y; apt-get autoclean -y; apt-get autoremove -y
 RUN rm -rf /debs
 
 ENTRYPOINT ["/usr/bin/supervisord"]
-
diff --git a/platform/broadcom/docker-syncd-brcm/base_image_files/bcmcmd b/platform/broadcom/docker-syncd-brcm/base_image_files/bcmcmd
index ee87a93cdf6e..7903db6ed6a3 100755
--- a/platform/broadcom/docker-syncd-brcm/base_image_files/bcmcmd
+++ b/platform/broadcom/docker-syncd-brcm/base_image_files/bcmcmd
@@ -1,4 +1,3 @@
 #!/bin/bash
 
 docker exec -i syncd bcmcmd "$@"
-
diff --git a/platform/broadcom/docker-syncd-brcm/start.sh b/platform/broadcom/docker-syncd-brcm/start.sh
index 742cf8223132..930609a1958d 100755
--- a/platform/broadcom/docker-syncd-brcm/start.sh
+++ b/platform/broadcom/docker-syncd-brcm/start.sh
@@ -20,4 +20,3 @@ if [ -r ${PLATFORM_DIR}/led_proc_init.soc ]; then
 
     /usr/bin/bcmcmd -t 60 "rcload ${PLATFORM_DIR}/led_proc_init.soc"
 fi
-
diff --git a/platform/broadcom/docker-syncd-brcm/supervisord.conf b/platform/broadcom/docker-syncd-brcm/supervisord.conf
index 1e015fef931f..1af5d70a1d0c 100644
--- a/platform/broadcom/docker-syncd-brcm/supervisord.conf
+++ b/platform/broadcom/docker-syncd-brcm/supervisord.conf
@@ -26,4 +26,3 @@ autostart=false
 autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
-
diff --git a/platform/cavium/cavm-platform-modules.mk b/platform/cavium/cavm-platform-modules.mk
index 8ed10a6b9289..4ac72a4c4aab 100644
--- a/platform/cavium/cavm-platform-modules.mk
+++ b/platform/cavium/cavm-platform-modules.mk
@@ -1,4 +1,3 @@
 CAVM_PLATFORM_DEB = cavm_platform_modules.deb
 $(CAVM_PLATFORM_DEB)_SRC_PATH = $(PLATFORM_PATH)/cavm_platform_modules
 SONIC_MAKE_DEBS += $(CAVM_PLATFORM_DEB)
-
diff --git a/platform/cavium/cavm_platform_modules/Makefile b/platform/cavium/cavm_platform_modules/Makefile
index 13ab41926e38..aeb274aa5a42 100644
--- a/platform/cavium/cavm_platform_modules/Makefile
+++ b/platform/cavium/cavm_platform_modules/Makefile
@@ -31,4 +31,3 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
 
 	mv $(MAIN_TARGET) $(DEST)/
 	rm -rf $(DEB_BUILD_DIR)
-
diff --git a/platform/cavium/docker-syncd-cavm/profile.ini b/platform/cavium/docker-syncd-cavm/profile.ini
index 1e5fc5f0fc0a..017996f7d7cc 100644
--- a/platform/cavium/docker-syncd-cavm/profile.ini
+++ b/platform/cavium/docker-syncd-cavm/profile.ini
@@ -1,3 +1,2 @@
 mode=1
 hwId=as7512
-
diff --git a/platform/cavium/docker-syncd-cavm/start.sh b/platform/cavium/docker-syncd-cavm/start.sh
index 96e2a9128081..623316050475 100755
--- a/platform/cavium/docker-syncd-cavm/start.sh
+++ b/platform/cavium/docker-syncd-cavm/start.sh
@@ -5,4 +5,3 @@ rm -f /var/run/rsyslogd.pid
 supervisorctl start rsyslogd
 
 supervisorctl start syncd
-
diff --git a/platform/cavium/docker-syncd-cavm/supervisord.conf b/platform/cavium/docker-syncd-cavm/supervisord.conf
index 1e015fef931f..1af5d70a1d0c 100644
--- a/platform/cavium/docker-syncd-cavm/supervisord.conf
+++ b/platform/cavium/docker-syncd-cavm/supervisord.conf
@@ -26,4 +26,3 @@ autostart=false
 autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
-
diff --git a/platform/cavium/rules.mk b/platform/cavium/rules.mk
index 67a69168e035..37a9bd7c994b 100644
--- a/platform/cavium/rules.mk
+++ b/platform/cavium/rules.mk
@@ -19,4 +19,3 @@ $(LIBSAIREDIS)_DEPENDS += $(CAVM_SAI) $(CAVM_LIBSAI) $(LIBSAITHRIFT_DEV_CAVM)
 
 # Runtime dependency on cavium sai is set only for syncd
 $(SYNCD)_RDEPENDS += $(CAVM_SAI)
-
diff --git a/platform/centec/docker-syncd-centec-rpc/Dockerfile.j2 b/platform/centec/docker-syncd-centec-rpc/Dockerfile.j2
index ac402d1f6eae..db58e7731be8 100644
--- a/platform/centec/docker-syncd-centec-rpc/Dockerfile.j2
+++ b/platform/centec/docker-syncd-centec-rpc/Dockerfile.j2
@@ -49,4 +49,3 @@ RUN apt-get update \
 COPY ["ptf_nn_agent.conf", "/etc/supervisor/conf.d/"]
  
 ENTRYPOINT ["/usr/bin/supervisord"]
-
diff --git a/platform/centec/docker-syncd-centec/Dockerfile.j2 b/platform/centec/docker-syncd-centec/Dockerfile.j2
index 302afbc0cd4e..d9b12bb426e4 100755
--- a/platform/centec/docker-syncd-centec/Dockerfile.j2
+++ b/platform/centec/docker-syncd-centec/Dockerfile.j2
@@ -27,4 +27,3 @@ RUN apt-get clean -y; apt-get autoclean -y; apt-get autoremove -y
 RUN rm -rf /debs
 
 ENTRYPOINT ["/usr/bin/supervisord"]
-
diff --git a/platform/centec/docker-syncd-centec/start.sh b/platform/centec/docker-syncd-centec/start.sh
index 96e2a9128081..623316050475 100755
--- a/platform/centec/docker-syncd-centec/start.sh
+++ b/platform/centec/docker-syncd-centec/start.sh
@@ -5,4 +5,3 @@ rm -f /var/run/rsyslogd.pid
 supervisorctl start rsyslogd
 
 supervisorctl start syncd
-
diff --git a/platform/centec/docker-syncd-centec/supervisord.conf b/platform/centec/docker-syncd-centec/supervisord.conf
index 1e015fef931f..1af5d70a1d0c 100644
--- a/platform/centec/docker-syncd-centec/supervisord.conf
+++ b/platform/centec/docker-syncd-centec/supervisord.conf
@@ -26,4 +26,3 @@ autostart=false
 autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
-
diff --git a/platform/generic/aboot-image.mk b/platform/generic/aboot-image.mk
index 64b841f856ea..7f5b4639e4e9 100644
--- a/platform/generic/aboot-image.mk
+++ b/platform/generic/aboot-image.mk
@@ -6,4 +6,3 @@ $(SONIC_GENERIC_ABOOT_IMAGE)_IMAGE_TYPE = aboot
 $(SONIC_GENERIC_ABOOT_IMAGE)_DEPENDS =
 $(SONIC_GENERIC_ABOOT_IMAGE)_DOCKERS =
 SONIC_INSTALLERS += $(SONIC_GENERIC_ABOOT_IMAGE)
-
diff --git a/platform/mellanox/docker-syncd-mlnx-rpc/Dockerfile.j2 b/platform/mellanox/docker-syncd-mlnx-rpc/Dockerfile.j2
index 66eab2013ba6..0a2010dcbbc1 100644
--- a/platform/mellanox/docker-syncd-mlnx-rpc/Dockerfile.j2
+++ b/platform/mellanox/docker-syncd-mlnx-rpc/Dockerfile.j2
@@ -49,4 +49,3 @@ RUN apt-get update \
 COPY ["ptf_nn_agent.conf", "/etc/supervisor/conf.d/"]
  
 ENTRYPOINT ["/usr/bin/supervisord"]
-
diff --git a/platform/mellanox/docker-syncd-mlnx/Dockerfile.j2 b/platform/mellanox/docker-syncd-mlnx/Dockerfile.j2
index 9d42c48b49e3..79661e0ef7fa 100755
--- a/platform/mellanox/docker-syncd-mlnx/Dockerfile.j2
+++ b/platform/mellanox/docker-syncd-mlnx/Dockerfile.j2
@@ -27,4 +27,3 @@ RUN apt-get clean -y; apt-get autoclean -y; apt-get autoremove -y
 RUN rm -rf /debs
 
 ENTRYPOINT ["/usr/bin/supervisord"]
-
diff --git a/platform/mellanox/docker-syncd-mlnx/supervisord.conf b/platform/mellanox/docker-syncd-mlnx/supervisord.conf
index 1e015fef931f..1af5d70a1d0c 100644
--- a/platform/mellanox/docker-syncd-mlnx/supervisord.conf
+++ b/platform/mellanox/docker-syncd-mlnx/supervisord.conf
@@ -26,4 +26,3 @@ autostart=false
 autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
-
diff --git a/platform/p4/docker-sonic-p4/rsyslog.conf b/platform/p4/docker-sonic-p4/rsyslog.conf
index e8f42bdabe50..3480e18f9998 100644
--- a/platform/p4/docker-sonic-p4/rsyslog.conf
+++ b/platform/p4/docker-sonic-p4/rsyslog.conf
@@ -65,4 +65,3 @@ $IncludeConfig /etc/rsyslog.d/*.conf
 ###############
 #### RULES ####
 ###############
-
diff --git a/rules/docker-fpm-frr.mk b/rules/docker-fpm-frr.mk
index d246d093dced..eedbc13c4e6c 100644
--- a/rules/docker-fpm-frr.mk
+++ b/rules/docker-fpm-frr.mk
@@ -11,4 +11,3 @@ $(DOCKER_FPM_FRR)_RUN_OPT += --net=host --privileged -t
 $(DOCKER_FPM_FRR)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro
 
 $(DOCKER_FPM_FRR)_BASE_IMAGE_FILES += vtysh:/usr/bin/vtysh
-
diff --git a/rules/isc-dhcp.mk b/rules/isc-dhcp.mk
index bfceb7676622..82f5c3844c6f 100644
--- a/rules/isc-dhcp.mk
+++ b/rules/isc-dhcp.mk
@@ -10,4 +10,3 @@ SONIC_MAKE_DEBS += $(ISC_DHCP_COMMON)
 
 ISC_DHCP_RELAY = isc-dhcp-relay_$(ISC_DHCP_VERSION)_amd64.deb
 $(eval $(call add_derived_package,$(ISC_DHCP_COMMON),$(ISC_DHCP_RELAY)))
-
diff --git a/rules/python3.mk b/rules/python3.mk
index 8fa02a26a462..2473c9aeb498 100644
--- a/rules/python3.mk
+++ b/rules/python3.mk
@@ -33,4 +33,3 @@ LIBPY3_DEV = lib$(PYTHON_PNAME)-dev_$(PYTHON_VER)_amd64.deb
 $(eval $(call add_derived_package,$(LIBPY3_MIN),$(LIBPY3_DEV)))
 $(LIBPY3_DEV)_DEPENDS += $(LIBPY3) $($(LIBPY3)_DEPENDS)
 $(LIBPY3_DEV)_RDEPENDS += $(LIBPY3) $($(LIBPY3)_RDEPENDS)
-
diff --git a/src/isc-dhcp/Makefile b/src/isc-dhcp/Makefile
index 44e77cdd9b43..9cacd6cfe5e7 100644
--- a/src/isc-dhcp/Makefile
+++ b/src/isc-dhcp/Makefile
@@ -27,4 +27,3 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
 	mv $* $(DERIVED_TARGETS) $(DEST)/
 
 $(addprefix $(DEST)/, $(DERIVED_TARGETS)): $(DEST)/% : $(DEST)/$(MAIN_TARGET)
-
diff --git a/src/sonic-config-engine/openconfig_acl.py b/src/sonic-config-engine/openconfig_acl.py
index 92ff414ed23e..cb29183652e7 100644
--- a/src/sonic-config-engine/openconfig_acl.py
+++ b/src/sonic-config-engine/openconfig_acl.py
@@ -7540,5 +7540,3 @@ def _unset_acl(self):
 
 
   _pyangbind_elements = {'acl': acl, }
-
-
diff --git a/src/sonic-config-engine/sonic-cfggen b/src/sonic-config-engine/sonic-cfggen
index 8f5b78ac66c1..864513f577e0 100755
--- a/src/sonic-config-engine/sonic-cfggen
+++ b/src/sonic-config-engine/sonic-cfggen
@@ -114,4 +114,3 @@ def main():
 
 if __name__ == "__main__":
     main()
-
diff --git a/src/sonic-config-engine/sonic_platform.py b/src/sonic-config-engine/sonic_platform.py
index fdc192d09d0a..1eca1487a76a 100644
--- a/src/sonic-config-engine/sonic_platform.py
+++ b/src/sonic-config-engine/sonic_platform.py
@@ -29,4 +29,3 @@ def get_platform_info(machine_info):
         elif machine_info.has_key('aboot_platform'):
             return machine_info['aboot_platform']
     return None
-
diff --git a/src/sonic-device-data/src/debian/rules b/src/sonic-device-data/src/debian/rules
index e91562ccbb5a..a5e2f5acfc1f 100755
--- a/src/sonic-device-data/src/debian/rules
+++ b/src/sonic-device-data/src/debian/rules
@@ -4,4 +4,3 @@ build:
 
 %:
 	dh $@
-
diff --git a/src/supervisor/Makefile b/src/supervisor/Makefile
index e9f1c65210a8..5f06325960b1 100644
--- a/src/supervisor/Makefile
+++ b/src/supervisor/Makefile
@@ -19,4 +19,3 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
 
 	# Move the newly-built .deb packages to the destination directory
 	mv ./supervisor/deb_dist/$* $(DEST)/
-