diff --git a/group/tf-l1-build-fvp/fvp-tbb-mbedtls-romlib-sdei:nil b/group/tf-l1-build-fvp/fvp-tbb-mbedtls-romlib-sdei:nil
index 249b1b5..290130c 100644
--- a/group/tf-l1-build-fvp/fvp-tbb-mbedtls-romlib-sdei:nil
+++ b/group/tf-l1-build-fvp/fvp-tbb-mbedtls-romlib-sdei:nil
@@ -3,4 +3,4 @@
 # Copyright (c) 2020, Arm Limited. All rights reserved.
 #
 # SPDX-License-Identifier: BSD-3-Clause
-#
\ No newline at end of file
+#
diff --git a/group/tf-l1-build-juno/juno-aarch32-rst-to-sp-min-stack-protector:nil b/group/tf-l1-build-juno/juno-aarch32-rst-to-sp-min-stack-protector:nil
index e5b5fb5..0a342ff 100644
--- a/group/tf-l1-build-juno/juno-aarch32-rst-to-sp-min-stack-protector:nil
+++ b/group/tf-l1-build-juno/juno-aarch32-rst-to-sp-min-stack-protector:nil
@@ -2,4 +2,4 @@
 # Copyright (c) 2020, Arm Limited. All rights reserved.
 #
 # SPDX-License-Identifier: BSD-3-Clause
-#
\ No newline at end of file
+#
diff --git a/group/tf-l1-build-juno/juno-stack-protector:nil b/group/tf-l1-build-juno/juno-stack-protector:nil
index e5b5fb5..0a342ff 100644
--- a/group/tf-l1-build-juno/juno-stack-protector:nil
+++ b/group/tf-l1-build-juno/juno-stack-protector:nil
@@ -2,4 +2,4 @@
 # Copyright (c) 2020, Arm Limited. All rights reserved.
 #
 # SPDX-License-Identifier: BSD-3-Clause
-#
\ No newline at end of file
+#
diff --git a/group/tf-l2-boot-tests-cortex/fvp-dynamiq-aarch64-only:fvp-linux-dtb.dyn-fip.uboot-hercules-debug b/group/tf-l2-boot-tests-cortex/fvp-dynamiq-aarch64-only:fvp-linux-dtb.dyn-fip.uboot-hercules-debug
index e5b5fb5..0a342ff 100644
--- a/group/tf-l2-boot-tests-cortex/fvp-dynamiq-aarch64-only:fvp-linux-dtb.dyn-fip.uboot-hercules-debug
+++ b/group/tf-l2-boot-tests-cortex/fvp-dynamiq-aarch64-only:fvp-linux-dtb.dyn-fip.uboot-hercules-debug
@@ -2,4 +2,4 @@
 # Copyright (c) 2020, Arm Limited. All rights reserved.
 #
 # SPDX-License-Identifier: BSD-3-Clause
-#
\ No newline at end of file
+#
diff --git a/group/tf-l2-boot-tests-juno/juno-stack-protector:juno-linux.uboot b/group/tf-l2-boot-tests-juno/juno-stack-protector:juno-linux.uboot
index e5b5fb5..0a342ff 100644
--- a/group/tf-l2-boot-tests-juno/juno-stack-protector:juno-linux.uboot
+++ b/group/tf-l2-boot-tests-juno/juno-stack-protector:juno-linux.uboot
@@ -2,4 +2,4 @@
 # Copyright (c) 2020, Arm Limited. All rights reserved.
 #
 # SPDX-License-Identifier: BSD-3-Clause
-#
\ No newline at end of file
+#
diff --git a/group/tf-l3-boot-tests-spm/fvp-spm-mm,fvp-spm-mm:fvp-tftf.cactus_mm-fip.tftf+bl32-aemv8a.assymetric-debug b/group/tf-l3-boot-tests-spm/fvp-spm-mm,fvp-spm-mm:fvp-tftf.cactus_mm-fip.tftf+bl32-aemv8a.assymetric-debug
index e5b5fb5..0a342ff 100644
--- a/group/tf-l3-boot-tests-spm/fvp-spm-mm,fvp-spm-mm:fvp-tftf.cactus_mm-fip.tftf+bl32-aemv8a.assymetric-debug
+++ b/group/tf-l3-boot-tests-spm/fvp-spm-mm,fvp-spm-mm:fvp-tftf.cactus_mm-fip.tftf+bl32-aemv8a.assymetric-debug
@@ -2,4 +2,4 @@
 # Copyright (c) 2020, Arm Limited. All rights reserved.
 #
 # SPDX-License-Identifier: BSD-3-Clause
-#
\ No newline at end of file
+#
diff --git a/group/tf-l3-boot-tests-spm/fvp-spm-mm,fvp-spm-mm:fvp-tftf.cactus_mm-fip.tftf+bl32-aemv8a.singlecore-debug b/group/tf-l3-boot-tests-spm/fvp-spm-mm,fvp-spm-mm:fvp-tftf.cactus_mm-fip.tftf+bl32-aemv8a.singlecore-debug
index e5b5fb5..0a342ff 100644
--- a/group/tf-l3-boot-tests-spm/fvp-spm-mm,fvp-spm-mm:fvp-tftf.cactus_mm-fip.tftf+bl32-aemv8a.singlecore-debug
+++ b/group/tf-l3-boot-tests-spm/fvp-spm-mm,fvp-spm-mm:fvp-tftf.cactus_mm-fip.tftf+bl32-aemv8a.singlecore-debug
@@ -2,4 +2,4 @@
 # Copyright (c) 2020, Arm Limited. All rights reserved.
 #
 # SPDX-License-Identifier: BSD-3-Clause
-#
\ No newline at end of file
+#
diff --git a/group/tf-l3-boot-tests-spm/fvp-spm-mm,fvp-spm-mm:fvp-tftf.cactus_mm-fip.tftf+bl32-cortexa35x4-debug b/group/tf-l3-boot-tests-spm/fvp-spm-mm,fvp-spm-mm:fvp-tftf.cactus_mm-fip.tftf+bl32-cortexa35x4-debug
index e5b5fb5..0a342ff 100644
--- a/group/tf-l3-boot-tests-spm/fvp-spm-mm,fvp-spm-mm:fvp-tftf.cactus_mm-fip.tftf+bl32-cortexa35x4-debug
+++ b/group/tf-l3-boot-tests-spm/fvp-spm-mm,fvp-spm-mm:fvp-tftf.cactus_mm-fip.tftf+bl32-cortexa35x4-debug
@@ -2,4 +2,4 @@
 # Copyright (c) 2020, Arm Limited. All rights reserved.
 #
 # SPDX-License-Identifier: BSD-3-Clause
-#
\ No newline at end of file
+#
diff --git a/group/tf-l3-boot-tests-spm/fvp-spm-mm,fvp-spm-mm:fvp-tftf.cactus_mm-fip.tftf+bl32-cortexa57x4a53x4-debug b/group/tf-l3-boot-tests-spm/fvp-spm-mm,fvp-spm-mm:fvp-tftf.cactus_mm-fip.tftf+bl32-cortexa57x4a53x4-debug
index e5b5fb5..0a342ff 100644
--- a/group/tf-l3-boot-tests-spm/fvp-spm-mm,fvp-spm-mm:fvp-tftf.cactus_mm-fip.tftf+bl32-cortexa57x4a53x4-debug
+++ b/group/tf-l3-boot-tests-spm/fvp-spm-mm,fvp-spm-mm:fvp-tftf.cactus_mm-fip.tftf+bl32-cortexa57x4a53x4-debug
@@ -2,4 +2,4 @@
 # Copyright (c) 2020, Arm Limited. All rights reserved.
 #
 # SPDX-License-Identifier: BSD-3-Clause
-#
\ No newline at end of file
+#
diff --git a/group/tf-l3-boot-tests-spm/fvp-spm-mm,fvp-spm-mm:fvp-tftf.cactus_mm-fip.tftf+bl32-foundationv8-debug b/group/tf-l3-boot-tests-spm/fvp-spm-mm,fvp-spm-mm:fvp-tftf.cactus_mm-fip.tftf+bl32-foundationv8-debug
index e5b5fb5..0a342ff 100644
--- a/group/tf-l3-boot-tests-spm/fvp-spm-mm,fvp-spm-mm:fvp-tftf.cactus_mm-fip.tftf+bl32-foundationv8-debug
+++ b/group/tf-l3-boot-tests-spm/fvp-spm-mm,fvp-spm-mm:fvp-tftf.cactus_mm-fip.tftf+bl32-foundationv8-debug
@@ -2,4 +2,4 @@
 # Copyright (c) 2020, Arm Limited. All rights reserved.
 #
 # SPDX-License-Identifier: BSD-3-Clause
-#
\ No newline at end of file
+#
diff --git a/group/tf-l3-code-coverage/fvp-default-cc,fvp-default:fvp-tftf-fip.tftf-aemv8a.amu.bmcov-debug b/group/tf-l3-code-coverage/fvp-default-cc,fvp-default:fvp-tftf-fip.tftf-aemv8a.amu.bmcov-debug
index e5b5fb5..0a342ff 100644
--- a/group/tf-l3-code-coverage/fvp-default-cc,fvp-default:fvp-tftf-fip.tftf-aemv8a.amu.bmcov-debug
+++ b/group/tf-l3-code-coverage/fvp-default-cc,fvp-default:fvp-tftf-fip.tftf-aemv8a.amu.bmcov-debug
@@ -2,4 +2,4 @@
 # Copyright (c) 2020, Arm Limited. All rights reserved.
 #
 # SPDX-License-Identifier: BSD-3-Clause
-#
\ No newline at end of file
+#
diff --git a/group/tftf-l2-fvp/fvp-aarch32-default,fvp-aarch32-default:fvp-tftf.aarch32-fip.tftf-aemv8a.amu.aarch32-debug b/group/tftf-l2-fvp/fvp-aarch32-default,fvp-aarch32-default:fvp-tftf.aarch32-fip.tftf-aemv8a.amu.aarch32-debug
index e5b5fb5..0a342ff 100644
--- a/group/tftf-l2-fvp/fvp-aarch32-default,fvp-aarch32-default:fvp-tftf.aarch32-fip.tftf-aemv8a.amu.aarch32-debug
+++ b/group/tftf-l2-fvp/fvp-aarch32-default,fvp-aarch32-default:fvp-tftf.aarch32-fip.tftf-aemv8a.amu.aarch32-debug
@@ -2,4 +2,4 @@
 # Copyright (c) 2020, Arm Limited. All rights reserved.
 #
 # SPDX-License-Identifier: BSD-3-Clause
-#
\ No newline at end of file
+#
diff --git a/group/tftf-l2-fvp/fvp-default,fvp-default:fvp-tftf-fip.tftf-aemv8a.amu-debug b/group/tftf-l2-fvp/fvp-default,fvp-default:fvp-tftf-fip.tftf-aemv8a.amu-debug
index e5b5fb5..0a342ff 100644
--- a/group/tftf-l2-fvp/fvp-default,fvp-default:fvp-tftf-fip.tftf-aemv8a.amu-debug
+++ b/group/tftf-l2-fvp/fvp-default,fvp-default:fvp-tftf-fip.tftf-aemv8a.amu-debug
@@ -2,4 +2,4 @@
 # Copyright (c) 2020, Arm Limited. All rights reserved.
 #
 # SPDX-License-Identifier: BSD-3-Clause
-#
\ No newline at end of file
+#