diff --git a/make/autoconf/build-aux/pkg.m4 b/make/autoconf/build-aux/pkg.m4
index 5f4b22bb27f..ddb685e9bc3 100644
--- a/make/autoconf/build-aux/pkg.m4
+++ b/make/autoconf/build-aux/pkg.m4
@@ -25,7 +25,7 @@
 # questions.
 #
 
-# 
+#
 # Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -54,18 +54,18 @@ AC_DEFUN([PKG_PROG_PKG_CONFIG],
 m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
 AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
 if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
-	AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
+        AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
 fi
 if test -n "$PKG_CONFIG"; then
-	_pkg_min_version=m4_default([$1], [0.9.0])
-	AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
-	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-		AC_MSG_RESULT([yes])
-	else
-		AC_MSG_RESULT([no])
-		PKG_CONFIG=""
-	fi
-		
+        _pkg_min_version=m4_default([$1], [0.9.0])
+        AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
+        if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+                AC_MSG_RESULT([yes])
+        else
+                AC_MSG_RESULT([no])
+                PKG_CONFIG=""
+        fi
+
 fi[]dnl
 ])# PKG_PROG_PKG_CONFIG
 
@@ -97,7 +97,7 @@ m4_define([_PKG_CONFIG],
  elif test -n "$PKG_CONFIG"; then
     PKG_CHECK_EXISTS([$3],
                      [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
-		     [pkg_failed=yes])
+                     [pkg_failed=yes])
  else
     pkg_failed=untried
 fi[]dnl
@@ -143,14 +143,14 @@ See the pkg-config man page for more details.])
 if test $pkg_failed = yes; then
         _PKG_SHORT_ERRORS_SUPPORTED
         if test $_pkg_short_errors_supported = yes; then
-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
-        else 
-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
+                $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
+        else
+                $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
         fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
+        # Put the nasty error message in config.log where it belongs
+        echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
 
-	ifelse([$4], , [AC_MSG_ERROR(dnl
+        ifelse([$4], , [AC_MSG_ERROR(dnl
 [Package requirements ($2) were not met:
 
 $$1_PKG_ERRORS
@@ -160,10 +160,10 @@ installed software in a non-standard prefix.
 
 _PKG_TEXT
 ])],
-		[AC_MSG_RESULT([no])
+                [AC_MSG_RESULT([no])
                 $4])
 elif test $pkg_failed = untried; then
-	ifelse([$4], , [AC_MSG_FAILURE(dnl
+        ifelse([$4], , [AC_MSG_FAILURE(dnl
 [The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -171,11 +171,11 @@ path to pkg-config.
 _PKG_TEXT
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
-		[$4])
+                [$4])
 else
-	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
-	$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
+        $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
+        $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
         AC_MSG_RESULT([yes])
-	ifelse([$3], , :, [$3])
+        ifelse([$3], , :, [$3])
 fi[]dnl
 ])# PKG_CHECK_MODULES
diff --git a/src/hotspot/cpu/aarch64/ad_encode.m4 b/src/hotspot/cpu/aarch64/ad_encode.m4
index e6c87cf5b05..4897998d870 100644
--- a/src/hotspot/cpu/aarch64/ad_encode.m4
+++ b/src/hotspot/cpu/aarch64/ad_encode.m4
@@ -19,7 +19,7 @@ dnl Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
 dnl or visit www.oracle.com if you need additional information or have any
 dnl questions.
 dnl
-dnl 
+dnl
 dnl Process this file with m4 ad_encode.m4 to generate the load/store
 dnl patterns used in aarch64.ad.
 dnl
@@ -90,4 +90,3 @@ STORE(vRegD,strd,Float,,8)
       loadStore(_masm, &MacroAssembler::strb, zr, $mem->opcode(),
                as_Register($mem$$base), $mem$$index, $mem$$scale, $mem$$disp, 1);
   %}
-
diff --git a/src/java.desktop/share/classes/sun/awt/resources/cursors/cursors.properties b/src/java.desktop/share/classes/sun/awt/resources/cursors/cursors.properties
index b453e728b5e..d0790d27073 100644
--- a/src/java.desktop/share/classes/sun/awt/resources/cursors/cursors.properties
+++ b/src/java.desktop/share/classes/sun/awt/resources/cursors/cursors.properties
@@ -9,7 +9,7 @@
 #
 # The syntax is: Cursor.<name>.<geom>.File=<filename>
 #                Cursor.<name>.<geom>.HotSpot=<x>,<y>
-#	         Cursor.<name>.<geom>.Name=<localized name>
+#                Cursor.<name>.<geom>.Name=<localized name>
 #
 Cursor.CopyDrop.32x32.File=CopyDrop32x32.gif
 Cursor.CopyDrop.32x32.HotSpot=0,0
diff --git a/src/java.desktop/share/conf/psfontj2d.properties b/src/java.desktop/share/conf/psfontj2d.properties
index 5eb2c4b8ba2..0feee66de02 100644
--- a/src/java.desktop/share/conf/psfontj2d.properties
+++ b/src/java.desktop/share/conf/psfontj2d.properties
@@ -24,7 +24,7 @@
 # questions.
 
 #
-#	PostScript printer property file for Java 2D printing.
+#       PostScript printer property file for Java 2D printing.
 #
 # WARNING: This is an internal implementation file, not a public file.
 # Any customisation or reliance on the existence of this file and its
diff --git a/src/java.desktop/share/legal/freetype.md b/src/java.desktop/share/legal/freetype.md
index 6bcb4976fd2..0ddbe9b1136 100644
--- a/src/java.desktop/share/legal/freetype.md
+++ b/src/java.desktop/share/legal/freetype.md
@@ -212,15 +212,15 @@ Legal Terms
 ### GPL v2
 
 ```
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.
      51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
-			    Preamble
+                            Preamble
 
   The licenses for most software are designed to take away your
 freedom to share and change it.  By contrast, the GNU General Public
@@ -270,7 +270,7 @@ patent must be licensed for everyone's free use or not licensed at all.
   The precise terms and conditions for copying, distribution and
 modification follow.
 
-		    GNU GENERAL PUBLIC LICENSE
+                    GNU GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
   0. This License applies to any program or other work which contains
@@ -469,7 +469,7 @@ make exceptions for this.  Our decision will be guided by the two goals
 of preserving the free status of all derivatives of our free software and
 of promoting the sharing and reuse of software generally.
 
-			    NO WARRANTY
+                            NO WARRANTY
 
   11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
 FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
@@ -491,9 +491,9 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
 PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.
 
-		     END OF TERMS AND CONDITIONS
+                     END OF TERMS AND CONDITIONS
 
-	    How to Apply These Terms to Your New Programs
+            How to Apply These Terms to Your New Programs
 
   If you develop a new program, and you want it to be of the greatest
 possible use to the public, the best way to achieve this is to make it
diff --git a/src/java.logging/share/conf/logging.properties b/src/java.logging/share/conf/logging.properties
index 99a38507290..2c11b193c13 100644
--- a/src/java.logging/share/conf/logging.properties
+++ b/src/java.logging/share/conf/logging.properties
@@ -1,5 +1,5 @@
 ############################################################
-#  	Default Logging Configuration File
+#       Default Logging Configuration File
 #
 # You can use a different file by specifying a filename
 # with the java.util.logging.config.file system property.
@@ -7,7 +7,7 @@
 ############################################################
 
 ############################################################
-#  	Global properties
+#       Global properties
 ############################################################
 
 # "handlers" specifies a comma-separated list of log Handler
diff --git a/src/java.naming/share/classes/com/sun/jndi/ldap/jndiprovider.properties b/src/java.naming/share/classes/com/sun/jndi/ldap/jndiprovider.properties
index fabc589fe9f..bbe8dd03dde 100644
--- a/src/java.naming/share/classes/com/sun/jndi/ldap/jndiprovider.properties
+++ b/src/java.naming/share/classes/com/sun/jndi/ldap/jndiprovider.properties
@@ -8,7 +8,7 @@ java.naming.factory.control=com.sun.jndi.ldap.ctl.ResponseControlFactory
 java.naming.factory.object=com.sun.jndi.ldap.obj.AttrsToCorba:com.sun.jndi.ldap.obj.MarshalledToObject
 
 # RemoteToAttrs: Turn RMI/JRMP and RMI/IIOP object into javaMarshalledObject or
-# 		corbaObject LDAP entry
+#                corbaObject LDAP entry
 # CorbaToAttrs: Turn CORBA object into corbaObject LDAP entry
 # RemoteToCorbaToAttrs: Turn RMI/IIOP object into corbaObject LDAP entry.
 #  Note that there is no need to specify this in list unless RemoteToAttrs is
diff --git a/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/resources/jdkinternals.properties b/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/resources/jdkinternals.properties
index a60d0c7d6ba..35f59cac926 100644
--- a/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/resources/jdkinternals.properties
+++ b/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/resources/jdkinternals.properties
@@ -38,7 +38,7 @@ java.awt.peer=Should not use. See https://bugs.openjdk.org/browse/JDK-8037739
 java.awt.dnd.peer=Should not use. See https://bugs.openjdk.org/browse/JDK-8037739
 jdk.internal.ref.Cleaner=Use java.lang.ref.PhantomReference @since 1.2 or java.lang.ref.Cleaner @since 9
 sun.awt.CausedFocusEvent=Use java.awt.event.FocusEvent::getCause @since 9
-sun.font.FontUtilities=See java.awt.Font.textRequiresLayout	@since 9
+sun.font.FontUtilities=See java.awt.Font.textRequiresLayout @since 9
 sun.reflect.Reflection=Use java.lang.StackWalker @since 9
 sun.reflect.ReflectionFactory=See https://openjdk.org/jeps/260
 sun.misc.Unsafe=See https://openjdk.org/jeps/260
@@ -64,6 +64,3 @@ sun.misc.Cleaner=Use java.lang.ref.PhantomReference @since 1.2 or java.lang.ref.
 sun.misc.Service=Use java.util.ServiceLoader @since 1.6
 sun.misc=Removed. See https://openjdk.org/jeps/260
 sun.reflect=Removed. See https://openjdk.org/jeps/260
-
-
-
diff --git a/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent.properties b/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent.properties
index c43349aa10e..5ee066fe825 100644
--- a/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent.properties
+++ b/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent.properties
@@ -23,16 +23,16 @@
 # questions.
 #
 
-agent.err.error			   = Error
+agent.err.error                    = Error
 agent.err.exception                = Exception thrown by the agent
-agent.err.warning		   = Warning
+agent.err.warning                  = Warning
 
 agent.err.configfile.notfound      = Config file not found
 agent.err.configfile.failed        = Failed in reading the config file
 agent.err.configfile.closed.failed = Failed in closing the config file
 agent.err.configfile.access.denied = Access to the config file is denied
 
-agent.err.exportaddress.failed	   = Export of JMX connector address to instrumentation buffer failed
+agent.err.exportaddress.failed     = Export of JMX connector address to instrumentation buffer failed
 
 agent.err.agentclass.notfound      = Management agent class not found
 agent.err.agentclass.failed        = Management agent class failed
@@ -62,7 +62,7 @@ agent.err.access.file.notfound     = Access file not found
 
 agent.err.connector.server.io.error = JMX connector server communication error
 
-agent.err.invalid.option	   = Invalid option specified
+agent.err.invalid.option           = Invalid option specified
 
 jmxremote.ConnectorBootstrap.starting = Starting JMX Connector Server:
 jmxremote.ConnectorBootstrap.noAuthentication = No Authentication
diff --git a/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_de.properties b/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_de.properties
index f2156421b04..ec8882be5da 100644
--- a/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_de.properties
+++ b/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_de.properties
@@ -23,16 +23,16 @@
 # questions.
 #
 
-agent.err.error			   = Fehler
+agent.err.error                    = Fehler
 agent.err.exception                = Ausnahme von Agent ausgelöst
-agent.err.warning		   = Warnung
+agent.err.warning                  = Warnung
 
 agent.err.configfile.notfound      = Konfigurationsdatei wurde nicht gefunden
 agent.err.configfile.failed        = Konfigurationsdatei konnte nicht gelesen werden
 agent.err.configfile.closed.failed = Konfigurationsdatei konnte nicht geschlossen werden
 agent.err.configfile.access.denied = Zugriff auf Konfigurationsdatei wurde abgelehnt
 
-agent.err.exportaddress.failed	   = Export der JMX-Connector-Adresse in Instrumentierungspuffer nicht erfolgreich
+agent.err.exportaddress.failed     = Export der JMX-Connector-Adresse in Instrumentierungspuffer nicht erfolgreich
 
 agent.err.agentclass.notfound      = Management Agent-Klasse nicht gefunden
 agent.err.agentclass.failed        = Management Agent-Klasse nicht erfolgreich
@@ -62,7 +62,7 @@ agent.err.access.file.notfound     = Zugriffsdatei nicht gefunden
 
 agent.err.connector.server.io.error = Fehler bei JMX-Connector-Serverkommunikation
 
-agent.err.invalid.option	   = Ungültige Option angegeben
+agent.err.invalid.option           = Ungültige Option angegeben
 
 jmxremote.ConnectorBootstrap.starting = JMX-Connector-Server starten:
 jmxremote.ConnectorBootstrap.noAuthentication = Keine Authentifizierung
diff --git a/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_es.properties b/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_es.properties
index 6a956e13d11..9d408730cd0 100644
--- a/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_es.properties
+++ b/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_es.properties
@@ -23,16 +23,16 @@
 # questions.
 #
 
-agent.err.error			   = Error
+agent.err.error                    = Error
 agent.err.exception                = Excepción devuelta por el agente
-agent.err.warning		   = Advertencia
+agent.err.warning                  = Advertencia
 
 agent.err.configfile.notfound      = No se ha encontrado el archivo de configuración
 agent.err.configfile.failed        = Fallo al leer el archivo de configuración
 agent.err.configfile.closed.failed = Fallo al cerrar el archivo de configuración
 agent.err.configfile.access.denied = Acceso denegado al archivo de configuración
 
-agent.err.exportaddress.failed	   = Fallo al exportar la dirección del conector JMX al buffer de instrumentación
+agent.err.exportaddress.failed     = Fallo al exportar la dirección del conector JMX al buffer de instrumentación
 
 agent.err.agentclass.notfound      = Clase de agente de gestión no encontrada
 agent.err.agentclass.failed        = Fallo de clase de agente de gestión
@@ -62,7 +62,7 @@ agent.err.access.file.notfound     = Archivo de acceso no encontrado
 
 agent.err.connector.server.io.error = Error de comunicación con el servidor de conector JMX
 
-agent.err.invalid.option	   = Opción especificada no válida
+agent.err.invalid.option           = Opción especificada no válida
 
 jmxremote.ConnectorBootstrap.starting = Iniciando servidor de conector JMX:
 jmxremote.ConnectorBootstrap.noAuthentication = Sin autenticación
diff --git a/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_fr.properties b/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_fr.properties
index 5f0fdf12a68..011ae2fce6c 100644
--- a/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_fr.properties
+++ b/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_fr.properties
@@ -23,16 +23,16 @@
 # questions.
 #
 
-agent.err.error			   = Erreur
+agent.err.error                    = Erreur
 agent.err.exception                = Exception envoyée par l'agent
-agent.err.warning		   = Avertissement
+agent.err.warning                  = Avertissement
 
 agent.err.configfile.notfound      = Fichier de configuration introuvable
 agent.err.configfile.failed        = Impossible de lire le fichier de configuration
 agent.err.configfile.closed.failed = Impossible de fermer le fichier de configuration
 agent.err.configfile.access.denied = Accès refusé au fichier de configuration
 
-agent.err.exportaddress.failed	   = Impossible d'exporter l'adresse du connecteur JMX dans le tampon d'instrumentation
+agent.err.exportaddress.failed     = Impossible d'exporter l'adresse du connecteur JMX dans le tampon d'instrumentation
 
 agent.err.agentclass.notfound      = Classe d'agents de gestion introuvable
 agent.err.agentclass.failed        = Echec de la classe d'agents de gestion
@@ -62,7 +62,7 @@ agent.err.access.file.notfound     = Fichier d'accès introuvable
 
 agent.err.connector.server.io.error = Erreur de communication avec le serveur du connecteur JMX
 
-agent.err.invalid.option	   = Option spécifiée non valide
+agent.err.invalid.option           = Option spécifiée non valide
 
 jmxremote.ConnectorBootstrap.starting = Démarrage du serveur du connecteur JMX :
 jmxremote.ConnectorBootstrap.noAuthentication = Pas d'authentification
diff --git a/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_it.properties b/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_it.properties
index 2ad7fc315b7..91cf39bdb3f 100644
--- a/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_it.properties
+++ b/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_it.properties
@@ -23,16 +23,16 @@
 # questions.
 #
 
-agent.err.error			   = Errore
+agent.err.error                    = Errore
 agent.err.exception                = Eccezione dell'agente
-agent.err.warning		   = Avvertenza
+agent.err.warning                  = Avvertenza
 
 agent.err.configfile.notfound      = File di configurazione non trovato
 agent.err.configfile.failed        = Errore di lettura file di configurazione
 agent.err.configfile.closed.failed = Errore di chiusura file di configurazione
 agent.err.configfile.access.denied = Accesso negato al file di configurazione
 
-agent.err.exportaddress.failed	   = Errore di esportazione dell'indirizzo connettore JMX nel buffer strumenti
+agent.err.exportaddress.failed     = Errore di esportazione dell'indirizzo connettore JMX nel buffer strumenti
 
 agent.err.agentclass.notfound      = Classe agente gestione non trovata
 agent.err.agentclass.failed        = Errore classe agente gestione
@@ -62,7 +62,7 @@ agent.err.access.file.notfound     = File di accesso non trovato
 
 agent.err.connector.server.io.error = Errore di comunicazione server del connettore JMX
 
-agent.err.invalid.option	   = Specificata opzione non valida
+agent.err.invalid.option           = Specificata opzione non valida
 
 jmxremote.ConnectorBootstrap.starting = Avvio del server connettore JMX:
 jmxremote.ConnectorBootstrap.noAuthentication = Nessuna autenticazione
diff --git a/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_ja.properties b/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_ja.properties
index c63e5bd7385..0f19b3060d2 100644
--- a/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_ja.properties
+++ b/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_ja.properties
@@ -23,16 +23,16 @@
 # questions.
 #
 
-agent.err.error			   = エラー
+agent.err.error                    = エラー
 agent.err.exception                = エージェントが例外をスローしました
-agent.err.warning		   = 警告
+agent.err.warning                  = 警告
 
 agent.err.configfile.notfound      = 構成ファイルが見つかりません
 agent.err.configfile.failed        = 構成ファイルの読取りに失敗しました
 agent.err.configfile.closed.failed = 構成ファイルを閉じることができませんでした
 agent.err.configfile.access.denied = 構成ファイルへのアクセスが拒否されました
 
-agent.err.exportaddress.failed	   = JMXコネクタ・アドレスの計測バッファへのエクスポートが失敗しました
+agent.err.exportaddress.failed     = JMXコネクタ・アドレスの計測バッファへのエクスポートが失敗しました
 
 agent.err.agentclass.notfound      = 管理エージェント・クラスが見つかりません
 agent.err.agentclass.failed        = 管理エージェント・クラスが失敗しました
@@ -62,7 +62,7 @@ agent.err.access.file.notfound     = アクセス・ファイルが見つかり
 
 agent.err.connector.server.io.error = JMXコネクタ・サーバーの通信エラー
 
-agent.err.invalid.option	   = 無効なオプションが指定されました
+agent.err.invalid.option           = 無効なオプションが指定されました
 
 jmxremote.ConnectorBootstrap.starting = JMXコネクタ・サーバーを起動しています:
 jmxremote.ConnectorBootstrap.noAuthentication = 認証なし
diff --git a/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_ko.properties b/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_ko.properties
index 897c89e906b..9fabc5c0b36 100644
--- a/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_ko.properties
+++ b/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_ko.properties
@@ -23,16 +23,16 @@
 # questions.
 #
 
-agent.err.error			   = 오류
+agent.err.error                    = 오류
 agent.err.exception                = 에이전트에 예외사항이 발생했습니다.
-agent.err.warning		   = 경고
+agent.err.warning                  = 경고
 
 agent.err.configfile.notfound      = 구성 파일을 찾을 수 없습니다.
 agent.err.configfile.failed        = 구성 파일 읽기를 실패했습니다.
 agent.err.configfile.closed.failed = 구성 파일 닫기를 실패했습니다.
 agent.err.configfile.access.denied = 구성 파일에 대한 액세스가 거부되었습니다.
 
-agent.err.exportaddress.failed	   = 기기 버퍼로 JMX 커넥터 주소 익스포트를 실패했습니다.
+agent.err.exportaddress.failed     = 기기 버퍼로 JMX 커넥터 주소 익스포트를 실패했습니다.
 
 agent.err.agentclass.notfound      = 관리 에이전트 클래스를 찾을 수 없습니다.
 agent.err.agentclass.failed        = 관리 에이전트 클래스를 실패했습니다.
@@ -62,7 +62,7 @@ agent.err.access.file.notfound     = 액세스 파일을 찾을 수 없습니다
 
 agent.err.connector.server.io.error = JMX 커넥터 서버 통신 오류
 
-agent.err.invalid.option	   = 부적합한 옵션이 지정되었습니다.
+agent.err.invalid.option           = 부적합한 옵션이 지정되었습니다.
 
 jmxremote.ConnectorBootstrap.starting = JMX 커넥터 서버를 시작하는 중:
 jmxremote.ConnectorBootstrap.noAuthentication = 인증 없음
diff --git a/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_pt_BR.properties b/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_pt_BR.properties
index 3d1b3f9dc35..5343c8e16e7 100644
--- a/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_pt_BR.properties
+++ b/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_pt_BR.properties
@@ -23,16 +23,16 @@
 # questions.
 #
 
-agent.err.error			   = Erro
+agent.err.error                    = Erro
 agent.err.exception                = Exceção gerada pelo agente
-agent.err.warning		   = Advertência
+agent.err.warning                  = Advertência
 
 agent.err.configfile.notfound      = Arquivo de configuração não encontrado
 agent.err.configfile.failed        = Falha ao ler o arquivo de configuração
 agent.err.configfile.closed.failed = Falha ao fechar o arquivo de configuração
 agent.err.configfile.access.denied = Acesso negado ao arquivo de configuração
 
-agent.err.exportaddress.failed	   = Falha na exportação do endereço do conector JMX para o buffer de instrumentação
+agent.err.exportaddress.failed     = Falha na exportação do endereço do conector JMX para o buffer de instrumentação
 
 agent.err.agentclass.notfound      = Classe do agente de gerenciamento não encontrada
 agent.err.agentclass.failed        = Falha na classe do agente de gerenciamento
@@ -62,7 +62,7 @@ agent.err.access.file.notfound     = Arquivo de acesso não encontrado
 
 agent.err.connector.server.io.error = Erro de comunicação do servidor do conector JMX
 
-agent.err.invalid.option	   = Opção especificada inválida
+agent.err.invalid.option           = Opção especificada inválida
 
 jmxremote.ConnectorBootstrap.starting = Iniciando o Servidor do Conector JMX:
 jmxremote.ConnectorBootstrap.noAuthentication = Sem autenticação
diff --git a/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_sv.properties b/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_sv.properties
index 4c22ccb2996..a3c695df0eb 100644
--- a/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_sv.properties
+++ b/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_sv.properties
@@ -23,16 +23,16 @@
 # questions.
 #
 
-agent.err.error			   = Fel
+agent.err.error                    = Fel
 agent.err.exception                = Agenten orsakade ett undantag
-agent.err.warning		   = Varning
+agent.err.warning                  = Varning
 
 agent.err.configfile.notfound      = Konfigurationsfilen hittades inte
 agent.err.configfile.failed        = Kunde inte läsa konfigurationsfilen
 agent.err.configfile.closed.failed = Kunde inte stänga konfigurationsfilen
 agent.err.configfile.access.denied = Åtkomst till konfigurationsfilen nekad
 
-agent.err.exportaddress.failed	   = Kunde inte exportera JMX-anslutningsadressen till instrumentbufferten
+agent.err.exportaddress.failed     = Kunde inte exportera JMX-anslutningsadressen till instrumentbufferten
 
 agent.err.agentclass.notfound      = Administrationsagentklassen hittades inte
 agent.err.agentclass.failed        = Administrationsagentklassen utfördes inte
@@ -62,7 +62,7 @@ agent.err.access.file.notfound     = Access-filen hittades inte
 
 agent.err.connector.server.io.error = Serverkommunikationsfel för JMX-anslutning
 
-agent.err.invalid.option	   = Det angivna alternativet är ogiltigt
+agent.err.invalid.option           = Det angivna alternativet är ogiltigt
 
 jmxremote.ConnectorBootstrap.starting = Startar server för JMX-anslutning:
 jmxremote.ConnectorBootstrap.noAuthentication = Ingen autentisering
diff --git a/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_zh_CN.properties b/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_zh_CN.properties
index 10853480525..5d33a024cce 100644
--- a/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_zh_CN.properties
+++ b/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_zh_CN.properties
@@ -23,16 +23,16 @@
 # questions.
 #
 
-agent.err.error			   = 错误
+agent.err.error                    = 错误
 agent.err.exception                = 代理抛出异常错误
-agent.err.warning		   = 警告
+agent.err.warning                  = 警告
 
 agent.err.configfile.notfound      = 找不到配置文件
 agent.err.configfile.failed        = 未能读取配置文件
 agent.err.configfile.closed.failed = 未能关闭配置文件
 agent.err.configfile.access.denied = 拒绝访问配置文件
 
-agent.err.exportaddress.failed	   = 未能将 JMX 连接器地址导出到检测缓冲区
+agent.err.exportaddress.failed     = 未能将 JMX 连接器地址导出到检测缓冲区
 
 agent.err.agentclass.notfound      = 找不到管理代理类
 agent.err.agentclass.failed        = 管理代理类失败
@@ -62,7 +62,7 @@ agent.err.access.file.notfound     = 找不到访问文件
 
 agent.err.connector.server.io.error = JMX 连接器服务器通信错误
 
-agent.err.invalid.option	   = 指定的选项无效
+agent.err.invalid.option           = 指定的选项无效
 
 jmxremote.ConnectorBootstrap.starting = 正在启动 JMX 连接器服务器:
 jmxremote.ConnectorBootstrap.noAuthentication = 无验证
diff --git a/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_zh_TW.properties b/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_zh_TW.properties
index 84d501e7303..51cf0186825 100644
--- a/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_zh_TW.properties
+++ b/src/jdk.management.agent/share/classes/jdk/internal/agent/resources/agent_zh_TW.properties
@@ -23,16 +23,16 @@
 # questions.
 #
 
-agent.err.error			   = 錯誤
+agent.err.error                    = 錯誤
 agent.err.exception                = 代理程式發生異常
-agent.err.warning		   = 警告
+agent.err.warning                  = 警告
 
 agent.err.configfile.notfound      = 找不到設定檔案
 agent.err.configfile.failed        = 無法讀取設定檔案
 agent.err.configfile.closed.failed = 無法關閉設定檔案
 agent.err.configfile.access.denied = 存取設定檔案遭到拒絕
 
-agent.err.exportaddress.failed	   = 將 JMX 連接器位址匯出至設備緩衝區失敗
+agent.err.exportaddress.failed     = 將 JMX 連接器位址匯出至設備緩衝區失敗
 
 agent.err.agentclass.notfound      = 找不到管理代理程式類別
 agent.err.agentclass.failed        = 管理代理程式類別失敗
@@ -62,7 +62,7 @@ agent.err.access.file.notfound     = 找不到存取檔案
 
 agent.err.connector.server.io.error = JMX 連接器伺服器通訊錯誤
 
-agent.err.invalid.option	   = 指定的選項無效
+agent.err.invalid.option           = 指定的選項無效
 
 jmxremote.ConnectorBootstrap.starting = 正在啟動 JMX 連接器伺服器:
 jmxremote.ConnectorBootstrap.noAuthentication = 無認證
diff --git a/src/jdk.management.agent/share/conf/management.properties b/src/jdk.management.agent/share/conf/management.properties
index 264fe4ba487..f441e558978 100644
--- a/src/jdk.management.agent/share/conf/management.properties
+++ b/src/jdk.management.agent/share/conf/management.properties
@@ -1,5 +1,5 @@
 #####################################################################
-#	Default Configuration File for Java Platform Management
+#       Default Configuration File for Java Platform Management
 #####################################################################
 #
 # The Management Configuration file (in java.util.Properties format)
@@ -49,7 +49,7 @@
 # com.sun.management.enableThreadContentionMonitoring
 
 #####################################################################
-#			RMI Management Properties
+#                       RMI Management Properties
 #####################################################################
 #
 # If system property -Dcom.sun.management.jmxremote.port=<port-number>
@@ -324,4 +324,3 @@ java.rmi.dgc.*;\
 java.rmi.server.*;\
 javax.security.auth.Subject;\
 !*
-
diff --git a/test/hotspot/jtreg/containers/docker/JfrReporter.java b/test/hotspot/jtreg/containers/docker/JfrReporter.java
index ffb416f7336..24692b20a62 100644
--- a/test/hotspot/jtreg/containers/docker/JfrReporter.java
+++ b/test/hotspot/jtreg/containers/docker/JfrReporter.java
@@ -51,4 +51,3 @@ public class JfrReporter {
         }
     }
 }
-  
\ No newline at end of file
diff --git a/test/jdk/java/io/Serializable/serialFilter/logging.properties b/test/jdk/java/io/Serializable/serialFilter/logging.properties
index b8777c62b4b..f0a24de0308 100644
--- a/test/jdk/java/io/Serializable/serialFilter/logging.properties
+++ b/test/jdk/java/io/Serializable/serialFilter/logging.properties
@@ -1,5 +1,5 @@
 ############################################################
-#  	Enable logging of all serialization levels to the console
+#       Enable logging of all serialization levels to the console
 ############################################################
 
 handlers= java.util.logging.ConsoleHandler
diff --git a/test/jdk/java/lang/ProcessBuilder/ProcessLogging-FINE.properties b/test/jdk/java/lang/ProcessBuilder/ProcessLogging-FINE.properties
index 45f4b3c342d..96fed664b42 100644
--- a/test/jdk/java/lang/ProcessBuilder/ProcessLogging-FINE.properties
+++ b/test/jdk/java/lang/ProcessBuilder/ProcessLogging-FINE.properties
@@ -1,5 +1,5 @@
 ############################################################
-#  	Enable logging java.lang.ProcessBuilder to the console
+#       Enable logging java.lang.ProcessBuilder to the console
 ############################################################
 
 handlers= java.util.logging.ConsoleHandler
diff --git a/test/jdk/java/lang/ProcessBuilder/ProcessLogging-FINER.properties b/test/jdk/java/lang/ProcessBuilder/ProcessLogging-FINER.properties
index 3986d99f46b..ec75d07ebc1 100644
--- a/test/jdk/java/lang/ProcessBuilder/ProcessLogging-FINER.properties
+++ b/test/jdk/java/lang/ProcessBuilder/ProcessLogging-FINER.properties
@@ -1,5 +1,5 @@
 ############################################################
-#  	Enable logging java.lang.ProcessBuilder to the console
+#       Enable logging java.lang.ProcessBuilder to the console
 ############################################################
 
 handlers= java.util.logging.ConsoleHandler
diff --git a/test/jdk/java/lang/ProcessBuilder/ProcessLogging-INFO.properties b/test/jdk/java/lang/ProcessBuilder/ProcessLogging-INFO.properties
index f7b50e8aad2..e8c48bd10d3 100644
--- a/test/jdk/java/lang/ProcessBuilder/ProcessLogging-INFO.properties
+++ b/test/jdk/java/lang/ProcessBuilder/ProcessLogging-INFO.properties
@@ -1,5 +1,5 @@
 ############################################################
-#  	Enable logging java.lang.ProcessBuilder to the console
+#       Enable logging java.lang.ProcessBuilder to the console
 ############################################################
 
 handlers= java.util.logging.ConsoleHandler
diff --git a/test/jdk/java/lang/RuntimeTests/ExitLogging-FINE.properties b/test/jdk/java/lang/RuntimeTests/ExitLogging-FINE.properties
index 21b19fa5ac8..6afd902c2d0 100644
--- a/test/jdk/java/lang/RuntimeTests/ExitLogging-FINE.properties
+++ b/test/jdk/java/lang/RuntimeTests/ExitLogging-FINE.properties
@@ -1,5 +1,5 @@
 ############################################################
-#  	Enable logging java.lang.Runtime to the console
+#       Enable logging java.lang.Runtime to the console
 ############################################################
 
 handlers= java.util.logging.ConsoleHandler
diff --git a/test/jdk/java/lang/RuntimeTests/ExitLogging-INFO.properties b/test/jdk/java/lang/RuntimeTests/ExitLogging-INFO.properties
index 212d9bd86d2..d44a836c760 100644
--- a/test/jdk/java/lang/RuntimeTests/ExitLogging-INFO.properties
+++ b/test/jdk/java/lang/RuntimeTests/ExitLogging-INFO.properties
@@ -1,5 +1,5 @@
 ############################################################
-#  	Enable logging java.lang.Runtime to the console
+#       Enable logging java.lang.Runtime to the console
 ############################################################
 
 handlers= java.util.logging.ConsoleHandler
diff --git a/test/jdk/java/lang/System/LoggerFinder/SignedLoggerFinderTest/logging.properties b/test/jdk/java/lang/System/LoggerFinder/SignedLoggerFinderTest/logging.properties
index 33595267e5e..7bed3251247 100644
--- a/test/jdk/java/lang/System/LoggerFinder/SignedLoggerFinderTest/logging.properties
+++ b/test/jdk/java/lang/System/LoggerFinder/SignedLoggerFinderTest/logging.properties
@@ -1,5 +1,5 @@
 ############################################################
-#  	Configuration file for log testing
+#       Configuration file for log testing
 #
 ############################################################
 
@@ -11,4 +11,3 @@ java.util.logging.ConsoleHandler.level = FINE
 java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter
 
 jdk.event.security.level = FINE
-
diff --git a/test/jdk/java/util/Currency/currency.properties b/test/jdk/java/util/Currency/currency.properties
index 1b6807f3757..ff5259e5933 100644
--- a/test/jdk/java/util/Currency/currency.properties
+++ b/test/jdk/java/util/Currency/currency.properties
@@ -15,7 +15,7 @@ MF=MFF,555,9
 NO=EUR   ,978  ,2,  2099-01-01T00:00:00
 SB=EUR,111,2, 2099-01-01T00:00:00
 US=euR,978,2,2001-01-01T00:00:00
-ZZ	=	ZZZ	,	999	,	3
+ZZ\t=\tZZZ\t,\t999\t,\t3
 
 # invalid entries
 DE=2009-01-01T00:00:00,EUR,111,2
diff --git a/test/jdk/java/util/jar/JarFile/jarVerification/logging.properties b/test/jdk/java/util/jar/JarFile/jarVerification/logging.properties
index 0ab0c516b1a..7bed3251247 100644
--- a/test/jdk/java/util/jar/JarFile/jarVerification/logging.properties
+++ b/test/jdk/java/util/jar/JarFile/jarVerification/logging.properties
@@ -1,5 +1,5 @@
 ############################################################
-#  	Configuration file for log testing
+#       Configuration file for log testing
 #
 ############################################################
 
diff --git a/test/jdk/java/util/logging/LogManager/Configuration/rootLoggerHandlers/badglobal.properties b/test/jdk/java/util/logging/LogManager/Configuration/rootLoggerHandlers/badglobal.properties
index 5e4e18f3197..3bf817b1734 100644
--- a/test/jdk/java/util/logging/LogManager/Configuration/rootLoggerHandlers/badglobal.properties
+++ b/test/jdk/java/util/logging/LogManager/Configuration/rootLoggerHandlers/badglobal.properties
@@ -1,5 +1,5 @@
 ############################################################
-#  	Global properties
+#       Global properties
 ############################################################
 
 # "handlers" specifies a comma separated list of log Handler
@@ -16,4 +16,3 @@ global.handlers = 1custom.GlobalHandler, custom.GlobalHandler
 custom.Handler.level=ALL
 custom.DotHandler.level=ALL
 java.util.logging.SimpleFormatter.format=%4$s [%1$tc]: %2$s: %5$s%n
-
diff --git a/test/jdk/java/util/logging/LogManager/Configuration/rootLoggerHandlers/badlogging.properties b/test/jdk/java/util/logging/LogManager/Configuration/rootLoggerHandlers/badlogging.properties
index 20b731af5a4..95737daf7e4 100644
--- a/test/jdk/java/util/logging/LogManager/Configuration/rootLoggerHandlers/badlogging.properties
+++ b/test/jdk/java/util/logging/LogManager/Configuration/rootLoggerHandlers/badlogging.properties
@@ -1,5 +1,5 @@
 ############################################################
-#  	Global properties
+#       Global properties
 ############################################################
 
 # "handlers" specifies a comma separated list of log Handler
@@ -15,4 +15,3 @@ handlers= custom.Handler
 custom.Handler.level=ALL
 custom.DotHandler.level=ALL
 java.util.logging.SimpleFormatter.format=%4$s [%1$tc]: %2$s: %5$s%n
-
diff --git a/test/jdk/java/util/logging/LogManager/Configuration/rootLoggerHandlers/logging.properties b/test/jdk/java/util/logging/LogManager/Configuration/rootLoggerHandlers/logging.properties
index fe302b5d99f..0a259e0086b 100644
--- a/test/jdk/java/util/logging/LogManager/Configuration/rootLoggerHandlers/logging.properties
+++ b/test/jdk/java/util/logging/LogManager/Configuration/rootLoggerHandlers/logging.properties
@@ -1,5 +1,5 @@
 ############################################################
-#  	Global properties
+#       Global properties
 ############################################################
 
 # "handlers" specifies a comma separated list of log Handler
@@ -17,4 +17,3 @@ custom.Handler.level=ALL
 custom.DotHandler.level=ALL
 custom.GlobalHandler.level=ALL
 java.util.logging.SimpleFormatter.format=%4$s [%1$tc]: %2$s: %5$s%n
-
diff --git a/test/jdk/java/util/logging/modules/LogManagerInModule/logging.properties b/test/jdk/java/util/logging/modules/LogManagerInModule/logging.properties
index 21341ce4e82..03fe670a80a 100644
--- a/test/jdk/java/util/logging/modules/LogManagerInModule/logging.properties
+++ b/test/jdk/java/util/logging/modules/LogManagerInModule/logging.properties
@@ -1,5 +1,5 @@
 ############################################################
-#  	Global properties
+#       Global properties
 ############################################################
 
 # "handlers" specifies a comma separated list of log Handler
diff --git a/test/jdk/jdk/security/logging/logging.properties b/test/jdk/jdk/security/logging/logging.properties
index 0ab0c516b1a..7bed3251247 100644
--- a/test/jdk/jdk/security/logging/logging.properties
+++ b/test/jdk/jdk/security/logging/logging.properties
@@ -1,5 +1,5 @@
 ############################################################
-#  	Configuration file for log testing
+#       Configuration file for log testing
 #
 ############################################################
 
diff --git a/test/jdk/sun/management/LoggingTest/logging.properties b/test/jdk/sun/management/LoggingTest/logging.properties
index bf2e5c5abe9..38b8c258785 100644
--- a/test/jdk/sun/management/LoggingTest/logging.properties
+++ b/test/jdk/sun/management/LoggingTest/logging.properties
@@ -1,5 +1,5 @@
 ############################################################
-#  	Global properties
+#       Global properties
 ############################################################
 
 # "handlers" specifies a comma separated list of log Handler
diff --git a/test/jdk/sun/management/jmxremote/bootstrap/rmiregistry.properties b/test/jdk/sun/management/jmxremote/bootstrap/rmiregistry.properties
index 7e58a5c9ec5..be565c42d19 100644
--- a/test/jdk/sun/management/jmxremote/bootstrap/rmiregistry.properties
+++ b/test/jdk/sun/management/jmxremote/bootstrap/rmiregistry.properties
@@ -1,5 +1,5 @@
 #####################################################################
-#	Default Configuration File for Java Platform Management
+#       Default Configuration File for Java Platform Management
 #####################################################################
 #
 # The Management Configuration file (in java.util.Properties format)
@@ -47,7 +47,7 @@ com.sun.management.jmxremote.port=${getFreePort}
 # com.sun.management.enableThreadContentionMonitoring
 
 #####################################################################
-#			RMI Management Properties
+#                       RMI Management Properties
 #####################################################################
 #
 # If system property -Dcom.sun.management.jmxremote.port=<port-number>
diff --git a/test/jdk/sun/management/jmxremote/bootstrap/rmiregistryssl.properties b/test/jdk/sun/management/jmxremote/bootstrap/rmiregistryssl.properties
index eba629f16cd..3dce9abe67d 100644
--- a/test/jdk/sun/management/jmxremote/bootstrap/rmiregistryssl.properties
+++ b/test/jdk/sun/management/jmxremote/bootstrap/rmiregistryssl.properties
@@ -1,5 +1,5 @@
 #####################################################################
-#	Default Configuration File for Java Platform Management
+#       Default Configuration File for Java Platform Management
 #####################################################################
 #
 # The Management Configuration file (in java.util.Properties format)
@@ -47,7 +47,7 @@ com.sun.management.jmxremote.port=${getFreePort}
 # com.sun.management.enableThreadContentionMonitoring
 
 #####################################################################
-#			RMI Management Properties
+#                       RMI Management Properties
 #####################################################################
 #
 # If system property -Dcom.sun.management.jmxremote.port=<port-number>