Removed unnecessary pki folder.

Previously the source code was located inside a pki folder.
This folder was created during svn migration and is no longer
needed. This folder has now been removed and the contents have
been moved up one level.

Ticket #131

3806 files changed, 0 insertions, 5 deletions

diff --git a/pki/.classpath b/.classpath
index e216eb943..e216eb943 100644
--- a/pki/.classpath
+++ b/.classpath
diff --git a/.gitignore b/.gitignore
index aa25dac5d..4b66852c5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,2 @@
-pki/build/
 .metadata/
 build/
-packages.*/
-packages/
-
-
diff --git a/pki/.project b/.project
index 14c8367b4..14c8367b4 100644
--- a/pki/.project
+++ b/.project
diff --git a/pki/.pydevproject b/.pydevproject
index a9cca037b..a9cca037b 100644
--- a/pki/.pydevproject
+++ b/.pydevproject
diff --git a/pki/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
index b5e44d72d..b5e44d72d 100644
--- a/pki/.settings/org.eclipse.jdt.core.prefs
+++ b/.settings/org.eclipse.jdt.core.prefs
diff --git a/pki/.settings/org.eclipse.jdt.ui.prefs b/.settings/org.eclipse.jdt.ui.prefs
index 026b7c9c7..026b7c9c7 100644
--- a/pki/.settings/org.eclipse.jdt.ui.prefs
+++ b/.settings/org.eclipse.jdt.ui.prefs
diff --git a/pki/CMakeLists.txt b/CMakeLists.txt
index 953250259..953250259 100644
--- a/pki/CMakeLists.txt
+++ b/CMakeLists.txt
diff --git a/pki/COPYING b/COPYING
index e69de29bb..e69de29bb 100644
--- a/pki/COPYING
+++ b/COPYING
diff --git a/pki/CPackConfig.cmake b/CPackConfig.cmake
index afdcdbddc..afdcdbddc 100644
--- a/pki/CPackConfig.cmake
+++ b/CPackConfig.cmake
diff --git a/pki/ConfigureChecks.cmake b/ConfigureChecks.cmake
index 75a8f16a0..75a8f16a0 100644
--- a/pki/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
diff --git a/pki/DefineOptions.cmake b/DefineOptions.cmake
index f769ac458..f769ac458 100644
--- a/pki/DefineOptions.cmake
+++ b/DefineOptions.cmake
diff --git a/pki/README b/README
index 2c2c36b8a..2c2c36b8a 100644
--- a/pki/README
+++ b/README
diff --git a/pki/base/CMakeLists.txt b/base/CMakeLists.txt
index 1c6e909ad..1c6e909ad 100644
--- a/pki/base/CMakeLists.txt
+++ b/base/CMakeLists.txt
diff --git a/pki/base/ca/CMakeLists.txt b/base/ca/CMakeLists.txt
index 153208c2d..153208c2d 100644
--- a/pki/base/ca/CMakeLists.txt
+++ b/base/ca/CMakeLists.txt
diff --git a/pki/base/ca/LICENSE b/base/ca/LICENSE
index e281f4362..e281f4362 100644
--- a/pki/base/ca/LICENSE
+++ b/base/ca/LICENSE
diff --git a/pki/base/ca/setup/CMakeLists.txt b/base/ca/setup/CMakeLists.txt
index f5f069cdb..f5f069cdb 100644
--- a/pki/base/ca/setup/CMakeLists.txt
+++ b/base/ca/setup/CMakeLists.txt
diff --git a/pki/base/ca/setup/registry_instance b/base/ca/setup/registry_instance
index 3210b9131..3210b9131 100644
--- a/pki/base/ca/setup/registry_instance
+++ b/base/ca/setup/registry_instance
diff --git a/pki/base/ca/shared/conf/CMakeLists.txt b/base/ca/shared/conf/CMakeLists.txt
index e3cef5915..e3cef5915 100644
--- a/pki/base/ca/shared/conf/CMakeLists.txt
+++ b/base/ca/shared/conf/CMakeLists.txt
diff --git a/pki/base/ca/shared/conf/CS.cfg.in b/base/ca/shared/conf/CS.cfg.in
index 980ed5854..980ed5854 100644
--- a/pki/base/ca/shared/conf/CS.cfg.in
+++ b/base/ca/shared/conf/CS.cfg.in
diff --git a/pki/base/ca/shared/conf/acl.ldif b/base/ca/shared/conf/acl.ldif
index ceea1f27a..ceea1f27a 100644
--- a/pki/base/ca/shared/conf/acl.ldif
+++ b/base/ca/shared/conf/acl.ldif
diff --git a/pki/base/ca/shared/conf/adminCert.profile b/base/ca/shared/conf/adminCert.profile
index 5e84d7492..5e84d7492 100644
--- a/pki/base/ca/shared/conf/adminCert.profile
+++ b/base/ca/shared/conf/adminCert.profile
diff --git a/pki/base/ca/shared/conf/caAuditSigningCert.profile b/base/ca/shared/conf/caAuditSigningCert.profile
index 5983a186c..5983a186c 100644
--- a/pki/base/ca/shared/conf/caAuditSigningCert.profile
+++ b/base/ca/shared/conf/caAuditSigningCert.profile
diff --git a/pki/base/ca/shared/conf/caCert.profile b/base/ca/shared/conf/caCert.profile
index 3e9c83613..3e9c83613 100644
--- a/pki/base/ca/shared/conf/caCert.profile
+++ b/base/ca/shared/conf/caCert.profile
diff --git a/pki/base/ca/shared/conf/caOCSPCert.profile b/base/ca/shared/conf/caOCSPCert.profile
index b3c27c1b0..b3c27c1b0 100644
--- a/pki/base/ca/shared/conf/caOCSPCert.profile
+++ b/base/ca/shared/conf/caOCSPCert.profile
diff --git a/pki/base/ca/shared/conf/catalina.policy b/base/ca/shared/conf/catalina.policy
index cf8302cd0..cf8302cd0 100644
--- a/pki/base/ca/shared/conf/catalina.policy
+++ b/base/ca/shared/conf/catalina.policy
diff --git a/pki/base/ca/shared/conf/catalina.properties b/base/ca/shared/conf/catalina.properties
index 70cb7c05e..70cb7c05e 100644
--- a/pki/base/ca/shared/conf/catalina.properties
+++ b/base/ca/shared/conf/catalina.properties
diff --git a/pki/base/ca/shared/conf/context.xml b/base/ca/shared/conf/context.xml
index 8b6fe4905..8b6fe4905 100644
--- a/pki/base/ca/shared/conf/context.xml
+++ b/base/ca/shared/conf/context.xml
diff --git a/pki/base/ca/shared/conf/database.ldif b/base/ca/shared/conf/database.ldif
index 4dfdcea69..4dfdcea69 100644
--- a/pki/base/ca/shared/conf/database.ldif
+++ b/base/ca/shared/conf/database.ldif
diff --git a/pki/base/ca/shared/conf/db.ldif b/base/ca/shared/conf/db.ldif
index 00fa919b7..00fa919b7 100644
--- a/pki/base/ca/shared/conf/db.ldif
+++ b/base/ca/shared/conf/db.ldif
diff --git a/pki/base/ca/shared/conf/flatfile.txt b/base/ca/shared/conf/flatfile.txt
index 75defd1da..75defd1da 100644
--- a/pki/base/ca/shared/conf/flatfile.txt
+++ b/base/ca/shared/conf/flatfile.txt
diff --git a/pki/base/ca/shared/conf/index.ldif b/base/ca/shared/conf/index.ldif
index 4bc8aebf9..4bc8aebf9 100644
--- a/pki/base/ca/shared/conf/index.ldif
+++ b/base/ca/shared/conf/index.ldif
diff --git a/pki/base/ca/shared/conf/jk2.manifest b/base/ca/shared/conf/jk2.manifest
index 986d7b874..986d7b874 100644
--- a/pki/base/ca/shared/conf/jk2.manifest
+++ b/base/ca/shared/conf/jk2.manifest
diff --git a/pki/base/ca/shared/conf/jk2.properties b/base/ca/shared/conf/jk2.properties
index 093bae802..093bae802 100644
--- a/pki/base/ca/shared/conf/jk2.properties
+++ b/base/ca/shared/conf/jk2.properties
diff --git a/pki/base/ca/shared/conf/jkconf.ant.xml b/base/ca/shared/conf/jkconf.ant.xml
index 245cf98e2..245cf98e2 100644
--- a/pki/base/ca/shared/conf/jkconf.ant.xml
+++ b/base/ca/shared/conf/jkconf.ant.xml
diff --git a/pki/base/ca/shared/conf/jkconfig.manifest b/base/ca/shared/conf/jkconfig.manifest
index 3ba1f2e3e..3ba1f2e3e 100644
--- a/pki/base/ca/shared/conf/jkconfig.manifest
+++ b/base/ca/shared/conf/jkconfig.manifest
diff --git a/pki/base/ca/shared/conf/logging.properties b/base/ca/shared/conf/logging.properties
index 796cfc071..796cfc071 100644
--- a/pki/base/ca/shared/conf/logging.properties
+++ b/base/ca/shared/conf/logging.properties
diff --git a/pki/base/ca/shared/conf/manager.ldif b/base/ca/shared/conf/manager.ldif
index 52e486987..52e486987 100644
--- a/pki/base/ca/shared/conf/manager.ldif
+++ b/base/ca/shared/conf/manager.ldif
diff --git a/pki/base/ca/shared/conf/proxy.conf b/base/ca/shared/conf/proxy.conf
index 663ba5722..663ba5722 100644
--- a/pki/base/ca/shared/conf/proxy.conf
+++ b/base/ca/shared/conf/proxy.conf
diff --git a/pki/base/ca/shared/conf/registry.cfg b/base/ca/shared/conf/registry.cfg
index f424bdb1b..f424bdb1b 100644
--- a/pki/base/ca/shared/conf/registry.cfg
+++ b/base/ca/shared/conf/registry.cfg
diff --git a/pki/base/ca/shared/conf/schema.ldif b/base/ca/shared/conf/schema.ldif
index 70578e21c..70578e21c 100644
--- a/pki/base/ca/shared/conf/schema.ldif
+++ b/base/ca/shared/conf/schema.ldif
diff --git a/pki/base/ca/shared/conf/server-minimal.xml b/base/ca/shared/conf/server-minimal.xml
index 7b542b6cf..7b542b6cf 100644
--- a/pki/base/ca/shared/conf/server-minimal.xml
+++ b/base/ca/shared/conf/server-minimal.xml
diff --git a/pki/base/ca/shared/conf/server.xml b/base/ca/shared/conf/server.xml
index 4056fbbb7..4056fbbb7 100644
--- a/pki/base/ca/shared/conf/server.xml
+++ b/base/ca/shared/conf/server.xml
diff --git a/pki/base/ca/shared/conf/serverCert.profile b/base/ca/shared/conf/serverCert.profile
index 8b436b247..8b436b247 100644
--- a/pki/base/ca/shared/conf/serverCert.profile
+++ b/base/ca/shared/conf/serverCert.profile
diff --git a/pki/base/ca/shared/conf/serverCertNick.conf b/base/ca/shared/conf/serverCertNick.conf
index 1b1f4fcad..1b1f4fcad 100644
--- a/pki/base/ca/shared/conf/serverCertNick.conf
+++ b/base/ca/shared/conf/serverCertNick.conf
diff --git a/pki/base/ca/shared/conf/shm.manifest b/base/ca/shared/conf/shm.manifest
index 0505c085b..0505c085b 100644
--- a/pki/base/ca/shared/conf/shm.manifest
+++ b/base/ca/shared/conf/shm.manifest
diff --git a/pki/base/ca/shared/conf/subsystemCert.profile b/base/ca/shared/conf/subsystemCert.profile
index 658e69511..658e69511 100644
--- a/pki/base/ca/shared/conf/subsystemCert.profile
+++ b/base/ca/shared/conf/subsystemCert.profile
diff --git a/pki/base/ca/shared/conf/tomcat-jk2.manifest b/base/ca/shared/conf/tomcat-jk2.manifest
index acfef4a90..acfef4a90 100644
--- a/pki/base/ca/shared/conf/tomcat-jk2.manifest
+++ b/base/ca/shared/conf/tomcat-jk2.manifest
diff --git a/pki/base/ca/shared/conf/tomcat-users.xml b/base/ca/shared/conf/tomcat-users.xml
index daa9260cc..daa9260cc 100644
--- a/pki/base/ca/shared/conf/tomcat-users.xml
+++ b/base/ca/shared/conf/tomcat-users.xml
diff --git a/pki/base/ca/shared/conf/tomcat6.conf b/base/ca/shared/conf/tomcat6.conf
index 2d7def5ec..2d7def5ec 100644
--- a/pki/base/ca/shared/conf/tomcat6.conf
+++ b/base/ca/shared/conf/tomcat6.conf
diff --git a/pki/base/ca/shared/conf/uriworkermap.properties b/base/ca/shared/conf/uriworkermap.properties
index c65445b10..c65445b10 100644
--- a/pki/base/ca/shared/conf/uriworkermap.properties
+++ b/base/ca/shared/conf/uriworkermap.properties
diff --git a/pki/base/ca/shared/conf/vlv.ldif b/base/ca/shared/conf/vlv.ldif
index a3b574608..a3b574608 100644
--- a/pki/base/ca/shared/conf/vlv.ldif
+++ b/base/ca/shared/conf/vlv.ldif
diff --git a/pki/base/ca/shared/conf/vlvtasks.ldif b/base/ca/shared/conf/vlvtasks.ldif
index 5458e8a28..5458e8a28 100644
--- a/pki/base/ca/shared/conf/vlvtasks.ldif
+++ b/base/ca/shared/conf/vlvtasks.ldif
diff --git a/pki/base/ca/shared/conf/web.xml b/base/ca/shared/conf/web.xml
index fb22468ee..fb22468ee 100644
--- a/pki/base/ca/shared/conf/web.xml
+++ b/base/ca/shared/conf/web.xml
diff --git a/pki/base/ca/shared/conf/workers.properties b/base/ca/shared/conf/workers.properties
index 50d88557f..50d88557f 100644
--- a/pki/base/ca/shared/conf/workers.properties
+++ b/base/ca/shared/conf/workers.properties
diff --git a/pki/base/ca/shared/conf/workers.properties.minimal b/base/ca/shared/conf/workers.properties.minimal
index e3b5942c2..e3b5942c2 100644
--- a/pki/base/ca/shared/conf/workers.properties.minimal
+++ b/base/ca/shared/conf/workers.properties.minimal
diff --git a/pki/base/ca/shared/conf/workers2.properties b/base/ca/shared/conf/workers2.properties
index 778118ff2..778118ff2 100644
--- a/pki/base/ca/shared/conf/workers2.properties
+++ b/base/ca/shared/conf/workers2.properties
diff --git a/pki/base/ca/shared/conf/workers2.properties.minimal b/base/ca/shared/conf/workers2.properties.minimal
index 41a0ba6c1..41a0ba6c1 100644
--- a/pki/base/ca/shared/conf/workers2.properties.minimal
+++ b/base/ca/shared/conf/workers2.properties.minimal
diff --git a/pki/base/ca/shared/emails/ExpiredUnpublishJob b/base/ca/shared/emails/ExpiredUnpublishJob
index 902125ee6..902125ee6 100644
--- a/pki/base/ca/shared/emails/ExpiredUnpublishJob
+++ b/base/ca/shared/emails/ExpiredUnpublishJob
diff --git a/pki/base/ca/shared/emails/ExpiredUnpublishJobItem b/base/ca/shared/emails/ExpiredUnpublishJobItem
index cb60a2b7d..cb60a2b7d 100644
--- a/pki/base/ca/shared/emails/ExpiredUnpublishJobItem
+++ b/base/ca/shared/emails/ExpiredUnpublishJobItem
diff --git a/pki/base/ca/shared/emails/certIssued_CA b/base/ca/shared/emails/certIssued_CA
index af2d2de9c..af2d2de9c 100644
--- a/pki/base/ca/shared/emails/certIssued_CA
+++ b/base/ca/shared/emails/certIssued_CA
diff --git a/pki/base/ca/shared/emails/certIssued_CA.html b/base/ca/shared/emails/certIssued_CA.html
index b380346ac..b380346ac 100644
--- a/pki/base/ca/shared/emails/certIssued_CA.html
+++ b/base/ca/shared/emails/certIssued_CA.html
diff --git a/pki/base/ca/shared/emails/certIssued_RA b/base/ca/shared/emails/certIssued_RA
index 7bde6875b..7bde6875b 100644
--- a/pki/base/ca/shared/emails/certIssued_RA
+++ b/base/ca/shared/emails/certIssued_RA
diff --git a/pki/base/ca/shared/emails/certIssued_RA.html b/base/ca/shared/emails/certIssued_RA.html
index 2d7d2e36e..2d7d2e36e 100644
--- a/pki/base/ca/shared/emails/certIssued_RA.html
+++ b/base/ca/shared/emails/certIssued_RA.html
diff --git a/pki/base/ca/shared/emails/certRequestRejected.html b/base/ca/shared/emails/certRequestRejected.html
index 9cfa92d79..9cfa92d79 100644
--- a/pki/base/ca/shared/emails/certRequestRejected.html
+++ b/base/ca/shared/emails/certRequestRejected.html
diff --git a/pki/base/ca/shared/emails/certRevoked_CA b/base/ca/shared/emails/certRevoked_CA
index 3539ceaf3..3539ceaf3 100644
--- a/pki/base/ca/shared/emails/certRevoked_CA
+++ b/base/ca/shared/emails/certRevoked_CA
diff --git a/pki/base/ca/shared/emails/certRevoked_CA.html b/base/ca/shared/emails/certRevoked_CA.html
index 025a0c94e..025a0c94e 100644
--- a/pki/base/ca/shared/emails/certRevoked_CA.html
+++ b/base/ca/shared/emails/certRevoked_CA.html
diff --git a/pki/base/ca/shared/emails/certRevoked_RA b/base/ca/shared/emails/certRevoked_RA
index 3539ceaf3..3539ceaf3 100644
--- a/pki/base/ca/shared/emails/certRevoked_RA
+++ b/base/ca/shared/emails/certRevoked_RA
diff --git a/pki/base/ca/shared/emails/certRevoked_RA.html b/base/ca/shared/emails/certRevoked_RA.html
index 025a0c94e..025a0c94e 100644
--- a/pki/base/ca/shared/emails/certRevoked_RA.html
+++ b/base/ca/shared/emails/certRevoked_RA.html
diff --git a/pki/base/ca/shared/emails/euJob1.html b/base/ca/shared/emails/euJob1.html
index 86bae4a52..86bae4a52 100644
--- a/pki/base/ca/shared/emails/euJob1.html
+++ b/base/ca/shared/emails/euJob1.html
diff --git a/pki/base/ca/shared/emails/euJob1Item.html b/base/ca/shared/emails/euJob1Item.html
index 94732e4c3..94732e4c3 100644
--- a/pki/base/ca/shared/emails/euJob1Item.html
+++ b/base/ca/shared/emails/euJob1Item.html
diff --git a/pki/base/ca/shared/emails/publishCerts.html b/base/ca/shared/emails/publishCerts.html
index c53f01fb6..c53f01fb6 100644
--- a/pki/base/ca/shared/emails/publishCerts.html
+++ b/base/ca/shared/emails/publishCerts.html
diff --git a/pki/base/ca/shared/emails/publishCertsItem.html b/base/ca/shared/emails/publishCertsItem.html
index 94732e4c3..94732e4c3 100644
--- a/pki/base/ca/shared/emails/publishCertsItem.html
+++ b/base/ca/shared/emails/publishCertsItem.html
diff --git a/pki/base/ca/shared/emails/reqInQueue_CA b/base/ca/shared/emails/reqInQueue_CA
index 7916ba5b4..7916ba5b4 100644
--- a/pki/base/ca/shared/emails/reqInQueue_CA
+++ b/base/ca/shared/emails/reqInQueue_CA
diff --git a/pki/base/ca/shared/emails/reqInQueue_CA.html b/base/ca/shared/emails/reqInQueue_CA.html
index 3ccaac1fe..3ccaac1fe 100644
--- a/pki/base/ca/shared/emails/reqInQueue_CA.html
+++ b/base/ca/shared/emails/reqInQueue_CA.html
diff --git a/pki/base/ca/shared/emails/reqInQueue_RA b/base/ca/shared/emails/reqInQueue_RA
index 41fa62b8a..41fa62b8a 100644
--- a/pki/base/ca/shared/emails/reqInQueue_RA
+++ b/base/ca/shared/emails/reqInQueue_RA
diff --git a/pki/base/ca/shared/emails/reqInQueue_RA.html b/base/ca/shared/emails/reqInQueue_RA.html
index 1b5bcfaf6..1b5bcfaf6 100644
--- a/pki/base/ca/shared/emails/reqInQueue_RA.html
+++ b/base/ca/shared/emails/reqInQueue_RA.html
diff --git a/pki/base/ca/shared/emails/riq1Item.html b/base/ca/shared/emails/riq1Item.html
index 0550ddeaf..0550ddeaf 100644
--- a/pki/base/ca/shared/emails/riq1Item.html
+++ b/base/ca/shared/emails/riq1Item.html
diff --git a/pki/base/ca/shared/emails/riq1Summary.html b/base/ca/shared/emails/riq1Summary.html
index cf68bc7df..cf68bc7df 100644
--- a/pki/base/ca/shared/emails/riq1Summary.html
+++ b/base/ca/shared/emails/riq1Summary.html
diff --git a/pki/base/ca/shared/emails/rnJob1.txt b/base/ca/shared/emails/rnJob1.txt
index f07250814..f07250814 100644
--- a/pki/base/ca/shared/emails/rnJob1.txt
+++ b/base/ca/shared/emails/rnJob1.txt
diff --git a/pki/base/ca/shared/emails/rnJob1Item.txt b/base/ca/shared/emails/rnJob1Item.txt
index 8080c0bde..8080c0bde 100644
--- a/pki/base/ca/shared/emails/rnJob1Item.txt
+++ b/base/ca/shared/emails/rnJob1Item.txt
diff --git a/pki/base/ca/shared/emails/rnJob1Summary.txt b/base/ca/shared/emails/rnJob1Summary.txt
index 65bf98583..65bf98583 100644
--- a/pki/base/ca/shared/emails/rnJob1Summary.txt
+++ b/base/ca/shared/emails/rnJob1Summary.txt
diff --git a/pki/base/ca/shared/etc/init.d/pki-cad b/base/ca/shared/etc/init.d/pki-cad
index 772523287..772523287 100755
--- a/pki/base/ca/shared/etc/init.d/pki-cad
+++ b/base/ca/shared/etc/init.d/pki-cad
diff --git a/pki/base/ca/shared/lib/systemd/system/pki-cad.target b/base/ca/shared/lib/systemd/system/pki-cad.target
index dab661403..dab661403 100644
--- a/pki/base/ca/shared/lib/systemd/system/pki-cad.target
+++ b/base/ca/shared/lib/systemd/system/pki-cad.target
diff --git a/pki/base/ca/shared/lib/systemd/system/pki-cad@.service b/base/ca/shared/lib/systemd/system/pki-cad@.service
index e205d72fb..e205d72fb 100644
--- a/pki/base/ca/shared/lib/systemd/system/pki-cad@.service
+++ b/base/ca/shared/lib/systemd/system/pki-cad@.service
diff --git a/pki/base/ca/shared/profiles/ca/DomainController.cfg b/base/ca/shared/profiles/ca/DomainController.cfg
index 81cba3214..81cba3214 100644
--- a/pki/base/ca/shared/profiles/ca/DomainController.cfg
+++ b/base/ca/shared/profiles/ca/DomainController.cfg
diff --git a/pki/base/ca/shared/profiles/ca/caAdminCert.cfg b/base/ca/shared/profiles/ca/caAdminCert.cfg
index c44079a1e..c44079a1e 100644
--- a/pki/base/ca/shared/profiles/ca/caAdminCert.cfg
+++ b/base/ca/shared/profiles/ca/caAdminCert.cfg
diff --git a/pki/base/ca/shared/profiles/ca/caAgentFileSigning.cfg b/base/ca/shared/profiles/ca/caAgentFileSigning.cfg
index 26eb171b0..26eb171b0 100644
--- a/pki/base/ca/shared/profiles/ca/caAgentFileSigning.cfg
+++ b/base/ca/shared/profiles/ca/caAgentFileSigning.cfg
diff --git a/pki/base/ca/shared/profiles/ca/caAgentServerCert.cfg b/base/ca/shared/profiles/ca/caAgentServerCert.cfg
index d0aac7a8f..d0aac7a8f 100644
--- a/pki/base/ca/shared/profiles/ca/caAgentServerCert.cfg
+++ b/base/ca/shared/profiles/ca/caAgentServerCert.cfg
diff --git a/pki/base/ca/shared/profiles/ca/caCACert.cfg b/base/ca/shared/profiles/ca/caCACert.cfg
index a88abdf1f..a88abdf1f 100644
--- a/pki/base/ca/shared/profiles/ca/caCACert.cfg
+++ b/base/ca/shared/profiles/ca/caCACert.cfg
diff --git a/pki/base/ca/shared/profiles/ca/caCMCUserCert.cfg b/base/ca/shared/profiles/ca/caCMCUserCert.cfg
index 8d402f771..8d402f771 100644
--- a/pki/base/ca/shared/profiles/ca/caCMCUserCert.cfg
+++ b/base/ca/shared/profiles/ca/caCMCUserCert.cfg
diff --git a/pki/base/ca/shared/profiles/ca/caDirUserCert.cfg b/base/ca/shared/profiles/ca/caDirUserCert.cfg
index ce42445cc..ce42445cc 100644
--- a/pki/base/ca/shared/profiles/ca/caDirUserCert.cfg
+++ b/base/ca/shared/profiles/ca/caDirUserCert.cfg
diff --git a/pki/base/ca/shared/profiles/ca/caDirUserRenewal.cfg b/base/ca/shared/profiles/ca/caDirUserRenewal.cfg
index c643b9df4..c643b9df4 100755
--- a/pki/base/ca/shared/profiles/ca/caDirUserRenewal.cfg
+++ b/base/ca/shared/profiles/ca/caDirUserRenewal.cfg
diff --git a/pki/base/ca/shared/profiles/ca/caDualCert.cfg b/base/ca/shared/profiles/ca/caDualCert.cfg
index e85cbe002..e85cbe002 100644
--- a/pki/base/ca/shared/profiles/ca/caDualCert.cfg
+++ b/base/ca/shared/profiles/ca/caDualCert.cfg
diff --git a/pki/base/ca/shared/profiles/ca/caDualRAuserCert.cfg b/base/ca/shared/profiles/ca/caDualRAuserCert.cfg
index 741e26a3f..741e26a3f 100644
--- a/pki/base/ca/shared/profiles/ca/caDualRAuserCert.cfg
+++ b/base/ca/shared/profiles/ca/caDualRAuserCert.cfg
diff --git a/pki/base/ca/shared/profiles/ca/caECDualCert.cfg b/base/ca/shared/profiles/ca/caECDualCert.cfg
index 8bf081088..8bf081088 100644
--- a/pki/base/ca/shared/profiles/ca/caECDualCert.cfg
+++ b/base/ca/shared/profiles/ca/caECDualCert.cfg
diff --git a/pki/base/ca/shared/profiles/ca/caECUserCert.cfg b/base/ca/shared/profiles/ca/caECUserCert.cfg
index a641e5800..a641e5800 100644
--- a/pki/base/ca/shared/profiles/ca/caECUserCert.cfg
+++ b/base/ca/shared/profiles/ca/caECUserCert.cfg
diff --git a/pki/base/ca/shared/profiles/ca/caEncECUserCert.cfg b/base/ca/shared/profiles/ca/caEncECUserCert.cfg
index 66baa4bf8..66baa4bf8 100644
--- a/pki/base/ca/shared/profiles/ca/caEncECUserCert.cfg
+++ b/base/ca/shared/profiles/ca/caEncECUserCert.cfg
diff --git a/pki/base/ca/shared/profiles/ca/caEncUserCert.cfg b/base/ca/shared/profiles/ca/caEncUserCert.cfg
index e49faf24e..e49faf24e 100644
--- a/pki/base/ca/shared/profiles/ca/caEncUserCert.cfg
+++ b/base/ca/shared/profiles/ca/caEncUserCert.cfg
diff --git a/pki/base/ca/shared/profiles/ca/caFullCMCUserCert.cfg b/base/ca/shared/profiles/ca/caFullCMCUserCert.cfg
index c9507b56f..c9507b56f 100644
--- a/pki/base/ca/shared/profiles/ca/caFullCMCUserCert.cfg
+++ b/base/ca/shared/profiles/ca/caFullCMCUserCert.cfg
diff --git a/pki/base/ca/shared/profiles/ca/caIPAserviceCert.cfg b/base/ca/shared/profiles/ca/caIPAserviceCert.cfg
index 782df9061..782df9061 100644
--- a/pki/base/ca/shared/profiles/ca/caIPAserviceCert.cfg
+++ b/base/ca/shared/profiles/ca/caIPAserviceCert.cfg
diff --git a/pki/base/ca/shared/profiles/ca/caInstallCACert.cfg b/base/ca/shared/profiles/ca/caInstallCACert.cfg
index 43588fe30..43588fe30 100644
--- a/pki/base/ca/shared/profiles/ca/caInstallCACert.cfg
+++ b/base/ca/shared/profiles/ca/caInstallCACert.cfg
diff --git a/pki/base/ca/shared/profiles/ca/caInternalAuthAuditSigningCert.cfg b/base/ca/shared/profiles/ca/caInternalAuthAuditSigningCert.cfg
index e0eb13d35..e0eb13d35 100644
--- a/pki/base/ca/shared/profiles/ca/caInternalAuthAuditSigningCert.cfg
+++ b/base/ca/shared/profiles/ca/caInternalAuthAuditSigningCert.cfg
diff --git a/pki/base/ca/shared/profiles/ca/caInternalAuthDRMstorageCert.cfg b/base/ca/shared/profiles/ca/caInternalAuthDRMstorageCert.cfg
index d5da9f599..d5da9f599 100644
--- a/pki/base/ca/shared/profiles/ca/caInternalAuthDRMstorageCert.cfg
+++ b/base/ca/shared/profiles/ca/caInternalAuthDRMstorageCert.cfg
diff --git a/pki/base/ca/shared/profiles/ca/caInternalAuthOCSPCert.cfg b/base/ca/shared/profiles/ca/caInternalAuthOCSPCert.cfg
index de07df565..de07df565 100644
--- a/pki/base/ca/shared/profiles/ca/caInternalAuthOCSPCert.cfg
+++ b/base/ca/shared/profiles/ca/caInternalAuthOCSPCert.cfg
diff --git a/pki/base/ca/shared/profiles/ca/caInternalAuthServerCert.cfg b/base/ca/shared/profiles/ca/caInternalAuthServerCert.cfg
index f639d243b..f639d243b 100644
--- a/pki/base/ca/shared/profiles/ca/caInternalAuthServerCert.cfg
+++ b/base/ca/shared/profiles/ca/caInternalAuthServerCert.cfg
diff --git a/pki/base/ca/shared/profiles/ca/caInternalAuthSubsystemCert.cfg b/base/ca/shared/profiles/ca/caInternalAuthSubsystemCert.cfg
index ed18a547e..ed18a547e 100644
--- a/pki/base/ca/shared/profiles/ca/caInternalAuthSubsystemCert.cfg
+++ b/base/ca/shared/profiles/ca/caInternalAuthSubsystemCert.cfg
diff --git a/pki/base/ca/shared/profiles/ca/caInternalAuthTransportCert.cfg b/base/ca/shared/profiles/ca/caInternalAuthTransportCert.cfg
index 538c76071..538c76071 100644
--- a/pki/base/ca/shared/profiles/ca/caInternalAuthTransportCert.cfg
+++ b/base/ca/shared/profiles/ca/caInternalAuthTransportCert.cfg
diff --git a/pki/base/ca/shared/profiles/ca/caJarSigningCert.cfg b/base/ca/shared/profiles/ca/caJarSigningCert.cfg
index 5ddf00776..5ddf00776 100644
--- a/pki/base/ca/shared/profiles/ca/caJarSigningCert.cfg
+++ b/base/ca/shared/profiles/ca/caJarSigningCert.cfg
diff --git a/pki/base/ca/shared/profiles/ca/caManualRenewal.cfg b/base/ca/shared/profiles/ca/caManualRenewal.cfg
index e470f2a28..e470f2a28 100755
--- a/pki/base/ca/shared/profiles/ca/caManualRenewal.cfg
+++ b/base/ca/shared/profiles/ca/caManualRenewal.cfg
diff --git a/pki/base/ca/shared/profiles/ca/caOCSPCert.cfg b/base/ca/shared/profiles/ca/caOCSPCert.cfg
index bda3ee752..bda3ee752 100644
--- a/pki/base/ca/shared/profiles/ca/caOCSPCert.cfg
+++ b/base/ca/shared/profiles/ca/caOCSPCert.cfg
diff --git a/pki/base/ca/shared/profiles/ca/caOtherCert.cfg b/base/ca/shared/profiles/ca/caOtherCert.cfg
index 305a37b92..305a37b92 100644
--- a/pki/base/ca/shared/profiles/ca/caOtherCert.cfg
+++ b/base/ca/shared/profiles/ca/caOtherCert.cfg
diff --git a/pki/base/ca/shared/profiles/ca/caRACert.cfg b/base/ca/shared/profiles/ca/caRACert.cfg
index a3d8dc45f..a3d8dc45f 100644
--- a/pki/base/ca/shared/profiles/ca/caRACert.cfg
+++ b/base/ca/shared/profiles/ca/caRACert.cfg
diff --git a/pki/base/ca/shared/profiles/ca/caRARouterCert.cfg b/base/ca/shared/profiles/ca/caRARouterCert.cfg
index 284076686..284076686 100644
--- a/pki/base/ca/shared/profiles/ca/caRARouterCert.cfg
+++ b/base/ca/shared/profiles/ca/caRARouterCert.cfg
diff --git a/pki/base/ca/shared/profiles/ca/caRAagentCert.cfg b/base/ca/shared/profiles/ca/caRAagentCert.cfg
index d330e6f01..d330e6f01 100644
--- a/pki/base/ca/shared/profiles/ca/caRAagentCert.cfg
+++ b/base/ca/shared/profiles/ca/caRAagentCert.cfg
diff --git a/pki/base/ca/shared/profiles/ca/caRAserverCert.cfg b/base/ca/shared/profiles/ca/caRAserverCert.cfg
index 297c001e3..297c001e3 100644
--- a/pki/base/ca/shared/profiles/ca/caRAserverCert.cfg
+++ b/base/ca/shared/profiles/ca/caRAserverCert.cfg
diff --git a/pki/base/ca/shared/profiles/ca/caRouterCert.cfg b/base/ca/shared/profiles/ca/caRouterCert.cfg
index 2400c69b8..2400c69b8 100644
--- a/pki/base/ca/shared/profiles/ca/caRouterCert.cfg
+++ b/base/ca/shared/profiles/ca/caRouterCert.cfg
diff --git a/pki/base/ca/shared/profiles/ca/caSSLClientSelfRenewal.cfg b/base/ca/shared/profiles/ca/caSSLClientSelfRenewal.cfg
index d502e84d4..d502e84d4 100755
--- a/pki/base/ca/shared/profiles/ca/caSSLClientSelfRenewal.cfg
+++ b/base/ca/shared/profiles/ca/caSSLClientSelfRenewal.cfg
diff --git a/pki/base/ca/shared/profiles/ca/caServerCert.cfg b/base/ca/shared/profiles/ca/caServerCert.cfg
index 060194d8a..060194d8a 100644
--- a/pki/base/ca/shared/profiles/ca/caServerCert.cfg
+++ b/base/ca/shared/profiles/ca/caServerCert.cfg
diff --git a/pki/base/ca/shared/profiles/ca/caSignedLogCert.cfg b/base/ca/shared/profiles/ca/caSignedLogCert.cfg
index ad5a09667..ad5a09667 100644
--- a/pki/base/ca/shared/profiles/ca/caSignedLogCert.cfg
+++ b/base/ca/shared/profiles/ca/caSignedLogCert.cfg
diff --git a/pki/base/ca/shared/profiles/ca/caSimpleCMCUserCert.cfg b/base/ca/shared/profiles/ca/caSimpleCMCUserCert.cfg
index a823bab10..a823bab10 100644
--- a/pki/base/ca/shared/profiles/ca/caSimpleCMCUserCert.cfg
+++ b/base/ca/shared/profiles/ca/caSimpleCMCUserCert.cfg
diff --git a/pki/base/ca/shared/profiles/ca/caTPSCert.cfg b/base/ca/shared/profiles/ca/caTPSCert.cfg
index 5553d4f41..5553d4f41 100644
--- a/pki/base/ca/shared/profiles/ca/caTPSCert.cfg
+++ b/base/ca/shared/profiles/ca/caTPSCert.cfg
diff --git a/pki/base/ca/shared/profiles/ca/caTempTokenDeviceKeyEnrollment.cfg b/base/ca/shared/profiles/ca/caTempTokenDeviceKeyEnrollment.cfg
index 530b3395a..530b3395a 100644
--- a/pki/base/ca/shared/profiles/ca/caTempTokenDeviceKeyEnrollment.cfg
+++ b/base/ca/shared/profiles/ca/caTempTokenDeviceKeyEnrollment.cfg
diff --git a/pki/base/ca/shared/profiles/ca/caTempTokenUserEncryptionKeyEnrollment.cfg b/base/ca/shared/profiles/ca/caTempTokenUserEncryptionKeyEnrollment.cfg
index 5f4c85f18..5f4c85f18 100644
--- a/pki/base/ca/shared/profiles/ca/caTempTokenUserEncryptionKeyEnrollment.cfg
+++ b/base/ca/shared/profiles/ca/caTempTokenUserEncryptionKeyEnrollment.cfg
diff --git a/pki/base/ca/shared/profiles/ca/caTempTokenUserSigningKeyEnrollment.cfg b/base/ca/shared/profiles/ca/caTempTokenUserSigningKeyEnrollment.cfg
index 8500b9d06..8500b9d06 100644
--- a/pki/base/ca/shared/profiles/ca/caTempTokenUserSigningKeyEnrollment.cfg
+++ b/base/ca/shared/profiles/ca/caTempTokenUserSigningKeyEnrollment.cfg
diff --git a/pki/base/ca/shared/profiles/ca/caTokenDeviceKeyEnrollment.cfg b/base/ca/shared/profiles/ca/caTokenDeviceKeyEnrollment.cfg
index ba0520963..ba0520963 100644
--- a/pki/base/ca/shared/profiles/ca/caTokenDeviceKeyEnrollment.cfg
+++ b/base/ca/shared/profiles/ca/caTokenDeviceKeyEnrollment.cfg
diff --git a/pki/base/ca/shared/profiles/ca/caTokenMSLoginEnrollment.cfg b/base/ca/shared/profiles/ca/caTokenMSLoginEnrollment.cfg
index 37c9af5e0..37c9af5e0 100644
--- a/pki/base/ca/shared/profiles/ca/caTokenMSLoginEnrollment.cfg
+++ b/base/ca/shared/profiles/ca/caTokenMSLoginEnrollment.cfg
diff --git a/pki/base/ca/shared/profiles/ca/caTokenUserEncryptionKeyEnrollment.cfg b/base/ca/shared/profiles/ca/caTokenUserEncryptionKeyEnrollment.cfg
index 5b3ecd40c..5b3ecd40c 100644
--- a/pki/base/ca/shared/profiles/ca/caTokenUserEncryptionKeyEnrollment.cfg
+++ b/base/ca/shared/profiles/ca/caTokenUserEncryptionKeyEnrollment.cfg
diff --git a/pki/base/ca/shared/profiles/ca/caTokenUserEncryptionKeyRenewal.cfg b/base/ca/shared/profiles/ca/caTokenUserEncryptionKeyRenewal.cfg
index 281e2a43e..281e2a43e 100644
--- a/pki/base/ca/shared/profiles/ca/caTokenUserEncryptionKeyRenewal.cfg
+++ b/base/ca/shared/profiles/ca/caTokenUserEncryptionKeyRenewal.cfg
diff --git a/pki/base/ca/shared/profiles/ca/caTokenUserSigningKeyEnrollment.cfg b/base/ca/shared/profiles/ca/caTokenUserSigningKeyEnrollment.cfg
index ebc231808..ebc231808 100644
--- a/pki/base/ca/shared/profiles/ca/caTokenUserSigningKeyEnrollment.cfg
+++ b/base/ca/shared/profiles/ca/caTokenUserSigningKeyEnrollment.cfg
diff --git a/pki/base/ca/shared/profiles/ca/caTokenUserSigningKeyRenewal.cfg b/base/ca/shared/profiles/ca/caTokenUserSigningKeyRenewal.cfg
index e89e32382..e89e32382 100644
--- a/pki/base/ca/shared/profiles/ca/caTokenUserSigningKeyRenewal.cfg
+++ b/base/ca/shared/profiles/ca/caTokenUserSigningKeyRenewal.cfg
diff --git a/pki/base/ca/shared/profiles/ca/caTransportCert.cfg b/base/ca/shared/profiles/ca/caTransportCert.cfg
index 466e2b313..466e2b313 100644
--- a/pki/base/ca/shared/profiles/ca/caTransportCert.cfg
+++ b/base/ca/shared/profiles/ca/caTransportCert.cfg
diff --git a/pki/base/ca/shared/profiles/ca/caUUIDdeviceCert.cfg b/base/ca/shared/profiles/ca/caUUIDdeviceCert.cfg
index f1701081c..f1701081c 100644
--- a/pki/base/ca/shared/profiles/ca/caUUIDdeviceCert.cfg
+++ b/base/ca/shared/profiles/ca/caUUIDdeviceCert.cfg
diff --git a/pki/base/ca/shared/profiles/ca/caUserCert.cfg b/base/ca/shared/profiles/ca/caUserCert.cfg
index 9a5d83c9b..9a5d83c9b 100644
--- a/pki/base/ca/shared/profiles/ca/caUserCert.cfg
+++ b/base/ca/shared/profiles/ca/caUserCert.cfg
diff --git a/pki/base/ca/shared/profiles/ca/caUserSMIMEcapCert.cfg b/base/ca/shared/profiles/ca/caUserSMIMEcapCert.cfg
index c273e26f0..c273e26f0 100644
--- a/pki/base/ca/shared/profiles/ca/caUserSMIMEcapCert.cfg
+++ b/base/ca/shared/profiles/ca/caUserSMIMEcapCert.cfg
diff --git a/pki/base/ca/shared/webapps/ROOT/WEB-INF/web.xml b/base/ca/shared/webapps/ROOT/WEB-INF/web.xml
index 59245836e..59245836e 100644
--- a/pki/base/ca/shared/webapps/ROOT/WEB-INF/web.xml
+++ b/base/ca/shared/webapps/ROOT/WEB-INF/web.xml
diff --git a/pki/base/ca/shared/webapps/ROOT/index.jsp b/base/ca/shared/webapps/ROOT/index.jsp
index 85a4654c3..85a4654c3 100644
--- a/pki/base/ca/shared/webapps/ROOT/index.jsp
+++ b/base/ca/shared/webapps/ROOT/index.jsp
diff --git a/pki/base/ca/shared/webapps/ca/WEB-INF/velocity.properties b/base/ca/shared/webapps/ca/WEB-INF/velocity.properties
index 2dfae4bca..2dfae4bca 100644
--- a/pki/base/ca/shared/webapps/ca/WEB-INF/velocity.properties
+++ b/base/ca/shared/webapps/ca/WEB-INF/velocity.properties
diff --git a/pki/base/ca/shared/webapps/ca/WEB-INF/web.xml b/base/ca/shared/webapps/ca/WEB-INF/web.xml
index 5e91977aa..5e91977aa 100644
--- a/pki/base/ca/shared/webapps/ca/WEB-INF/web.xml
+++ b/base/ca/shared/webapps/ca/WEB-INF/web.xml
diff --git a/pki/base/ca/src/CMakeLists.txt b/base/ca/src/CMakeLists.txt
index 12436f301..12436f301 100644
--- a/pki/base/ca/src/CMakeLists.txt
+++ b/base/ca/src/CMakeLists.txt
diff --git a/pki/base/ca/src/com/netscape/ca/CAPolicy.java b/base/ca/src/com/netscape/ca/CAPolicy.java
index 4df28d344..4df28d344 100644
--- a/pki/base/ca/src/com/netscape/ca/CAPolicy.java
+++ b/base/ca/src/com/netscape/ca/CAPolicy.java
diff --git a/pki/base/ca/src/com/netscape/ca/CAService.java b/base/ca/src/com/netscape/ca/CAService.java
index 62bae3b5f..62bae3b5f 100644
--- a/pki/base/ca/src/com/netscape/ca/CAService.java
+++ b/base/ca/src/com/netscape/ca/CAService.java
diff --git a/pki/base/ca/src/com/netscape/ca/CMSCRLExtensions.java b/base/ca/src/com/netscape/ca/CMSCRLExtensions.java
index 94693d69a..94693d69a 100644
--- a/pki/base/ca/src/com/netscape/ca/CMSCRLExtensions.java
+++ b/base/ca/src/com/netscape/ca/CMSCRLExtensions.java
diff --git a/pki/base/ca/src/com/netscape/ca/CRLIssuingPoint.java b/base/ca/src/com/netscape/ca/CRLIssuingPoint.java
index d4b747b32..d4b747b32 100644
--- a/pki/base/ca/src/com/netscape/ca/CRLIssuingPoint.java
+++ b/base/ca/src/com/netscape/ca/CRLIssuingPoint.java
diff --git a/pki/base/ca/src/com/netscape/ca/CRLWithExpiredCerts.java b/base/ca/src/com/netscape/ca/CRLWithExpiredCerts.java
index 9ad619ff8..9ad619ff8 100644
--- a/pki/base/ca/src/com/netscape/ca/CRLWithExpiredCerts.java
+++ b/base/ca/src/com/netscape/ca/CRLWithExpiredCerts.java
diff --git a/pki/base/ca/src/com/netscape/ca/CertificateAuthority.java b/base/ca/src/com/netscape/ca/CertificateAuthority.java
index c8783f566..c8783f566 100644
--- a/pki/base/ca/src/com/netscape/ca/CertificateAuthority.java
+++ b/base/ca/src/com/netscape/ca/CertificateAuthority.java
diff --git a/pki/base/ca/src/com/netscape/ca/SigningUnit.java b/base/ca/src/com/netscape/ca/SigningUnit.java
index 85e3621d7..85e3621d7 100644
--- a/pki/base/ca/src/com/netscape/ca/SigningUnit.java
+++ b/base/ca/src/com/netscape/ca/SigningUnit.java
diff --git a/pki/base/common/CMakeLists.txt b/base/common/CMakeLists.txt
index 10a7cc0bb..10a7cc0bb 100644
--- a/pki/base/common/CMakeLists.txt
+++ b/base/common/CMakeLists.txt
diff --git a/pki/base/common/LICENSE b/base/common/LICENSE
index e281f4362..e281f4362 100644
--- a/pki/base/common/LICENSE
+++ b/base/common/LICENSE
diff --git a/pki/base/common/setup/CertServer.directory b/base/common/setup/CertServer.directory
index 6d21bacb9..6d21bacb9 100644
--- a/pki/base/common/setup/CertServer.directory
+++ b/base/common/setup/CertServer.directory
diff --git a/pki/base/common/setup/menu.xml b/base/common/setup/menu.xml
index 562ea0261..562ea0261 100644
--- a/pki/base/common/setup/menu.xml
+++ b/base/common/setup/menu.xml
diff --git a/pki/base/common/setup/web-app_2_3.dtd b/base/common/setup/web-app_2_3.dtd
index 5e3ab01c0..5e3ab01c0 100644
--- a/pki/base/common/setup/web-app_2_3.dtd
+++ b/base/common/setup/web-app_2_3.dtd
diff --git a/pki/base/common/src/CMakeLists.txt b/base/common/src/CMakeLists.txt
index a9d4a765c..a9d4a765c 100644
--- a/pki/base/common/src/CMakeLists.txt
+++ b/base/common/src/CMakeLists.txt
diff --git a/pki/base/common/src/LogMessages.properties b/base/common/src/LogMessages.properties
index bd108bf80..bd108bf80 100644
--- a/pki/base/common/src/LogMessages.properties
+++ b/base/common/src/LogMessages.properties
diff --git a/pki/base/common/src/UserMessages.properties b/base/common/src/UserMessages.properties
index 1c78c98ce..1c78c98ce 100644
--- a/pki/base/common/src/UserMessages.properties
+++ b/base/common/src/UserMessages.properties
diff --git a/pki/base/common/src/com/netscape/certsrv/acls/ACL.java b/base/common/src/com/netscape/certsrv/acls/ACL.java
index 508793ddf..508793ddf 100644
--- a/pki/base/common/src/com/netscape/certsrv/acls/ACL.java
+++ b/base/common/src/com/netscape/certsrv/acls/ACL.java
diff --git a/pki/base/common/src/com/netscape/certsrv/acls/ACLEntry.java b/base/common/src/com/netscape/certsrv/acls/ACLEntry.java
index 2c1b7c3ea..2c1b7c3ea 100644
--- a/pki/base/common/src/com/netscape/certsrv/acls/ACLEntry.java
+++ b/base/common/src/com/netscape/certsrv/acls/ACLEntry.java
diff --git a/pki/base/common/src/com/netscape/certsrv/acls/ACLsResources.java b/base/common/src/com/netscape/certsrv/acls/ACLsResources.java
index bf3ea4a28..bf3ea4a28 100644
--- a/pki/base/common/src/com/netscape/certsrv/acls/ACLsResources.java
+++ b/base/common/src/com/netscape/certsrv/acls/ACLsResources.java
diff --git a/pki/base/common/src/com/netscape/certsrv/acls/EACLsException.java b/base/common/src/com/netscape/certsrv/acls/EACLsException.java
index 8d204091e..8d204091e 100644
--- a/pki/base/common/src/com/netscape/certsrv/acls/EACLsException.java
+++ b/base/common/src/com/netscape/certsrv/acls/EACLsException.java
diff --git a/pki/base/common/src/com/netscape/certsrv/acls/IACL.java b/base/common/src/com/netscape/certsrv/acls/IACL.java
index aad733722..aad733722 100644
--- a/pki/base/common/src/com/netscape/certsrv/acls/IACL.java
+++ b/base/common/src/com/netscape/certsrv/acls/IACL.java
diff --git a/pki/base/common/src/com/netscape/certsrv/acls/IACLEntry.java b/base/common/src/com/netscape/certsrv/acls/IACLEntry.java
index ff806f155..ff806f155 100644
--- a/pki/base/common/src/com/netscape/certsrv/acls/IACLEntry.java
+++ b/base/common/src/com/netscape/certsrv/acls/IACLEntry.java
diff --git a/pki/base/common/src/com/netscape/certsrv/apps/CMS.java b/base/common/src/com/netscape/certsrv/apps/CMS.java
index 3a36c71bc..3a36c71bc 100644
--- a/pki/base/common/src/com/netscape/certsrv/apps/CMS.java
+++ b/base/common/src/com/netscape/certsrv/apps/CMS.java
diff --git a/pki/base/common/src/com/netscape/certsrv/apps/ICMSEngine.java b/base/common/src/com/netscape/certsrv/apps/ICMSEngine.java
index ba9731867..ba9731867 100644
--- a/pki/base/common/src/com/netscape/certsrv/apps/ICMSEngine.java
+++ b/base/common/src/com/netscape/certsrv/apps/ICMSEngine.java
diff --git a/pki/base/common/src/com/netscape/certsrv/apps/ICommandQueue.java b/base/common/src/com/netscape/certsrv/apps/ICommandQueue.java
index a165ab461..a165ab461 100644
--- a/pki/base/common/src/com/netscape/certsrv/apps/ICommandQueue.java
+++ b/base/common/src/com/netscape/certsrv/apps/ICommandQueue.java
diff --git a/pki/base/common/src/com/netscape/certsrv/authentication/AuthCredentials.java b/base/common/src/com/netscape/certsrv/authentication/AuthCredentials.java
index 5a0cdd3b8..5a0cdd3b8 100644
--- a/pki/base/common/src/com/netscape/certsrv/authentication/AuthCredentials.java
+++ b/base/common/src/com/netscape/certsrv/authentication/AuthCredentials.java
diff --git a/pki/base/common/src/com/netscape/certsrv/authentication/AuthManagerProxy.java b/base/common/src/com/netscape/certsrv/authentication/AuthManagerProxy.java
index 76161e803..76161e803 100644
--- a/pki/base/common/src/com/netscape/certsrv/authentication/AuthManagerProxy.java
+++ b/base/common/src/com/netscape/certsrv/authentication/AuthManagerProxy.java
diff --git a/pki/base/common/src/com/netscape/certsrv/authentication/AuthMgrPlugin.java b/base/common/src/com/netscape/certsrv/authentication/AuthMgrPlugin.java
index 4226fd83c..4226fd83c 100644
--- a/pki/base/common/src/com/netscape/certsrv/authentication/AuthMgrPlugin.java
+++ b/base/common/src/com/netscape/certsrv/authentication/AuthMgrPlugin.java
diff --git a/pki/base/common/src/com/netscape/certsrv/authentication/AuthResources.java b/base/common/src/com/netscape/certsrv/authentication/AuthResources.java
index 35e810112..35e810112 100644
--- a/pki/base/common/src/com/netscape/certsrv/authentication/AuthResources.java
+++ b/base/common/src/com/netscape/certsrv/authentication/AuthResources.java
diff --git a/pki/base/common/src/com/netscape/certsrv/authentication/AuthToken.java b/base/common/src/com/netscape/certsrv/authentication/AuthToken.java
index 0a2b1f0a2..0a2b1f0a2 100644
--- a/pki/base/common/src/com/netscape/certsrv/authentication/AuthToken.java
+++ b/base/common/src/com/netscape/certsrv/authentication/AuthToken.java
diff --git a/pki/base/common/src/com/netscape/certsrv/authentication/EAuthException.java b/base/common/src/com/netscape/certsrv/authentication/EAuthException.java
index c79c3e9a7..c79c3e9a7 100644
--- a/pki/base/common/src/com/netscape/certsrv/authentication/EAuthException.java
+++ b/base/common/src/com/netscape/certsrv/authentication/EAuthException.java
diff --git a/pki/base/common/src/com/netscape/certsrv/authentication/EAuthInternalError.java b/base/common/src/com/netscape/certsrv/authentication/EAuthInternalError.java
index 52688f922..52688f922 100644
--- a/pki/base/common/src/com/netscape/certsrv/authentication/EAuthInternalError.java
+++ b/base/common/src/com/netscape/certsrv/authentication/EAuthInternalError.java
diff --git a/pki/base/common/src/com/netscape/certsrv/authentication/EAuthMgrNotFound.java b/base/common/src/com/netscape/certsrv/authentication/EAuthMgrNotFound.java
index 925aaabf0..925aaabf0 100644
--- a/pki/base/common/src/com/netscape/certsrv/authentication/EAuthMgrNotFound.java
+++ b/base/common/src/com/netscape/certsrv/authentication/EAuthMgrNotFound.java
diff --git a/pki/base/common/src/com/netscape/certsrv/authentication/EAuthMgrPluginNotFound.java b/base/common/src/com/netscape/certsrv/authentication/EAuthMgrPluginNotFound.java
index 2ca90e3c8..2ca90e3c8 100644
--- a/pki/base/common/src/com/netscape/certsrv/authentication/EAuthMgrPluginNotFound.java
+++ b/base/common/src/com/netscape/certsrv/authentication/EAuthMgrPluginNotFound.java
diff --git a/pki/base/common/src/com/netscape/certsrv/authentication/EAuthUserError.java b/base/common/src/com/netscape/certsrv/authentication/EAuthUserError.java
index f816c35e8..f816c35e8 100644
--- a/pki/base/common/src/com/netscape/certsrv/authentication/EAuthUserError.java
+++ b/base/common/src/com/netscape/certsrv/authentication/EAuthUserError.java
diff --git a/pki/base/common/src/com/netscape/certsrv/authentication/ECompSyntaxErr.java b/base/common/src/com/netscape/certsrv/authentication/ECompSyntaxErr.java
index 84725bb96..84725bb96 100644
--- a/pki/base/common/src/com/netscape/certsrv/authentication/ECompSyntaxErr.java
+++ b/base/common/src/com/netscape/certsrv/authentication/ECompSyntaxErr.java
diff --git a/pki/base/common/src/com/netscape/certsrv/authentication/EFormSubjectDN.java b/base/common/src/com/netscape/certsrv/authentication/EFormSubjectDN.java
index 952824481..952824481 100644
--- a/pki/base/common/src/com/netscape/certsrv/authentication/EFormSubjectDN.java
+++ b/base/common/src/com/netscape/certsrv/authentication/EFormSubjectDN.java
diff --git a/pki/base/common/src/com/netscape/certsrv/authentication/EInvalidCredentials.java b/base/common/src/com/netscape/certsrv/authentication/EInvalidCredentials.java
index 3e4daaf0d..3e4daaf0d 100644
--- a/pki/base/common/src/com/netscape/certsrv/authentication/EInvalidCredentials.java
+++ b/base/common/src/com/netscape/certsrv/authentication/EInvalidCredentials.java
diff --git a/pki/base/common/src/com/netscape/certsrv/authentication/EMissingCredential.java b/base/common/src/com/netscape/certsrv/authentication/EMissingCredential.java
index 5de73aa0d..5de73aa0d 100644
--- a/pki/base/common/src/com/netscape/certsrv/authentication/EMissingCredential.java
+++ b/base/common/src/com/netscape/certsrv/authentication/EMissingCredential.java
diff --git a/pki/base/common/src/com/netscape/certsrv/authentication/IAuthCredentials.java b/base/common/src/com/netscape/certsrv/authentication/IAuthCredentials.java
index cd8434433..cd8434433 100644
--- a/pki/base/common/src/com/netscape/certsrv/authentication/IAuthCredentials.java
+++ b/base/common/src/com/netscape/certsrv/authentication/IAuthCredentials.java
diff --git a/pki/base/common/src/com/netscape/certsrv/authentication/IAuthManager.java b/base/common/src/com/netscape/certsrv/authentication/IAuthManager.java
index 1ff46af7d..1ff46af7d 100644
--- a/pki/base/common/src/com/netscape/certsrv/authentication/IAuthManager.java
+++ b/base/common/src/com/netscape/certsrv/authentication/IAuthManager.java
diff --git a/pki/base/common/src/com/netscape/certsrv/authentication/IAuthSubsystem.java b/base/common/src/com/netscape/certsrv/authentication/IAuthSubsystem.java
index 329b6802e..329b6802e 100644
--- a/pki/base/common/src/com/netscape/certsrv/authentication/IAuthSubsystem.java
+++ b/base/common/src/com/netscape/certsrv/authentication/IAuthSubsystem.java
diff --git a/pki/base/common/src/com/netscape/certsrv/authentication/IAuthToken.java b/base/common/src/com/netscape/certsrv/authentication/IAuthToken.java
index f46ee3ca1..f46ee3ca1 100644
--- a/pki/base/common/src/com/netscape/certsrv/authentication/IAuthToken.java
+++ b/base/common/src/com/netscape/certsrv/authentication/IAuthToken.java
diff --git a/pki/base/common/src/com/netscape/certsrv/authentication/ISSLClientCertProvider.java b/base/common/src/com/netscape/certsrv/authentication/ISSLClientCertProvider.java
index 6932decc0..6932decc0 100644
--- a/pki/base/common/src/com/netscape/certsrv/authentication/ISSLClientCertProvider.java
+++ b/base/common/src/com/netscape/certsrv/authentication/ISSLClientCertProvider.java
diff --git a/pki/base/common/src/com/netscape/certsrv/authentication/ISharedToken.java b/base/common/src/com/netscape/certsrv/authentication/ISharedToken.java
index 830c8866e..830c8866e 100644
--- a/pki/base/common/src/com/netscape/certsrv/authentication/ISharedToken.java
+++ b/base/common/src/com/netscape/certsrv/authentication/ISharedToken.java
diff --git a/pki/base/common/src/com/netscape/certsrv/authority/IAuthority.java b/base/common/src/com/netscape/certsrv/authority/IAuthority.java
index 2875e4dd1..2875e4dd1 100644
--- a/pki/base/common/src/com/netscape/certsrv/authority/IAuthority.java
+++ b/base/common/src/com/netscape/certsrv/authority/IAuthority.java
diff --git a/pki/base/common/src/com/netscape/certsrv/authority/ICertAuthority.java b/base/common/src/com/netscape/certsrv/authority/ICertAuthority.java
index c2f2c91ec..c2f2c91ec 100644
--- a/pki/base/common/src/com/netscape/certsrv/authority/ICertAuthority.java
+++ b/base/common/src/com/netscape/certsrv/authority/ICertAuthority.java
diff --git a/pki/base/common/src/com/netscape/certsrv/authorization/AuthzManagerProxy.java b/base/common/src/com/netscape/certsrv/authorization/AuthzManagerProxy.java
index 58a5264ba..58a5264ba 100644
--- a/pki/base/common/src/com/netscape/certsrv/authorization/AuthzManagerProxy.java
+++ b/base/common/src/com/netscape/certsrv/authorization/AuthzManagerProxy.java
diff --git a/pki/base/common/src/com/netscape/certsrv/authorization/AuthzMgrPlugin.java b/base/common/src/com/netscape/certsrv/authorization/AuthzMgrPlugin.java
index e47e58171..e47e58171 100644
--- a/pki/base/common/src/com/netscape/certsrv/authorization/AuthzMgrPlugin.java
+++ b/base/common/src/com/netscape/certsrv/authorization/AuthzMgrPlugin.java
diff --git a/pki/base/common/src/com/netscape/certsrv/authorization/AuthzResources.java b/base/common/src/com/netscape/certsrv/authorization/AuthzResources.java
index 13d33c212..13d33c212 100644
--- a/pki/base/common/src/com/netscape/certsrv/authorization/AuthzResources.java
+++ b/base/common/src/com/netscape/certsrv/authorization/AuthzResources.java
diff --git a/pki/base/common/src/com/netscape/certsrv/authorization/AuthzToken.java b/base/common/src/com/netscape/certsrv/authorization/AuthzToken.java
index 262902e62..262902e62 100644
--- a/pki/base/common/src/com/netscape/certsrv/authorization/AuthzToken.java
+++ b/base/common/src/com/netscape/certsrv/authorization/AuthzToken.java
diff --git a/pki/base/common/src/com/netscape/certsrv/authorization/EAuthzAccessDenied.java b/base/common/src/com/netscape/certsrv/authorization/EAuthzAccessDenied.java
index 9fc7777c7..9fc7777c7 100644
--- a/pki/base/common/src/com/netscape/certsrv/authorization/EAuthzAccessDenied.java
+++ b/base/common/src/com/netscape/certsrv/authorization/EAuthzAccessDenied.java
diff --git a/pki/base/common/src/com/netscape/certsrv/authorization/EAuthzException.java b/base/common/src/com/netscape/certsrv/authorization/EAuthzException.java
index 65d95a571..65d95a571 100644
--- a/pki/base/common/src/com/netscape/certsrv/authorization/EAuthzException.java
+++ b/base/common/src/com/netscape/certsrv/authorization/EAuthzException.java
diff --git a/pki/base/common/src/com/netscape/certsrv/authorization/EAuthzInternalError.java b/base/common/src/com/netscape/certsrv/authorization/EAuthzInternalError.java
index 2afe2c747..2afe2c747 100644
--- a/pki/base/common/src/com/netscape/certsrv/authorization/EAuthzInternalError.java
+++ b/base/common/src/com/netscape/certsrv/authorization/EAuthzInternalError.java
diff --git a/pki/base/common/src/com/netscape/certsrv/authorization/EAuthzMgrNotFound.java b/base/common/src/com/netscape/certsrv/authorization/EAuthzMgrNotFound.java
index a920d37ac..a920d37ac 100644
--- a/pki/base/common/src/com/netscape/certsrv/authorization/EAuthzMgrNotFound.java
+++ b/base/common/src/com/netscape/certsrv/authorization/EAuthzMgrNotFound.java
diff --git a/pki/base/common/src/com/netscape/certsrv/authorization/EAuthzMgrPluginNotFound.java b/base/common/src/com/netscape/certsrv/authorization/EAuthzMgrPluginNotFound.java
index 43ae6edcd..43ae6edcd 100644
--- a/pki/base/common/src/com/netscape/certsrv/authorization/EAuthzMgrPluginNotFound.java
+++ b/base/common/src/com/netscape/certsrv/authorization/EAuthzMgrPluginNotFound.java
diff --git a/pki/base/common/src/com/netscape/certsrv/authorization/EAuthzUnknownOperation.java b/base/common/src/com/netscape/certsrv/authorization/EAuthzUnknownOperation.java
index ce061ddd2..ce061ddd2 100644
--- a/pki/base/common/src/com/netscape/certsrv/authorization/EAuthzUnknownOperation.java
+++ b/base/common/src/com/netscape/certsrv/authorization/EAuthzUnknownOperation.java
diff --git a/pki/base/common/src/com/netscape/certsrv/authorization/EAuthzUnknownProtectedRes.java b/base/common/src/com/netscape/certsrv/authorization/EAuthzUnknownProtectedRes.java
index 5cb2d7276..5cb2d7276 100644
--- a/pki/base/common/src/com/netscape/certsrv/authorization/EAuthzUnknownProtectedRes.java
+++ b/base/common/src/com/netscape/certsrv/authorization/EAuthzUnknownProtectedRes.java
diff --git a/pki/base/common/src/com/netscape/certsrv/authorization/IAuthzManager.java b/base/common/src/com/netscape/certsrv/authorization/IAuthzManager.java
index 8b52b3928..8b52b3928 100644
--- a/pki/base/common/src/com/netscape/certsrv/authorization/IAuthzManager.java
+++ b/base/common/src/com/netscape/certsrv/authorization/IAuthzManager.java
diff --git a/pki/base/common/src/com/netscape/certsrv/authorization/IAuthzSubsystem.java b/base/common/src/com/netscape/certsrv/authorization/IAuthzSubsystem.java
index d8ccc8a83..d8ccc8a83 100644
--- a/pki/base/common/src/com/netscape/certsrv/authorization/IAuthzSubsystem.java
+++ b/base/common/src/com/netscape/certsrv/authorization/IAuthzSubsystem.java
diff --git a/pki/base/common/src/com/netscape/certsrv/base/ASubsystem.java b/base/common/src/com/netscape/certsrv/base/ASubsystem.java
index 2b4c6d15a..2b4c6d15a 100644
--- a/pki/base/common/src/com/netscape/certsrv/base/ASubsystem.java
+++ b/base/common/src/com/netscape/certsrv/base/ASubsystem.java
diff --git a/pki/base/common/src/com/netscape/certsrv/base/AttributeNameHelper.java b/base/common/src/com/netscape/certsrv/base/AttributeNameHelper.java
index 5b6db131e..5b6db131e 100644
--- a/pki/base/common/src/com/netscape/certsrv/base/AttributeNameHelper.java
+++ b/base/common/src/com/netscape/certsrv/base/AttributeNameHelper.java
diff --git a/pki/base/common/src/com/netscape/certsrv/base/BaseResources.java b/base/common/src/com/netscape/certsrv/base/BaseResources.java
index 41159481f..41159481f 100644
--- a/pki/base/common/src/com/netscape/certsrv/base/BaseResources.java
+++ b/base/common/src/com/netscape/certsrv/base/BaseResources.java
diff --git a/pki/base/common/src/com/netscape/certsrv/base/EBaseException.java b/base/common/src/com/netscape/certsrv/base/EBaseException.java
index 26def60f5..26def60f5 100644
--- a/pki/base/common/src/com/netscape/certsrv/base/EBaseException.java
+++ b/base/common/src/com/netscape/certsrv/base/EBaseException.java
diff --git a/pki/base/common/src/com/netscape/certsrv/base/EPropertyNotDefined.java b/base/common/src/com/netscape/certsrv/base/EPropertyNotDefined.java
index 466306582..466306582 100644
--- a/pki/base/common/src/com/netscape/certsrv/base/EPropertyNotDefined.java
+++ b/base/common/src/com/netscape/certsrv/base/EPropertyNotDefined.java
diff --git a/pki/base/common/src/com/netscape/certsrv/base/EPropertyNotFound.java b/base/common/src/com/netscape/certsrv/base/EPropertyNotFound.java
index 5a8a9550f..5a8a9550f 100644
--- a/pki/base/common/src/com/netscape/certsrv/base/EPropertyNotFound.java
+++ b/base/common/src/com/netscape/certsrv/base/EPropertyNotFound.java
diff --git a/pki/base/common/src/com/netscape/certsrv/base/ExtendedPluginInfo.java b/base/common/src/com/netscape/certsrv/base/ExtendedPluginInfo.java
index 86f5999d9..86f5999d9 100644
--- a/pki/base/common/src/com/netscape/certsrv/base/ExtendedPluginInfo.java
+++ b/base/common/src/com/netscape/certsrv/base/ExtendedPluginInfo.java
diff --git a/pki/base/common/src/com/netscape/certsrv/base/IArgBlock.java b/base/common/src/com/netscape/certsrv/base/IArgBlock.java
index adddccba6..adddccba6 100644
--- a/pki/base/common/src/com/netscape/certsrv/base/IArgBlock.java
+++ b/base/common/src/com/netscape/certsrv/base/IArgBlock.java
diff --git a/pki/base/common/src/com/netscape/certsrv/base/IAttrSet.java b/base/common/src/com/netscape/certsrv/base/IAttrSet.java
index e396b072a..e396b072a 100644
--- a/pki/base/common/src/com/netscape/certsrv/base/IAttrSet.java
+++ b/base/common/src/com/netscape/certsrv/base/IAttrSet.java
diff --git a/pki/base/common/src/com/netscape/certsrv/base/IAuthInfo.java b/base/common/src/com/netscape/certsrv/base/IAuthInfo.java
index 4806a94c0..4806a94c0 100644
--- a/pki/base/common/src/com/netscape/certsrv/base/IAuthInfo.java
+++ b/base/common/src/com/netscape/certsrv/base/IAuthInfo.java
diff --git a/pki/base/common/src/com/netscape/certsrv/base/ICRLPrettyPrint.java b/base/common/src/com/netscape/certsrv/base/ICRLPrettyPrint.java
index d111063a7..d111063a7 100644
--- a/pki/base/common/src/com/netscape/certsrv/base/ICRLPrettyPrint.java
+++ b/base/common/src/com/netscape/certsrv/base/ICRLPrettyPrint.java
diff --git a/pki/base/common/src/com/netscape/certsrv/base/ICertPrettyPrint.java b/base/common/src/com/netscape/certsrv/base/ICertPrettyPrint.java
index e991d5a11..e991d5a11 100644
--- a/pki/base/common/src/com/netscape/certsrv/base/ICertPrettyPrint.java
+++ b/base/common/src/com/netscape/certsrv/base/ICertPrettyPrint.java
diff --git a/pki/base/common/src/com/netscape/certsrv/base/IConfigStore.java b/base/common/src/com/netscape/certsrv/base/IConfigStore.java
index d12265e83..d12265e83 100644
--- a/pki/base/common/src/com/netscape/certsrv/base/IConfigStore.java
+++ b/base/common/src/com/netscape/certsrv/base/IConfigStore.java
diff --git a/pki/base/common/src/com/netscape/certsrv/base/IConfigStoreEventListener.java b/base/common/src/com/netscape/certsrv/base/IConfigStoreEventListener.java
index 06e7d522a..06e7d522a 100644
--- a/pki/base/common/src/com/netscape/certsrv/base/IConfigStoreEventListener.java
+++ b/base/common/src/com/netscape/certsrv/base/IConfigStoreEventListener.java
diff --git a/pki/base/common/src/com/netscape/certsrv/base/IExtPrettyPrint.java b/base/common/src/com/netscape/certsrv/base/IExtPrettyPrint.java
index 8d95a40ca..8d95a40ca 100644
--- a/pki/base/common/src/com/netscape/certsrv/base/IExtPrettyPrint.java
+++ b/base/common/src/com/netscape/certsrv/base/IExtPrettyPrint.java
diff --git a/pki/base/common/src/com/netscape/certsrv/base/IExtendedPluginInfo.java b/base/common/src/com/netscape/certsrv/base/IExtendedPluginInfo.java
index aff3daf4d..aff3daf4d 100644
--- a/pki/base/common/src/com/netscape/certsrv/base/IExtendedPluginInfo.java
+++ b/base/common/src/com/netscape/certsrv/base/IExtendedPluginInfo.java
diff --git a/pki/base/common/src/com/netscape/certsrv/base/IPluginImpl.java b/base/common/src/com/netscape/certsrv/base/IPluginImpl.java
index a7a0560b5..a7a0560b5 100644
--- a/pki/base/common/src/com/netscape/certsrv/base/IPluginImpl.java
+++ b/base/common/src/com/netscape/certsrv/base/IPluginImpl.java
diff --git a/pki/base/common/src/com/netscape/certsrv/base/IPrettyPrintFormat.java b/base/common/src/com/netscape/certsrv/base/IPrettyPrintFormat.java
index 67c1b01d1..67c1b01d1 100644
--- a/pki/base/common/src/com/netscape/certsrv/base/IPrettyPrintFormat.java
+++ b/base/common/src/com/netscape/certsrv/base/IPrettyPrintFormat.java
diff --git a/pki/base/common/src/com/netscape/certsrv/base/ISecurityDomainSessionTable.java b/base/common/src/com/netscape/certsrv/base/ISecurityDomainSessionTable.java
index 24c55d086..24c55d086 100644
--- a/pki/base/common/src/com/netscape/certsrv/base/ISecurityDomainSessionTable.java
+++ b/base/common/src/com/netscape/certsrv/base/ISecurityDomainSessionTable.java
diff --git a/pki/base/common/src/com/netscape/certsrv/base/ISourceConfigStore.java b/base/common/src/com/netscape/certsrv/base/ISourceConfigStore.java
index eb848c54e..eb848c54e 100644
--- a/pki/base/common/src/com/netscape/certsrv/base/ISourceConfigStore.java
+++ b/base/common/src/com/netscape/certsrv/base/ISourceConfigStore.java
diff --git a/pki/base/common/src/com/netscape/certsrv/base/ISubsystem.java b/base/common/src/com/netscape/certsrv/base/ISubsystem.java
index 7b2a37d7d..7b2a37d7d 100644
--- a/pki/base/common/src/com/netscape/certsrv/base/ISubsystem.java
+++ b/base/common/src/com/netscape/certsrv/base/ISubsystem.java
diff --git a/pki/base/common/src/com/netscape/certsrv/base/ISubsystemSource.java b/base/common/src/com/netscape/certsrv/base/ISubsystemSource.java
index f6bb6378b..f6bb6378b 100644
--- a/pki/base/common/src/com/netscape/certsrv/base/ISubsystemSource.java
+++ b/base/common/src/com/netscape/certsrv/base/ISubsystemSource.java
diff --git a/pki/base/common/src/com/netscape/certsrv/base/ITimeSource.java b/base/common/src/com/netscape/certsrv/base/ITimeSource.java
index 1e7dd0fb0..1e7dd0fb0 100644
--- a/pki/base/common/src/com/netscape/certsrv/base/ITimeSource.java
+++ b/base/common/src/com/netscape/certsrv/base/ITimeSource.java
diff --git a/pki/base/common/src/com/netscape/certsrv/base/KeyGenInfo.java b/base/common/src/com/netscape/certsrv/base/KeyGenInfo.java
index 8c13fca56..8c13fca56 100644
--- a/pki/base/common/src/com/netscape/certsrv/base/KeyGenInfo.java
+++ b/base/common/src/com/netscape/certsrv/base/KeyGenInfo.java
diff --git a/pki/base/common/src/com/netscape/certsrv/base/MessageFormatter.java b/base/common/src/com/netscape/certsrv/base/MessageFormatter.java
index 903b534e0..903b534e0 100644
--- a/pki/base/common/src/com/netscape/certsrv/base/MessageFormatter.java
+++ b/base/common/src/com/netscape/certsrv/base/MessageFormatter.java
diff --git a/pki/base/common/src/com/netscape/certsrv/base/MetaAttributeDef.java b/base/common/src/com/netscape/certsrv/base/MetaAttributeDef.java
index 3a7bac977..3a7bac977 100644
--- a/pki/base/common/src/com/netscape/certsrv/base/MetaAttributeDef.java
+++ b/base/common/src/com/netscape/certsrv/base/MetaAttributeDef.java
diff --git a/pki/base/common/src/com/netscape/certsrv/base/MetaInfo.java b/base/common/src/com/netscape/certsrv/base/MetaInfo.java
index 8aed6b840..8aed6b840 100644
--- a/pki/base/common/src/com/netscape/certsrv/base/MetaInfo.java
+++ b/base/common/src/com/netscape/certsrv/base/MetaInfo.java
diff --git a/pki/base/common/src/com/netscape/certsrv/base/Nonces.java b/base/common/src/com/netscape/certsrv/base/Nonces.java
index cc0231ac3..cc0231ac3 100644
--- a/pki/base/common/src/com/netscape/certsrv/base/Nonces.java
+++ b/base/common/src/com/netscape/certsrv/base/Nonces.java
diff --git a/pki/base/common/src/com/netscape/certsrv/base/PasswordResources.java b/base/common/src/com/netscape/certsrv/base/PasswordResources.java
index c3309c5fa..c3309c5fa 100644
--- a/pki/base/common/src/com/netscape/certsrv/base/PasswordResources.java
+++ b/base/common/src/com/netscape/certsrv/base/PasswordResources.java
diff --git a/pki/base/common/src/com/netscape/certsrv/base/Plugin.java b/base/common/src/com/netscape/certsrv/base/Plugin.java
index 79fae88ac..79fae88ac 100644
--- a/pki/base/common/src/com/netscape/certsrv/base/Plugin.java
+++ b/base/common/src/com/netscape/certsrv/base/Plugin.java
diff --git a/pki/base/common/src/com/netscape/certsrv/base/SessionContext.java b/base/common/src/com/netscape/certsrv/base/SessionContext.java
index b4ecd1241..b4ecd1241 100644
--- a/pki/base/common/src/com/netscape/certsrv/base/SessionContext.java
+++ b/base/common/src/com/netscape/certsrv/base/SessionContext.java
diff --git a/pki/base/common/src/com/netscape/certsrv/ca/CAResources.java b/base/common/src/com/netscape/certsrv/ca/CAResources.java
index dfb72d57d..dfb72d57d 100644
--- a/pki/base/common/src/com/netscape/certsrv/ca/CAResources.java
+++ b/base/common/src/com/netscape/certsrv/ca/CAResources.java
diff --git a/pki/base/common/src/com/netscape/certsrv/ca/ECAException.java b/base/common/src/com/netscape/certsrv/ca/ECAException.java
index a530b08a5..a530b08a5 100644
--- a/pki/base/common/src/com/netscape/certsrv/ca/ECAException.java
+++ b/base/common/src/com/netscape/certsrv/ca/ECAException.java
diff --git a/pki/base/common/src/com/netscape/certsrv/ca/EErrorPublishCRL.java b/base/common/src/com/netscape/certsrv/ca/EErrorPublishCRL.java
index b4c10a0c5..b4c10a0c5 100644
--- a/pki/base/common/src/com/netscape/certsrv/ca/EErrorPublishCRL.java
+++ b/base/common/src/com/netscape/certsrv/ca/EErrorPublishCRL.java
diff --git a/pki/base/common/src/com/netscape/certsrv/ca/ICAService.java b/base/common/src/com/netscape/certsrv/ca/ICAService.java
index 1edebcc8b..1edebcc8b 100644
--- a/pki/base/common/src/com/netscape/certsrv/ca/ICAService.java
+++ b/base/common/src/com/netscape/certsrv/ca/ICAService.java
diff --git a/pki/base/common/src/com/netscape/certsrv/ca/ICMSCRLExtension.java b/base/common/src/com/netscape/certsrv/ca/ICMSCRLExtension.java
index b3e94d02e..b3e94d02e 100644
--- a/pki/base/common/src/com/netscape/certsrv/ca/ICMSCRLExtension.java
+++ b/base/common/src/com/netscape/certsrv/ca/ICMSCRLExtension.java
diff --git a/pki/base/common/src/com/netscape/certsrv/ca/ICMSCRLExtensions.java b/base/common/src/com/netscape/certsrv/ca/ICMSCRLExtensions.java
index 6fa520fbf..6fa520fbf 100644
--- a/pki/base/common/src/com/netscape/certsrv/ca/ICMSCRLExtensions.java
+++ b/base/common/src/com/netscape/certsrv/ca/ICMSCRLExtensions.java
diff --git a/pki/base/common/src/com/netscape/certsrv/ca/ICRLIssuingPoint.java b/base/common/src/com/netscape/certsrv/ca/ICRLIssuingPoint.java
index f317db9b1..f317db9b1 100644
--- a/pki/base/common/src/com/netscape/certsrv/ca/ICRLIssuingPoint.java
+++ b/base/common/src/com/netscape/certsrv/ca/ICRLIssuingPoint.java
diff --git a/pki/base/common/src/com/netscape/certsrv/ca/ICertificateAuthority.java b/base/common/src/com/netscape/certsrv/ca/ICertificateAuthority.java
index 25bc9cabe..25bc9cabe 100644
--- a/pki/base/common/src/com/netscape/certsrv/ca/ICertificateAuthority.java
+++ b/base/common/src/com/netscape/certsrv/ca/ICertificateAuthority.java
diff --git a/pki/base/common/src/com/netscape/certsrv/cert/ICrossCertPairSubsystem.java b/base/common/src/com/netscape/certsrv/cert/ICrossCertPairSubsystem.java
index c79479dc7..c79479dc7 100644
--- a/pki/base/common/src/com/netscape/certsrv/cert/ICrossCertPairSubsystem.java
+++ b/base/common/src/com/netscape/certsrv/cert/ICrossCertPairSubsystem.java
diff --git a/pki/base/common/src/com/netscape/certsrv/client/IDataProcessor.java b/base/common/src/com/netscape/certsrv/client/IDataProcessor.java
index b6784b6d2..b6784b6d2 100644
--- a/pki/base/common/src/com/netscape/certsrv/client/IDataProcessor.java
+++ b/base/common/src/com/netscape/certsrv/client/IDataProcessor.java
diff --git a/pki/base/common/src/com/netscape/certsrv/client/connection/IAuthenticator.java b/base/common/src/com/netscape/certsrv/client/connection/IAuthenticator.java
index 0a96ee698..0a96ee698 100644
--- a/pki/base/common/src/com/netscape/certsrv/client/connection/IAuthenticator.java
+++ b/base/common/src/com/netscape/certsrv/client/connection/IAuthenticator.java
diff --git a/pki/base/common/src/com/netscape/certsrv/client/connection/IConnection.java b/base/common/src/com/netscape/certsrv/client/connection/IConnection.java
index 4a8166b02..4a8166b02 100644
--- a/pki/base/common/src/com/netscape/certsrv/client/connection/IConnection.java
+++ b/base/common/src/com/netscape/certsrv/client/connection/IConnection.java
diff --git a/pki/base/common/src/com/netscape/certsrv/client/connection/IConnectionFactory.java b/base/common/src/com/netscape/certsrv/client/connection/IConnectionFactory.java
index 4506abbfa..4506abbfa 100644
--- a/pki/base/common/src/com/netscape/certsrv/client/connection/IConnectionFactory.java
+++ b/base/common/src/com/netscape/certsrv/client/connection/IConnectionFactory.java
diff --git a/pki/base/common/src/com/netscape/certsrv/common/ConfigConstants.java b/base/common/src/com/netscape/certsrv/common/ConfigConstants.java
index 2ea7b7469..2ea7b7469 100644
--- a/pki/base/common/src/com/netscape/certsrv/common/ConfigConstants.java
+++ b/base/common/src/com/netscape/certsrv/common/ConfigConstants.java
diff --git a/pki/base/common/src/com/netscape/certsrv/common/Constants.java b/base/common/src/com/netscape/certsrv/common/Constants.java
index be9d33b4c..be9d33b4c 100644
--- a/pki/base/common/src/com/netscape/certsrv/common/Constants.java
+++ b/base/common/src/com/netscape/certsrv/common/Constants.java
diff --git a/pki/base/common/src/com/netscape/certsrv/common/DestDef.java b/base/common/src/com/netscape/certsrv/common/DestDef.java
index 273e6af05..273e6af05 100644
--- a/pki/base/common/src/com/netscape/certsrv/common/DestDef.java
+++ b/base/common/src/com/netscape/certsrv/common/DestDef.java
diff --git a/pki/base/common/src/com/netscape/certsrv/common/NameValuePairs.java b/base/common/src/com/netscape/certsrv/common/NameValuePairs.java
index 0999db7bc..0999db7bc 100644
--- a/pki/base/common/src/com/netscape/certsrv/common/NameValuePairs.java
+++ b/base/common/src/com/netscape/certsrv/common/NameValuePairs.java
diff --git a/pki/base/common/src/com/netscape/certsrv/common/OpDef.java b/base/common/src/com/netscape/certsrv/common/OpDef.java
index 22a974e12..22a974e12 100644
--- a/pki/base/common/src/com/netscape/certsrv/common/OpDef.java
+++ b/base/common/src/com/netscape/certsrv/common/OpDef.java
diff --git a/pki/base/common/src/com/netscape/certsrv/common/PrefixDef.java b/base/common/src/com/netscape/certsrv/common/PrefixDef.java
index 833847d05..833847d05 100644
--- a/pki/base/common/src/com/netscape/certsrv/common/PrefixDef.java
+++ b/base/common/src/com/netscape/certsrv/common/PrefixDef.java
diff --git a/pki/base/common/src/com/netscape/certsrv/common/ScopeDef.java b/base/common/src/com/netscape/certsrv/common/ScopeDef.java
index f29067f51..f29067f51 100644
--- a/pki/base/common/src/com/netscape/certsrv/common/ScopeDef.java
+++ b/base/common/src/com/netscape/certsrv/common/ScopeDef.java
diff --git a/pki/base/common/src/com/netscape/certsrv/common/TaskId.java b/base/common/src/com/netscape/certsrv/common/TaskId.java
index 01a97b2a1..01a97b2a1 100644
--- a/pki/base/common/src/com/netscape/certsrv/common/TaskId.java
+++ b/base/common/src/com/netscape/certsrv/common/TaskId.java
diff --git a/pki/base/common/src/com/netscape/certsrv/connector/IConnector.java b/base/common/src/com/netscape/certsrv/connector/IConnector.java
index 202fb0794..202fb0794 100644
--- a/pki/base/common/src/com/netscape/certsrv/connector/IConnector.java
+++ b/base/common/src/com/netscape/certsrv/connector/IConnector.java
diff --git a/pki/base/common/src/com/netscape/certsrv/connector/IHttpConnFactory.java b/base/common/src/com/netscape/certsrv/connector/IHttpConnFactory.java
index 27a94a57f..27a94a57f 100644
--- a/pki/base/common/src/com/netscape/certsrv/connector/IHttpConnFactory.java
+++ b/base/common/src/com/netscape/certsrv/connector/IHttpConnFactory.java
diff --git a/pki/base/common/src/com/netscape/certsrv/connector/IHttpConnection.java b/base/common/src/com/netscape/certsrv/connector/IHttpConnection.java
index d1652dc90..d1652dc90 100644
--- a/pki/base/common/src/com/netscape/certsrv/connector/IHttpConnection.java
+++ b/base/common/src/com/netscape/certsrv/connector/IHttpConnection.java
diff --git a/pki/base/common/src/com/netscape/certsrv/connector/IHttpPKIMessage.java b/base/common/src/com/netscape/certsrv/connector/IHttpPKIMessage.java
index efa49126e..efa49126e 100644
--- a/pki/base/common/src/com/netscape/certsrv/connector/IHttpPKIMessage.java
+++ b/base/common/src/com/netscape/certsrv/connector/IHttpPKIMessage.java
diff --git a/pki/base/common/src/com/netscape/certsrv/connector/IPKIMessage.java b/base/common/src/com/netscape/certsrv/connector/IPKIMessage.java
index 787dd8385..787dd8385 100644
--- a/pki/base/common/src/com/netscape/certsrv/connector/IPKIMessage.java
+++ b/base/common/src/com/netscape/certsrv/connector/IPKIMessage.java
diff --git a/pki/base/common/src/com/netscape/certsrv/connector/IRemoteAuthority.java b/base/common/src/com/netscape/certsrv/connector/IRemoteAuthority.java
index 50a3aea5f..50a3aea5f 100644
--- a/pki/base/common/src/com/netscape/certsrv/connector/IRemoteAuthority.java
+++ b/base/common/src/com/netscape/certsrv/connector/IRemoteAuthority.java
diff --git a/pki/base/common/src/com/netscape/certsrv/connector/IRequestEncoder.java b/base/common/src/com/netscape/certsrv/connector/IRequestEncoder.java
index 478af4174..478af4174 100644
--- a/pki/base/common/src/com/netscape/certsrv/connector/IRequestEncoder.java
+++ b/base/common/src/com/netscape/certsrv/connector/IRequestEncoder.java
diff --git a/pki/base/common/src/com/netscape/certsrv/connector/IResender.java b/base/common/src/com/netscape/certsrv/connector/IResender.java
index 85d3e364c..85d3e364c 100644
--- a/pki/base/common/src/com/netscape/certsrv/connector/IResender.java
+++ b/base/common/src/com/netscape/certsrv/connector/IResender.java
diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/DBResources.java b/base/common/src/com/netscape/certsrv/dbs/DBResources.java
index a2201b8e6..a2201b8e6 100644
--- a/pki/base/common/src/com/netscape/certsrv/dbs/DBResources.java
+++ b/base/common/src/com/netscape/certsrv/dbs/DBResources.java
diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/EDBException.java b/base/common/src/com/netscape/certsrv/dbs/EDBException.java
index 77508dca4..77508dca4 100644
--- a/pki/base/common/src/com/netscape/certsrv/dbs/EDBException.java
+++ b/base/common/src/com/netscape/certsrv/dbs/EDBException.java
diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/EDBNotAvailException.java b/base/common/src/com/netscape/certsrv/dbs/EDBNotAvailException.java
index 6afb2dcc3..6afb2dcc3 100644
--- a/pki/base/common/src/com/netscape/certsrv/dbs/EDBNotAvailException.java
+++ b/base/common/src/com/netscape/certsrv/dbs/EDBNotAvailException.java
diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/EDBRecordNotFoundException.java b/base/common/src/com/netscape/certsrv/dbs/EDBRecordNotFoundException.java
index dd3880c12..dd3880c12 100644
--- a/pki/base/common/src/com/netscape/certsrv/dbs/EDBRecordNotFoundException.java
+++ b/base/common/src/com/netscape/certsrv/dbs/EDBRecordNotFoundException.java
diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/IDBAttrMapper.java b/base/common/src/com/netscape/certsrv/dbs/IDBAttrMapper.java
index 27e15bd7d..27e15bd7d 100644
--- a/pki/base/common/src/com/netscape/certsrv/dbs/IDBAttrMapper.java
+++ b/base/common/src/com/netscape/certsrv/dbs/IDBAttrMapper.java
diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/IDBDynAttrMapper.java b/base/common/src/com/netscape/certsrv/dbs/IDBDynAttrMapper.java
index 5684dd4d7..5684dd4d7 100644
--- a/pki/base/common/src/com/netscape/certsrv/dbs/IDBDynAttrMapper.java
+++ b/base/common/src/com/netscape/certsrv/dbs/IDBDynAttrMapper.java
diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/IDBObj.java b/base/common/src/com/netscape/certsrv/dbs/IDBObj.java
index 5c634beeb..5c634beeb 100644
--- a/pki/base/common/src/com/netscape/certsrv/dbs/IDBObj.java
+++ b/base/common/src/com/netscape/certsrv/dbs/IDBObj.java
diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/IDBRegistry.java b/base/common/src/com/netscape/certsrv/dbs/IDBRegistry.java
index 241f3af9f..241f3af9f 100644
--- a/pki/base/common/src/com/netscape/certsrv/dbs/IDBRegistry.java
+++ b/base/common/src/com/netscape/certsrv/dbs/IDBRegistry.java
diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/IDBSSession.java b/base/common/src/com/netscape/certsrv/dbs/IDBSSession.java
index c186d1145..c186d1145 100644
--- a/pki/base/common/src/com/netscape/certsrv/dbs/IDBSSession.java
+++ b/base/common/src/com/netscape/certsrv/dbs/IDBSSession.java
diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/IDBSearchResults.java b/base/common/src/com/netscape/certsrv/dbs/IDBSearchResults.java
index 04736cf32..04736cf32 100644
--- a/pki/base/common/src/com/netscape/certsrv/dbs/IDBSearchResults.java
+++ b/base/common/src/com/netscape/certsrv/dbs/IDBSearchResults.java
diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/IDBSubsystem.java b/base/common/src/com/netscape/certsrv/dbs/IDBSubsystem.java
index fec6e6afa..fec6e6afa 100644
--- a/pki/base/common/src/com/netscape/certsrv/dbs/IDBSubsystem.java
+++ b/base/common/src/com/netscape/certsrv/dbs/IDBSubsystem.java
diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/IDBVirtualList.java b/base/common/src/com/netscape/certsrv/dbs/IDBVirtualList.java
index 919a82efb..919a82efb 100644
--- a/pki/base/common/src/com/netscape/certsrv/dbs/IDBVirtualList.java
+++ b/base/common/src/com/netscape/certsrv/dbs/IDBVirtualList.java
diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/IElementProcessor.java b/base/common/src/com/netscape/certsrv/dbs/IElementProcessor.java
index 648a13aef..648a13aef 100644
--- a/pki/base/common/src/com/netscape/certsrv/dbs/IElementProcessor.java
+++ b/base/common/src/com/netscape/certsrv/dbs/IElementProcessor.java
diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/IFilterConverter.java b/base/common/src/com/netscape/certsrv/dbs/IFilterConverter.java
index 2c0ccb89f..2c0ccb89f 100644
--- a/pki/base/common/src/com/netscape/certsrv/dbs/IFilterConverter.java
+++ b/base/common/src/com/netscape/certsrv/dbs/IFilterConverter.java
diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/Modification.java b/base/common/src/com/netscape/certsrv/dbs/Modification.java
index 6c61bdb1f..6c61bdb1f 100644
--- a/pki/base/common/src/com/netscape/certsrv/dbs/Modification.java
+++ b/base/common/src/com/netscape/certsrv/dbs/Modification.java
diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/ModificationSet.java b/base/common/src/com/netscape/certsrv/dbs/ModificationSet.java
index 70e9b377d..70e9b377d 100644
--- a/pki/base/common/src/com/netscape/certsrv/dbs/ModificationSet.java
+++ b/base/common/src/com/netscape/certsrv/dbs/ModificationSet.java
diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/certdb/ICertRecord.java b/base/common/src/com/netscape/certsrv/dbs/certdb/ICertRecord.java
index d05c9ed5f..d05c9ed5f 100644
--- a/pki/base/common/src/com/netscape/certsrv/dbs/certdb/ICertRecord.java
+++ b/base/common/src/com/netscape/certsrv/dbs/certdb/ICertRecord.java
diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/certdb/ICertRecordList.java b/base/common/src/com/netscape/certsrv/dbs/certdb/ICertRecordList.java
index 59a826ee2..59a826ee2 100644
--- a/pki/base/common/src/com/netscape/certsrv/dbs/certdb/ICertRecordList.java
+++ b/base/common/src/com/netscape/certsrv/dbs/certdb/ICertRecordList.java
diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/certdb/ICertificateRepository.java b/base/common/src/com/netscape/certsrv/dbs/certdb/ICertificateRepository.java
index a8505c2a2..a8505c2a2 100644
--- a/pki/base/common/src/com/netscape/certsrv/dbs/certdb/ICertificateRepository.java
+++ b/base/common/src/com/netscape/certsrv/dbs/certdb/ICertificateRepository.java
diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/certdb/IRevocationInfo.java b/base/common/src/com/netscape/certsrv/dbs/certdb/IRevocationInfo.java
index fb773576c..fb773576c 100644
--- a/pki/base/common/src/com/netscape/certsrv/dbs/certdb/IRevocationInfo.java
+++ b/base/common/src/com/netscape/certsrv/dbs/certdb/IRevocationInfo.java
diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/crldb/ICRLIssuingPointRecord.java b/base/common/src/com/netscape/certsrv/dbs/crldb/ICRLIssuingPointRecord.java
index b990bbf57..b990bbf57 100644
--- a/pki/base/common/src/com/netscape/certsrv/dbs/crldb/ICRLIssuingPointRecord.java
+++ b/base/common/src/com/netscape/certsrv/dbs/crldb/ICRLIssuingPointRecord.java
diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/crldb/ICRLRepository.java b/base/common/src/com/netscape/certsrv/dbs/crldb/ICRLRepository.java
index 806a2cb19..806a2cb19 100644
--- a/pki/base/common/src/com/netscape/certsrv/dbs/crldb/ICRLRepository.java
+++ b/base/common/src/com/netscape/certsrv/dbs/crldb/ICRLRepository.java
diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/keydb/IKeyRecord.java b/base/common/src/com/netscape/certsrv/dbs/keydb/IKeyRecord.java
index 7da212469..7da212469 100644
--- a/pki/base/common/src/com/netscape/certsrv/dbs/keydb/IKeyRecord.java
+++ b/base/common/src/com/netscape/certsrv/dbs/keydb/IKeyRecord.java
diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/keydb/IKeyRecordList.java b/base/common/src/com/netscape/certsrv/dbs/keydb/IKeyRecordList.java
index 75f833892..75f833892 100644
--- a/pki/base/common/src/com/netscape/certsrv/dbs/keydb/IKeyRecordList.java
+++ b/base/common/src/com/netscape/certsrv/dbs/keydb/IKeyRecordList.java
diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/keydb/IKeyRepository.java b/base/common/src/com/netscape/certsrv/dbs/keydb/IKeyRepository.java
index 627844286..627844286 100644
--- a/pki/base/common/src/com/netscape/certsrv/dbs/keydb/IKeyRepository.java
+++ b/base/common/src/com/netscape/certsrv/dbs/keydb/IKeyRepository.java
diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/keydb/KeyId.java b/base/common/src/com/netscape/certsrv/dbs/keydb/KeyId.java
index f998bf97a..f998bf97a 100644
--- a/pki/base/common/src/com/netscape/certsrv/dbs/keydb/KeyId.java
+++ b/base/common/src/com/netscape/certsrv/dbs/keydb/KeyId.java
diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/keydb/KeyIdAdapter.java b/base/common/src/com/netscape/certsrv/dbs/keydb/KeyIdAdapter.java
index 3232999fd..3232999fd 100644
--- a/pki/base/common/src/com/netscape/certsrv/dbs/keydb/KeyIdAdapter.java
+++ b/base/common/src/com/netscape/certsrv/dbs/keydb/KeyIdAdapter.java
diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/keydb/KeyState.java b/base/common/src/com/netscape/certsrv/dbs/keydb/KeyState.java
index fa8a0d768..fa8a0d768 100644
--- a/pki/base/common/src/com/netscape/certsrv/dbs/keydb/KeyState.java
+++ b/base/common/src/com/netscape/certsrv/dbs/keydb/KeyState.java
diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/replicadb/IReplicaIDRepository.java b/base/common/src/com/netscape/certsrv/dbs/replicadb/IReplicaIDRepository.java
index 574adfae9..574adfae9 100644
--- a/pki/base/common/src/com/netscape/certsrv/dbs/replicadb/IReplicaIDRepository.java
+++ b/base/common/src/com/netscape/certsrv/dbs/replicadb/IReplicaIDRepository.java
diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/repository/IRepository.java b/base/common/src/com/netscape/certsrv/dbs/repository/IRepository.java
index 943d4a686..943d4a686 100644
--- a/pki/base/common/src/com/netscape/certsrv/dbs/repository/IRepository.java
+++ b/base/common/src/com/netscape/certsrv/dbs/repository/IRepository.java
diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/repository/IRepositoryRecord.java b/base/common/src/com/netscape/certsrv/dbs/repository/IRepositoryRecord.java
index c46e8419c..c46e8419c 100644
--- a/pki/base/common/src/com/netscape/certsrv/dbs/repository/IRepositoryRecord.java
+++ b/base/common/src/com/netscape/certsrv/dbs/repository/IRepositoryRecord.java
diff --git a/pki/base/common/src/com/netscape/certsrv/evaluators/IAccessEvaluator.java b/base/common/src/com/netscape/certsrv/evaluators/IAccessEvaluator.java
index 31f8b8c2f..31f8b8c2f 100644
--- a/pki/base/common/src/com/netscape/certsrv/evaluators/IAccessEvaluator.java
+++ b/base/common/src/com/netscape/certsrv/evaluators/IAccessEvaluator.java
diff --git a/pki/base/common/src/com/netscape/certsrv/extensions/EExtensionsException.java b/base/common/src/com/netscape/certsrv/extensions/EExtensionsException.java
index 40fe80f99..40fe80f99 100644
--- a/pki/base/common/src/com/netscape/certsrv/extensions/EExtensionsException.java
+++ b/base/common/src/com/netscape/certsrv/extensions/EExtensionsException.java
diff --git a/pki/base/common/src/com/netscape/certsrv/extensions/ExtensionsResources.java b/base/common/src/com/netscape/certsrv/extensions/ExtensionsResources.java
index ca1e4545a..ca1e4545a 100644
--- a/pki/base/common/src/com/netscape/certsrv/extensions/ExtensionsResources.java
+++ b/base/common/src/com/netscape/certsrv/extensions/ExtensionsResources.java
diff --git a/pki/base/common/src/com/netscape/certsrv/extensions/ICMSExtension.java b/base/common/src/com/netscape/certsrv/extensions/ICMSExtension.java
index 04086adcf..04086adcf 100644
--- a/pki/base/common/src/com/netscape/certsrv/extensions/ICMSExtension.java
+++ b/base/common/src/com/netscape/certsrv/extensions/ICMSExtension.java
diff --git a/pki/base/common/src/com/netscape/certsrv/jobs/EJobsException.java b/base/common/src/com/netscape/certsrv/jobs/EJobsException.java
index cc0923ae7..cc0923ae7 100644
--- a/pki/base/common/src/com/netscape/certsrv/jobs/EJobsException.java
+++ b/base/common/src/com/netscape/certsrv/jobs/EJobsException.java
diff --git a/pki/base/common/src/com/netscape/certsrv/jobs/IJob.java b/base/common/src/com/netscape/certsrv/jobs/IJob.java
index 5584d68ff..5584d68ff 100644
--- a/pki/base/common/src/com/netscape/certsrv/jobs/IJob.java
+++ b/base/common/src/com/netscape/certsrv/jobs/IJob.java
diff --git a/pki/base/common/src/com/netscape/certsrv/jobs/IJobCron.java b/base/common/src/com/netscape/certsrv/jobs/IJobCron.java
index f161b5e8d..f161b5e8d 100644
--- a/pki/base/common/src/com/netscape/certsrv/jobs/IJobCron.java
+++ b/base/common/src/com/netscape/certsrv/jobs/IJobCron.java
diff --git a/pki/base/common/src/com/netscape/certsrv/jobs/IJobsScheduler.java b/base/common/src/com/netscape/certsrv/jobs/IJobsScheduler.java
index f4184853d..f4184853d 100644
--- a/pki/base/common/src/com/netscape/certsrv/jobs/IJobsScheduler.java
+++ b/base/common/src/com/netscape/certsrv/jobs/IJobsScheduler.java
diff --git a/pki/base/common/src/com/netscape/certsrv/jobs/JobPlugin.java b/base/common/src/com/netscape/certsrv/jobs/JobPlugin.java
index 46a1b6d7e..46a1b6d7e 100644
--- a/pki/base/common/src/com/netscape/certsrv/jobs/JobPlugin.java
+++ b/base/common/src/com/netscape/certsrv/jobs/JobPlugin.java
diff --git a/pki/base/common/src/com/netscape/certsrv/jobs/JobsResources.java b/base/common/src/com/netscape/certsrv/jobs/JobsResources.java
index ec33137cf..ec33137cf 100644
--- a/pki/base/common/src/com/netscape/certsrv/jobs/JobsResources.java
+++ b/base/common/src/com/netscape/certsrv/jobs/JobsResources.java
diff --git a/pki/base/common/src/com/netscape/certsrv/kra/EKRAException.java b/base/common/src/com/netscape/certsrv/kra/EKRAException.java
index 3f23bfe78..3f23bfe78 100644
--- a/pki/base/common/src/com/netscape/certsrv/kra/EKRAException.java
+++ b/base/common/src/com/netscape/certsrv/kra/EKRAException.java
diff --git a/pki/base/common/src/com/netscape/certsrv/kra/IJoinShares.java b/base/common/src/com/netscape/certsrv/kra/IJoinShares.java
index e9a5ecae5..e9a5ecae5 100644
--- a/pki/base/common/src/com/netscape/certsrv/kra/IJoinShares.java
+++ b/base/common/src/com/netscape/certsrv/kra/IJoinShares.java
diff --git a/pki/base/common/src/com/netscape/certsrv/kra/IKeyRecoveryAuthority.java b/base/common/src/com/netscape/certsrv/kra/IKeyRecoveryAuthority.java
index a7cc40507..a7cc40507 100644
--- a/pki/base/common/src/com/netscape/certsrv/kra/IKeyRecoveryAuthority.java
+++ b/base/common/src/com/netscape/certsrv/kra/IKeyRecoveryAuthority.java
diff --git a/pki/base/common/src/com/netscape/certsrv/kra/IKeyService.java b/base/common/src/com/netscape/certsrv/kra/IKeyService.java
index 13748f2d1..13748f2d1 100644
--- a/pki/base/common/src/com/netscape/certsrv/kra/IKeyService.java
+++ b/base/common/src/com/netscape/certsrv/kra/IKeyService.java
diff --git a/pki/base/common/src/com/netscape/certsrv/kra/IProofOfArchival.java b/base/common/src/com/netscape/certsrv/kra/IProofOfArchival.java
index 20ac336e5..20ac336e5 100644
--- a/pki/base/common/src/com/netscape/certsrv/kra/IProofOfArchival.java
+++ b/base/common/src/com/netscape/certsrv/kra/IProofOfArchival.java
diff --git a/pki/base/common/src/com/netscape/certsrv/kra/IShare.java b/base/common/src/com/netscape/certsrv/kra/IShare.java
index 19e7d7ce2..19e7d7ce2 100644
--- a/pki/base/common/src/com/netscape/certsrv/kra/IShare.java
+++ b/base/common/src/com/netscape/certsrv/kra/IShare.java
diff --git a/pki/base/common/src/com/netscape/certsrv/kra/KRAResources.java b/base/common/src/com/netscape/certsrv/kra/KRAResources.java
index 14b686e63..14b686e63 100644
--- a/pki/base/common/src/com/netscape/certsrv/kra/KRAResources.java
+++ b/base/common/src/com/netscape/certsrv/kra/KRAResources.java
diff --git a/pki/base/common/src/com/netscape/certsrv/kra/ProofOfArchival.java b/base/common/src/com/netscape/certsrv/kra/ProofOfArchival.java
index df05c882f..df05c882f 100644
--- a/pki/base/common/src/com/netscape/certsrv/kra/ProofOfArchival.java
+++ b/base/common/src/com/netscape/certsrv/kra/ProofOfArchival.java
diff --git a/pki/base/common/src/com/netscape/certsrv/ldap/ELdapException.java b/base/common/src/com/netscape/certsrv/ldap/ELdapException.java
index 8c1d2d4a5..8c1d2d4a5 100644
--- a/pki/base/common/src/com/netscape/certsrv/ldap/ELdapException.java
+++ b/base/common/src/com/netscape/certsrv/ldap/ELdapException.java
diff --git a/pki/base/common/src/com/netscape/certsrv/ldap/ELdapServerDownException.java b/base/common/src/com/netscape/certsrv/ldap/ELdapServerDownException.java
index f347b1714..f347b1714 100644
--- a/pki/base/common/src/com/netscape/certsrv/ldap/ELdapServerDownException.java
+++ b/base/common/src/com/netscape/certsrv/ldap/ELdapServerDownException.java
diff --git a/pki/base/common/src/com/netscape/certsrv/ldap/ILdapAuthInfo.java b/base/common/src/com/netscape/certsrv/ldap/ILdapAuthInfo.java
index 4325f077c..4325f077c 100644
--- a/pki/base/common/src/com/netscape/certsrv/ldap/ILdapAuthInfo.java
+++ b/base/common/src/com/netscape/certsrv/ldap/ILdapAuthInfo.java
diff --git a/pki/base/common/src/com/netscape/certsrv/ldap/ILdapBoundConnFactory.java b/base/common/src/com/netscape/certsrv/ldap/ILdapBoundConnFactory.java
index 846f51749..846f51749 100644
--- a/pki/base/common/src/com/netscape/certsrv/ldap/ILdapBoundConnFactory.java
+++ b/base/common/src/com/netscape/certsrv/ldap/ILdapBoundConnFactory.java
diff --git a/pki/base/common/src/com/netscape/certsrv/ldap/ILdapConnFactory.java b/base/common/src/com/netscape/certsrv/ldap/ILdapConnFactory.java
index 738f5832d..738f5832d 100644
--- a/pki/base/common/src/com/netscape/certsrv/ldap/ILdapConnFactory.java
+++ b/base/common/src/com/netscape/certsrv/ldap/ILdapConnFactory.java
diff --git a/pki/base/common/src/com/netscape/certsrv/ldap/ILdapConnInfo.java b/base/common/src/com/netscape/certsrv/ldap/ILdapConnInfo.java
index aa5b388a3..aa5b388a3 100644
--- a/pki/base/common/src/com/netscape/certsrv/ldap/ILdapConnInfo.java
+++ b/base/common/src/com/netscape/certsrv/ldap/ILdapConnInfo.java
diff --git a/pki/base/common/src/com/netscape/certsrv/ldap/ILdapConnModule.java b/base/common/src/com/netscape/certsrv/ldap/ILdapConnModule.java
index efa1c271e..efa1c271e 100644
--- a/pki/base/common/src/com/netscape/certsrv/ldap/ILdapConnModule.java
+++ b/base/common/src/com/netscape/certsrv/ldap/ILdapConnModule.java
diff --git a/pki/base/common/src/com/netscape/certsrv/ldap/LdapResources.java b/base/common/src/com/netscape/certsrv/ldap/LdapResources.java
index 332fcaddf..332fcaddf 100644
--- a/pki/base/common/src/com/netscape/certsrv/ldap/LdapResources.java
+++ b/base/common/src/com/netscape/certsrv/ldap/LdapResources.java
diff --git a/pki/base/common/src/com/netscape/certsrv/listeners/EListenersException.java b/base/common/src/com/netscape/certsrv/listeners/EListenersException.java
index 6aee21ff4..6aee21ff4 100644
--- a/pki/base/common/src/com/netscape/certsrv/listeners/EListenersException.java
+++ b/base/common/src/com/netscape/certsrv/listeners/EListenersException.java
diff --git a/pki/base/common/src/com/netscape/certsrv/listeners/IRequestListenerPlugin.java b/base/common/src/com/netscape/certsrv/listeners/IRequestListenerPlugin.java
index c615586db..c615586db 100644
--- a/pki/base/common/src/com/netscape/certsrv/listeners/IRequestListenerPlugin.java
+++ b/base/common/src/com/netscape/certsrv/listeners/IRequestListenerPlugin.java
diff --git a/pki/base/common/src/com/netscape/certsrv/listeners/ListenersResources.java b/base/common/src/com/netscape/certsrv/listeners/ListenersResources.java
index 9eaf41371..9eaf41371 100644
--- a/pki/base/common/src/com/netscape/certsrv/listeners/ListenersResources.java
+++ b/base/common/src/com/netscape/certsrv/listeners/ListenersResources.java
diff --git a/pki/base/common/src/com/netscape/certsrv/logging/AuditEvent.java b/base/common/src/com/netscape/certsrv/logging/AuditEvent.java
index aa0077b06..aa0077b06 100644
--- a/pki/base/common/src/com/netscape/certsrv/logging/AuditEvent.java
+++ b/base/common/src/com/netscape/certsrv/logging/AuditEvent.java
diff --git a/pki/base/common/src/com/netscape/certsrv/logging/AuditFormat.java b/base/common/src/com/netscape/certsrv/logging/AuditFormat.java
index e5f8726f7..e5f8726f7 100644
--- a/pki/base/common/src/com/netscape/certsrv/logging/AuditFormat.java
+++ b/base/common/src/com/netscape/certsrv/logging/AuditFormat.java
diff --git a/pki/base/common/src/com/netscape/certsrv/logging/ConsoleError.java b/base/common/src/com/netscape/certsrv/logging/ConsoleError.java
index 13e0f3d45..13e0f3d45 100644
--- a/pki/base/common/src/com/netscape/certsrv/logging/ConsoleError.java
+++ b/base/common/src/com/netscape/certsrv/logging/ConsoleError.java
diff --git a/pki/base/common/src/com/netscape/certsrv/logging/ConsoleLog.java b/base/common/src/com/netscape/certsrv/logging/ConsoleLog.java
index 2e87fc92c..2e87fc92c 100644
--- a/pki/base/common/src/com/netscape/certsrv/logging/ConsoleLog.java
+++ b/base/common/src/com/netscape/certsrv/logging/ConsoleLog.java
diff --git a/pki/base/common/src/com/netscape/certsrv/logging/ELogException.java b/base/common/src/com/netscape/certsrv/logging/ELogException.java
index 717dbdfe2..717dbdfe2 100644
--- a/pki/base/common/src/com/netscape/certsrv/logging/ELogException.java
+++ b/base/common/src/com/netscape/certsrv/logging/ELogException.java
diff --git a/pki/base/common/src/com/netscape/certsrv/logging/ELogNotFound.java b/base/common/src/com/netscape/certsrv/logging/ELogNotFound.java
index 7de84733c..7de84733c 100644
--- a/pki/base/common/src/com/netscape/certsrv/logging/ELogNotFound.java
+++ b/base/common/src/com/netscape/certsrv/logging/ELogNotFound.java
diff --git a/pki/base/common/src/com/netscape/certsrv/logging/ELogPluginNotFound.java b/base/common/src/com/netscape/certsrv/logging/ELogPluginNotFound.java
index 6c434aff9..6c434aff9 100644
--- a/pki/base/common/src/com/netscape/certsrv/logging/ELogPluginNotFound.java
+++ b/base/common/src/com/netscape/certsrv/logging/ELogPluginNotFound.java
diff --git a/pki/base/common/src/com/netscape/certsrv/logging/IBundleLogEvent.java b/base/common/src/com/netscape/certsrv/logging/IBundleLogEvent.java
index 9dd8595cf..9dd8595cf 100644
--- a/pki/base/common/src/com/netscape/certsrv/logging/IBundleLogEvent.java
+++ b/base/common/src/com/netscape/certsrv/logging/IBundleLogEvent.java
diff --git a/pki/base/common/src/com/netscape/certsrv/logging/ILogEvent.java b/base/common/src/com/netscape/certsrv/logging/ILogEvent.java
index 423918983..423918983 100644
--- a/pki/base/common/src/com/netscape/certsrv/logging/ILogEvent.java
+++ b/base/common/src/com/netscape/certsrv/logging/ILogEvent.java
diff --git a/pki/base/common/src/com/netscape/certsrv/logging/ILogEventFactory.java b/base/common/src/com/netscape/certsrv/logging/ILogEventFactory.java
index bfd5be930..bfd5be930 100644
--- a/pki/base/common/src/com/netscape/certsrv/logging/ILogEventFactory.java
+++ b/base/common/src/com/netscape/certsrv/logging/ILogEventFactory.java
diff --git a/pki/base/common/src/com/netscape/certsrv/logging/ILogEventListener.java b/base/common/src/com/netscape/certsrv/logging/ILogEventListener.java
index 15ff08ad5..15ff08ad5 100644
--- a/pki/base/common/src/com/netscape/certsrv/logging/ILogEventListener.java
+++ b/base/common/src/com/netscape/certsrv/logging/ILogEventListener.java
diff --git a/pki/base/common/src/com/netscape/certsrv/logging/ILogQueue.java b/base/common/src/com/netscape/certsrv/logging/ILogQueue.java
index bca7a93df..bca7a93df 100644
--- a/pki/base/common/src/com/netscape/certsrv/logging/ILogQueue.java
+++ b/base/common/src/com/netscape/certsrv/logging/ILogQueue.java
diff --git a/pki/base/common/src/com/netscape/certsrv/logging/ILogSubsystem.java b/base/common/src/com/netscape/certsrv/logging/ILogSubsystem.java
index ce317a5b8..ce317a5b8 100644
--- a/pki/base/common/src/com/netscape/certsrv/logging/ILogSubsystem.java
+++ b/base/common/src/com/netscape/certsrv/logging/ILogSubsystem.java
diff --git a/pki/base/common/src/com/netscape/certsrv/logging/ILogger.java b/base/common/src/com/netscape/certsrv/logging/ILogger.java
index 4cdb4b80f..4cdb4b80f 100644
--- a/pki/base/common/src/com/netscape/certsrv/logging/ILogger.java
+++ b/base/common/src/com/netscape/certsrv/logging/ILogger.java
diff --git a/pki/base/common/src/com/netscape/certsrv/logging/LogPlugin.java b/base/common/src/com/netscape/certsrv/logging/LogPlugin.java
index 9d7a5cc45..9d7a5cc45 100644
--- a/pki/base/common/src/com/netscape/certsrv/logging/LogPlugin.java
+++ b/base/common/src/com/netscape/certsrv/logging/LogPlugin.java
diff --git a/pki/base/common/src/com/netscape/certsrv/logging/LogResources.java b/base/common/src/com/netscape/certsrv/logging/LogResources.java
index 899bf1893..899bf1893 100644
--- a/pki/base/common/src/com/netscape/certsrv/logging/LogResources.java
+++ b/base/common/src/com/netscape/certsrv/logging/LogResources.java
diff --git a/pki/base/common/src/com/netscape/certsrv/logging/SignedAuditEvent.java b/base/common/src/com/netscape/certsrv/logging/SignedAuditEvent.java
index 8541eda34..8541eda34 100644
--- a/pki/base/common/src/com/netscape/certsrv/logging/SignedAuditEvent.java
+++ b/base/common/src/com/netscape/certsrv/logging/SignedAuditEvent.java
diff --git a/pki/base/common/src/com/netscape/certsrv/logging/SystemEvent.java b/base/common/src/com/netscape/certsrv/logging/SystemEvent.java
index 9f625cdfd..9f625cdfd 100644
--- a/pki/base/common/src/com/netscape/certsrv/logging/SystemEvent.java
+++ b/base/common/src/com/netscape/certsrv/logging/SystemEvent.java
diff --git a/pki/base/common/src/com/netscape/certsrv/notification/ENotificationException.java b/base/common/src/com/netscape/certsrv/notification/ENotificationException.java
index fffc8edeb..fffc8edeb 100644
--- a/pki/base/common/src/com/netscape/certsrv/notification/ENotificationException.java
+++ b/base/common/src/com/netscape/certsrv/notification/ENotificationException.java
diff --git a/pki/base/common/src/com/netscape/certsrv/notification/IEmailFormProcessor.java b/base/common/src/com/netscape/certsrv/notification/IEmailFormProcessor.java
index 40114bd1e..40114bd1e 100644
--- a/pki/base/common/src/com/netscape/certsrv/notification/IEmailFormProcessor.java
+++ b/base/common/src/com/netscape/certsrv/notification/IEmailFormProcessor.java
diff --git a/pki/base/common/src/com/netscape/certsrv/notification/IEmailResolver.java b/base/common/src/com/netscape/certsrv/notification/IEmailResolver.java
index 39e5bed37..39e5bed37 100644
--- a/pki/base/common/src/com/netscape/certsrv/notification/IEmailResolver.java
+++ b/base/common/src/com/netscape/certsrv/notification/IEmailResolver.java
diff --git a/pki/base/common/src/com/netscape/certsrv/notification/IEmailResolverKeys.java b/base/common/src/com/netscape/certsrv/notification/IEmailResolverKeys.java
index 1363a9e09..1363a9e09 100644
--- a/pki/base/common/src/com/netscape/certsrv/notification/IEmailResolverKeys.java
+++ b/base/common/src/com/netscape/certsrv/notification/IEmailResolverKeys.java
diff --git a/pki/base/common/src/com/netscape/certsrv/notification/IEmailTemplate.java b/base/common/src/com/netscape/certsrv/notification/IEmailTemplate.java
index cbdea8436..cbdea8436 100644
--- a/pki/base/common/src/com/netscape/certsrv/notification/IEmailTemplate.java
+++ b/base/common/src/com/netscape/certsrv/notification/IEmailTemplate.java
diff --git a/pki/base/common/src/com/netscape/certsrv/notification/IMailNotification.java b/base/common/src/com/netscape/certsrv/notification/IMailNotification.java
index 356a6bba3..356a6bba3 100644
--- a/pki/base/common/src/com/netscape/certsrv/notification/IMailNotification.java
+++ b/base/common/src/com/netscape/certsrv/notification/IMailNotification.java
diff --git a/pki/base/common/src/com/netscape/certsrv/notification/NotificationResources.java b/base/common/src/com/netscape/certsrv/notification/NotificationResources.java
index b81443999..b81443999 100644
--- a/pki/base/common/src/com/netscape/certsrv/notification/NotificationResources.java
+++ b/base/common/src/com/netscape/certsrv/notification/NotificationResources.java
diff --git a/pki/base/common/src/com/netscape/certsrv/ocsp/IDefStore.java b/base/common/src/com/netscape/certsrv/ocsp/IDefStore.java
index ee4c76a08..ee4c76a08 100644
--- a/pki/base/common/src/com/netscape/certsrv/ocsp/IDefStore.java
+++ b/base/common/src/com/netscape/certsrv/ocsp/IDefStore.java
diff --git a/pki/base/common/src/com/netscape/certsrv/ocsp/IOCSPAuthority.java b/base/common/src/com/netscape/certsrv/ocsp/IOCSPAuthority.java
index 0219d357d..0219d357d 100644
--- a/pki/base/common/src/com/netscape/certsrv/ocsp/IOCSPAuthority.java
+++ b/base/common/src/com/netscape/certsrv/ocsp/IOCSPAuthority.java
diff --git a/pki/base/common/src/com/netscape/certsrv/ocsp/IOCSPService.java b/base/common/src/com/netscape/certsrv/ocsp/IOCSPService.java
index 574289c29..574289c29 100644
--- a/pki/base/common/src/com/netscape/certsrv/ocsp/IOCSPService.java
+++ b/base/common/src/com/netscape/certsrv/ocsp/IOCSPService.java
diff --git a/pki/base/common/src/com/netscape/certsrv/ocsp/IOCSPStore.java b/base/common/src/com/netscape/certsrv/ocsp/IOCSPStore.java
index 676122105..676122105 100644
--- a/pki/base/common/src/com/netscape/certsrv/ocsp/IOCSPStore.java
+++ b/base/common/src/com/netscape/certsrv/ocsp/IOCSPStore.java
diff --git a/pki/base/common/src/com/netscape/certsrv/password/EPasswordCheckException.java b/base/common/src/com/netscape/certsrv/password/EPasswordCheckException.java
index 3dc028ffb..3dc028ffb 100644
--- a/pki/base/common/src/com/netscape/certsrv/password/EPasswordCheckException.java
+++ b/base/common/src/com/netscape/certsrv/password/EPasswordCheckException.java
diff --git a/pki/base/common/src/com/netscape/certsrv/password/IConfigPasswordCheck.java b/base/common/src/com/netscape/certsrv/password/IConfigPasswordCheck.java
index 8b23fa513..8b23fa513 100644
--- a/pki/base/common/src/com/netscape/certsrv/password/IConfigPasswordCheck.java
+++ b/base/common/src/com/netscape/certsrv/password/IConfigPasswordCheck.java
diff --git a/pki/base/common/src/com/netscape/certsrv/password/IPasswordCheck.java b/base/common/src/com/netscape/certsrv/password/IPasswordCheck.java
index d885d3fce..d885d3fce 100644
--- a/pki/base/common/src/com/netscape/certsrv/password/IPasswordCheck.java
+++ b/base/common/src/com/netscape/certsrv/password/IPasswordCheck.java
diff --git a/pki/base/common/src/com/netscape/certsrv/pattern/AttrSetCollection.java b/base/common/src/com/netscape/certsrv/pattern/AttrSetCollection.java
index 5f73fc257..5f73fc257 100644
--- a/pki/base/common/src/com/netscape/certsrv/pattern/AttrSetCollection.java
+++ b/base/common/src/com/netscape/certsrv/pattern/AttrSetCollection.java
diff --git a/pki/base/common/src/com/netscape/certsrv/pattern/Pattern.java b/base/common/src/com/netscape/certsrv/pattern/Pattern.java
index bce3a426b..bce3a426b 100644
--- a/pki/base/common/src/com/netscape/certsrv/pattern/Pattern.java
+++ b/base/common/src/com/netscape/certsrv/pattern/Pattern.java
diff --git a/pki/base/common/src/com/netscape/certsrv/policy/EPolicyException.java b/base/common/src/com/netscape/certsrv/policy/EPolicyException.java
index f32f4f64f..f32f4f64f 100644
--- a/pki/base/common/src/com/netscape/certsrv/policy/EPolicyException.java
+++ b/base/common/src/com/netscape/certsrv/policy/EPolicyException.java
diff --git a/pki/base/common/src/com/netscape/certsrv/policy/IEnrollmentPolicy.java b/base/common/src/com/netscape/certsrv/policy/IEnrollmentPolicy.java
index 7c789932a..7c789932a 100644
--- a/pki/base/common/src/com/netscape/certsrv/policy/IEnrollmentPolicy.java
+++ b/base/common/src/com/netscape/certsrv/policy/IEnrollmentPolicy.java
diff --git a/pki/base/common/src/com/netscape/certsrv/policy/IExpression.java b/base/common/src/com/netscape/certsrv/policy/IExpression.java
index 4075e8683..4075e8683 100644
--- a/pki/base/common/src/com/netscape/certsrv/policy/IExpression.java
+++ b/base/common/src/com/netscape/certsrv/policy/IExpression.java
diff --git a/pki/base/common/src/com/netscape/certsrv/policy/IGeneralNameAsConstraintsConfig.java b/base/common/src/com/netscape/certsrv/policy/IGeneralNameAsConstraintsConfig.java
index 78ec31198..78ec31198 100644
--- a/pki/base/common/src/com/netscape/certsrv/policy/IGeneralNameAsConstraintsConfig.java
+++ b/base/common/src/com/netscape/certsrv/policy/IGeneralNameAsConstraintsConfig.java
diff --git a/pki/base/common/src/com/netscape/certsrv/policy/IGeneralNameConfig.java b/base/common/src/com/netscape/certsrv/policy/IGeneralNameConfig.java
index 193269bbd..193269bbd 100644
--- a/pki/base/common/src/com/netscape/certsrv/policy/IGeneralNameConfig.java
+++ b/base/common/src/com/netscape/certsrv/policy/IGeneralNameConfig.java
diff --git a/pki/base/common/src/com/netscape/certsrv/policy/IGeneralNameUtil.java b/base/common/src/com/netscape/certsrv/policy/IGeneralNameUtil.java
index 102b25ccd..102b25ccd 100644
--- a/pki/base/common/src/com/netscape/certsrv/policy/IGeneralNameUtil.java
+++ b/base/common/src/com/netscape/certsrv/policy/IGeneralNameUtil.java
diff --git a/pki/base/common/src/com/netscape/certsrv/policy/IGeneralNamesAsConstraintsConfig.java b/base/common/src/com/netscape/certsrv/policy/IGeneralNamesAsConstraintsConfig.java
index aeb7867e3..aeb7867e3 100644
--- a/pki/base/common/src/com/netscape/certsrv/policy/IGeneralNamesAsConstraintsConfig.java
+++ b/base/common/src/com/netscape/certsrv/policy/IGeneralNamesAsConstraintsConfig.java
diff --git a/pki/base/common/src/com/netscape/certsrv/policy/IGeneralNamesConfig.java b/base/common/src/com/netscape/certsrv/policy/IGeneralNamesConfig.java
index 2074b9d19..2074b9d19 100644
--- a/pki/base/common/src/com/netscape/certsrv/policy/IGeneralNamesConfig.java
+++ b/base/common/src/com/netscape/certsrv/policy/IGeneralNamesConfig.java
diff --git a/pki/base/common/src/com/netscape/certsrv/policy/IKeyArchivalPolicy.java b/base/common/src/com/netscape/certsrv/policy/IKeyArchivalPolicy.java
index 14a29256f..14a29256f 100644
--- a/pki/base/common/src/com/netscape/certsrv/policy/IKeyArchivalPolicy.java
+++ b/base/common/src/com/netscape/certsrv/policy/IKeyArchivalPolicy.java
diff --git a/pki/base/common/src/com/netscape/certsrv/policy/IKeyRecoveryPolicy.java b/base/common/src/com/netscape/certsrv/policy/IKeyRecoveryPolicy.java
index 6de615673..6de615673 100644
--- a/pki/base/common/src/com/netscape/certsrv/policy/IKeyRecoveryPolicy.java
+++ b/base/common/src/com/netscape/certsrv/policy/IKeyRecoveryPolicy.java
diff --git a/pki/base/common/src/com/netscape/certsrv/policy/IPolicyPredicateParser.java b/base/common/src/com/netscape/certsrv/policy/IPolicyPredicateParser.java
index 0992beaeb..0992beaeb 100644
--- a/pki/base/common/src/com/netscape/certsrv/policy/IPolicyPredicateParser.java
+++ b/base/common/src/com/netscape/certsrv/policy/IPolicyPredicateParser.java
diff --git a/pki/base/common/src/com/netscape/certsrv/policy/IPolicyProcessor.java b/base/common/src/com/netscape/certsrv/policy/IPolicyProcessor.java
index 11927a03f..11927a03f 100644
--- a/pki/base/common/src/com/netscape/certsrv/policy/IPolicyProcessor.java
+++ b/base/common/src/com/netscape/certsrv/policy/IPolicyProcessor.java
diff --git a/pki/base/common/src/com/netscape/certsrv/policy/IPolicyRule.java b/base/common/src/com/netscape/certsrv/policy/IPolicyRule.java
index 7f7f888f6..7f7f888f6 100644
--- a/pki/base/common/src/com/netscape/certsrv/policy/IPolicyRule.java
+++ b/base/common/src/com/netscape/certsrv/policy/IPolicyRule.java
diff --git a/pki/base/common/src/com/netscape/certsrv/policy/IPolicySet.java b/base/common/src/com/netscape/certsrv/policy/IPolicySet.java
index a9fb6a2d2..a9fb6a2d2 100644
--- a/pki/base/common/src/com/netscape/certsrv/policy/IPolicySet.java
+++ b/base/common/src/com/netscape/certsrv/policy/IPolicySet.java
diff --git a/pki/base/common/src/com/netscape/certsrv/policy/IRenewalPolicy.java b/base/common/src/com/netscape/certsrv/policy/IRenewalPolicy.java
index 28f56fe73..28f56fe73 100644
--- a/pki/base/common/src/com/netscape/certsrv/policy/IRenewalPolicy.java
+++ b/base/common/src/com/netscape/certsrv/policy/IRenewalPolicy.java
diff --git a/pki/base/common/src/com/netscape/certsrv/policy/IRevocationPolicy.java b/base/common/src/com/netscape/certsrv/policy/IRevocationPolicy.java
index 7e6084c76..7e6084c76 100644
--- a/pki/base/common/src/com/netscape/certsrv/policy/IRevocationPolicy.java
+++ b/base/common/src/com/netscape/certsrv/policy/IRevocationPolicy.java
diff --git a/pki/base/common/src/com/netscape/certsrv/policy/ISubjAltNameConfig.java b/base/common/src/com/netscape/certsrv/policy/ISubjAltNameConfig.java
index 0fee01be2..0fee01be2 100644
--- a/pki/base/common/src/com/netscape/certsrv/policy/ISubjAltNameConfig.java
+++ b/base/common/src/com/netscape/certsrv/policy/ISubjAltNameConfig.java
diff --git a/pki/base/common/src/com/netscape/certsrv/policy/PolicyResources.java b/base/common/src/com/netscape/certsrv/policy/PolicyResources.java
index d330b719f..d330b719f 100644
--- a/pki/base/common/src/com/netscape/certsrv/policy/PolicyResources.java
+++ b/base/common/src/com/netscape/certsrv/policy/PolicyResources.java
diff --git a/pki/base/common/src/com/netscape/certsrv/profile/CertInfoProfile.java b/base/common/src/com/netscape/certsrv/profile/CertInfoProfile.java
index 5c192e9cd..5c192e9cd 100644
--- a/pki/base/common/src/com/netscape/certsrv/profile/CertInfoProfile.java
+++ b/base/common/src/com/netscape/certsrv/profile/CertInfoProfile.java
diff --git a/pki/base/common/src/com/netscape/certsrv/profile/EDeferException.java b/base/common/src/com/netscape/certsrv/profile/EDeferException.java
index c92630b97..c92630b97 100644
--- a/pki/base/common/src/com/netscape/certsrv/profile/EDeferException.java
+++ b/base/common/src/com/netscape/certsrv/profile/EDeferException.java
diff --git a/pki/base/common/src/com/netscape/certsrv/profile/EProfileException.java b/base/common/src/com/netscape/certsrv/profile/EProfileException.java
index 37f968a67..37f968a67 100644
--- a/pki/base/common/src/com/netscape/certsrv/profile/EProfileException.java
+++ b/base/common/src/com/netscape/certsrv/profile/EProfileException.java
diff --git a/pki/base/common/src/com/netscape/certsrv/profile/ERejectException.java b/base/common/src/com/netscape/certsrv/profile/ERejectException.java
index 59b35bcdb..59b35bcdb 100644
--- a/pki/base/common/src/com/netscape/certsrv/profile/ERejectException.java
+++ b/base/common/src/com/netscape/certsrv/profile/ERejectException.java
diff --git a/pki/base/common/src/com/netscape/certsrv/profile/ICertInfoPolicyDefault.java b/base/common/src/com/netscape/certsrv/profile/ICertInfoPolicyDefault.java
index 698791296..698791296 100644
--- a/pki/base/common/src/com/netscape/certsrv/profile/ICertInfoPolicyDefault.java
+++ b/base/common/src/com/netscape/certsrv/profile/ICertInfoPolicyDefault.java
diff --git a/pki/base/common/src/com/netscape/certsrv/profile/IEnrollProfile.java b/base/common/src/com/netscape/certsrv/profile/IEnrollProfile.java
index 189530f7a..189530f7a 100644
--- a/pki/base/common/src/com/netscape/certsrv/profile/IEnrollProfile.java
+++ b/base/common/src/com/netscape/certsrv/profile/IEnrollProfile.java
diff --git a/pki/base/common/src/com/netscape/certsrv/profile/IPolicyConstraint.java b/base/common/src/com/netscape/certsrv/profile/IPolicyConstraint.java
index bf2374652..bf2374652 100644
--- a/pki/base/common/src/com/netscape/certsrv/profile/IPolicyConstraint.java
+++ b/base/common/src/com/netscape/certsrv/profile/IPolicyConstraint.java
diff --git a/pki/base/common/src/com/netscape/certsrv/profile/IPolicyDefault.java b/base/common/src/com/netscape/certsrv/profile/IPolicyDefault.java
index 469d6dded..469d6dded 100644
--- a/pki/base/common/src/com/netscape/certsrv/profile/IPolicyDefault.java
+++ b/base/common/src/com/netscape/certsrv/profile/IPolicyDefault.java
diff --git a/pki/base/common/src/com/netscape/certsrv/profile/IProfile.java b/base/common/src/com/netscape/certsrv/profile/IProfile.java
index 0cd39c091..0cd39c091 100644
--- a/pki/base/common/src/com/netscape/certsrv/profile/IProfile.java
+++ b/base/common/src/com/netscape/certsrv/profile/IProfile.java
diff --git a/pki/base/common/src/com/netscape/certsrv/profile/IProfileAuthenticator.java b/base/common/src/com/netscape/certsrv/profile/IProfileAuthenticator.java
index 98546c601..98546c601 100644
--- a/pki/base/common/src/com/netscape/certsrv/profile/IProfileAuthenticator.java
+++ b/base/common/src/com/netscape/certsrv/profile/IProfileAuthenticator.java
diff --git a/pki/base/common/src/com/netscape/certsrv/profile/IProfileContext.java b/base/common/src/com/netscape/certsrv/profile/IProfileContext.java
index b3c27d040..b3c27d040 100644
--- a/pki/base/common/src/com/netscape/certsrv/profile/IProfileContext.java
+++ b/base/common/src/com/netscape/certsrv/profile/IProfileContext.java
diff --git a/pki/base/common/src/com/netscape/certsrv/profile/IProfileEx.java b/base/common/src/com/netscape/certsrv/profile/IProfileEx.java
index 79e4f4175..79e4f4175 100644
--- a/pki/base/common/src/com/netscape/certsrv/profile/IProfileEx.java
+++ b/base/common/src/com/netscape/certsrv/profile/IProfileEx.java
diff --git a/pki/base/common/src/com/netscape/certsrv/profile/IProfileInput.java b/base/common/src/com/netscape/certsrv/profile/IProfileInput.java
index 4ef598698..4ef598698 100644
--- a/pki/base/common/src/com/netscape/certsrv/profile/IProfileInput.java
+++ b/base/common/src/com/netscape/certsrv/profile/IProfileInput.java
diff --git a/pki/base/common/src/com/netscape/certsrv/profile/IProfileOutput.java b/base/common/src/com/netscape/certsrv/profile/IProfileOutput.java
index b60e4475b..b60e4475b 100644
--- a/pki/base/common/src/com/netscape/certsrv/profile/IProfileOutput.java
+++ b/base/common/src/com/netscape/certsrv/profile/IProfileOutput.java
diff --git a/pki/base/common/src/com/netscape/certsrv/profile/IProfilePolicy.java b/base/common/src/com/netscape/certsrv/profile/IProfilePolicy.java
index d231f8d55..d231f8d55 100644
--- a/pki/base/common/src/com/netscape/certsrv/profile/IProfilePolicy.java
+++ b/base/common/src/com/netscape/certsrv/profile/IProfilePolicy.java
diff --git a/pki/base/common/src/com/netscape/certsrv/profile/IProfileSubsystem.java b/base/common/src/com/netscape/certsrv/profile/IProfileSubsystem.java
index b7a68445b..b7a68445b 100644
--- a/pki/base/common/src/com/netscape/certsrv/profile/IProfileSubsystem.java
+++ b/base/common/src/com/netscape/certsrv/profile/IProfileSubsystem.java
diff --git a/pki/base/common/src/com/netscape/certsrv/profile/IProfileUpdater.java b/base/common/src/com/netscape/certsrv/profile/IProfileUpdater.java
index 3749cd1d2..3749cd1d2 100644
--- a/pki/base/common/src/com/netscape/certsrv/profile/IProfileUpdater.java
+++ b/base/common/src/com/netscape/certsrv/profile/IProfileUpdater.java
diff --git a/pki/base/common/src/com/netscape/certsrv/property/Descriptor.java b/base/common/src/com/netscape/certsrv/property/Descriptor.java
index bd2b56340..bd2b56340 100644
--- a/pki/base/common/src/com/netscape/certsrv/property/Descriptor.java
+++ b/base/common/src/com/netscape/certsrv/property/Descriptor.java
diff --git a/pki/base/common/src/com/netscape/certsrv/property/EPropertyException.java b/base/common/src/com/netscape/certsrv/property/EPropertyException.java
index 23f59a25f..23f59a25f 100644
--- a/pki/base/common/src/com/netscape/certsrv/property/EPropertyException.java
+++ b/base/common/src/com/netscape/certsrv/property/EPropertyException.java
diff --git a/pki/base/common/src/com/netscape/certsrv/property/IConfigTemplate.java b/base/common/src/com/netscape/certsrv/property/IConfigTemplate.java
index 431c90de9..431c90de9 100644
--- a/pki/base/common/src/com/netscape/certsrv/property/IConfigTemplate.java
+++ b/base/common/src/com/netscape/certsrv/property/IConfigTemplate.java
diff --git a/pki/base/common/src/com/netscape/certsrv/property/IDescriptor.java b/base/common/src/com/netscape/certsrv/property/IDescriptor.java
index 727c1130d..727c1130d 100644
--- a/pki/base/common/src/com/netscape/certsrv/property/IDescriptor.java
+++ b/base/common/src/com/netscape/certsrv/property/IDescriptor.java
diff --git a/pki/base/common/src/com/netscape/certsrv/property/PropertySet.java b/base/common/src/com/netscape/certsrv/property/PropertySet.java
index dc839deb1..dc839deb1 100644
--- a/pki/base/common/src/com/netscape/certsrv/property/PropertySet.java
+++ b/base/common/src/com/netscape/certsrv/property/PropertySet.java
diff --git a/pki/base/common/src/com/netscape/certsrv/publish/ECompSyntaxErr.java b/base/common/src/com/netscape/certsrv/publish/ECompSyntaxErr.java
index a3a109900..a3a109900 100644
--- a/pki/base/common/src/com/netscape/certsrv/publish/ECompSyntaxErr.java
+++ b/base/common/src/com/netscape/certsrv/publish/ECompSyntaxErr.java
diff --git a/pki/base/common/src/com/netscape/certsrv/publish/EMapperNotFound.java b/base/common/src/com/netscape/certsrv/publish/EMapperNotFound.java
index fdf4a1b9f..fdf4a1b9f 100644
--- a/pki/base/common/src/com/netscape/certsrv/publish/EMapperNotFound.java
+++ b/base/common/src/com/netscape/certsrv/publish/EMapperNotFound.java
diff --git a/pki/base/common/src/com/netscape/certsrv/publish/EMapperPluginNotFound.java b/base/common/src/com/netscape/certsrv/publish/EMapperPluginNotFound.java
index f8f18c5ff..f8f18c5ff 100644
--- a/pki/base/common/src/com/netscape/certsrv/publish/EMapperPluginNotFound.java
+++ b/base/common/src/com/netscape/certsrv/publish/EMapperPluginNotFound.java
diff --git a/pki/base/common/src/com/netscape/certsrv/publish/EPublisherNotFound.java b/base/common/src/com/netscape/certsrv/publish/EPublisherNotFound.java
index 176001e99..176001e99 100644
--- a/pki/base/common/src/com/netscape/certsrv/publish/EPublisherNotFound.java
+++ b/base/common/src/com/netscape/certsrv/publish/EPublisherNotFound.java
diff --git a/pki/base/common/src/com/netscape/certsrv/publish/EPublisherPluginNotFound.java b/base/common/src/com/netscape/certsrv/publish/EPublisherPluginNotFound.java
index 56076863a..56076863a 100644
--- a/pki/base/common/src/com/netscape/certsrv/publish/EPublisherPluginNotFound.java
+++ b/base/common/src/com/netscape/certsrv/publish/EPublisherPluginNotFound.java
diff --git a/pki/base/common/src/com/netscape/certsrv/publish/ERuleNotFound.java b/base/common/src/com/netscape/certsrv/publish/ERuleNotFound.java
index 01c9897eb..01c9897eb 100644
--- a/pki/base/common/src/com/netscape/certsrv/publish/ERuleNotFound.java
+++ b/base/common/src/com/netscape/certsrv/publish/ERuleNotFound.java
diff --git a/pki/base/common/src/com/netscape/certsrv/publish/ERulePluginNotFound.java b/base/common/src/com/netscape/certsrv/publish/ERulePluginNotFound.java
index f619e7f4a..f619e7f4a 100644
--- a/pki/base/common/src/com/netscape/certsrv/publish/ERulePluginNotFound.java
+++ b/base/common/src/com/netscape/certsrv/publish/ERulePluginNotFound.java
diff --git a/pki/base/common/src/com/netscape/certsrv/publish/ICRLPublisher.java b/base/common/src/com/netscape/certsrv/publish/ICRLPublisher.java
index cd5763cdb..cd5763cdb 100644
--- a/pki/base/common/src/com/netscape/certsrv/publish/ICRLPublisher.java
+++ b/base/common/src/com/netscape/certsrv/publish/ICRLPublisher.java
diff --git a/pki/base/common/src/com/netscape/certsrv/publish/ILdapCertMapper.java b/base/common/src/com/netscape/certsrv/publish/ILdapCertMapper.java
index 3acaeb580..3acaeb580 100644
--- a/pki/base/common/src/com/netscape/certsrv/publish/ILdapCertMapper.java
+++ b/base/common/src/com/netscape/certsrv/publish/ILdapCertMapper.java
diff --git a/pki/base/common/src/com/netscape/certsrv/publish/ILdapCrlMapper.java b/base/common/src/com/netscape/certsrv/publish/ILdapCrlMapper.java
index 252a09ec3..252a09ec3 100644
--- a/pki/base/common/src/com/netscape/certsrv/publish/ILdapCrlMapper.java
+++ b/base/common/src/com/netscape/certsrv/publish/ILdapCrlMapper.java
diff --git a/pki/base/common/src/com/netscape/certsrv/publish/ILdapExpression.java b/base/common/src/com/netscape/certsrv/publish/ILdapExpression.java
index 4537636c1..4537636c1 100644
--- a/pki/base/common/src/com/netscape/certsrv/publish/ILdapExpression.java
+++ b/base/common/src/com/netscape/certsrv/publish/ILdapExpression.java
diff --git a/pki/base/common/src/com/netscape/certsrv/publish/ILdapMapper.java b/base/common/src/com/netscape/certsrv/publish/ILdapMapper.java
index 09238421f..09238421f 100644
--- a/pki/base/common/src/com/netscape/certsrv/publish/ILdapMapper.java
+++ b/base/common/src/com/netscape/certsrv/publish/ILdapMapper.java
diff --git a/pki/base/common/src/com/netscape/certsrv/publish/ILdapPlugin.java b/base/common/src/com/netscape/certsrv/publish/ILdapPlugin.java
index b0a9fe73b..b0a9fe73b 100644
--- a/pki/base/common/src/com/netscape/certsrv/publish/ILdapPlugin.java
+++ b/base/common/src/com/netscape/certsrv/publish/ILdapPlugin.java
diff --git a/pki/base/common/src/com/netscape/certsrv/publish/ILdapPluginImpl.java b/base/common/src/com/netscape/certsrv/publish/ILdapPluginImpl.java
index db52a9106..db52a9106 100644
--- a/pki/base/common/src/com/netscape/certsrv/publish/ILdapPluginImpl.java
+++ b/base/common/src/com/netscape/certsrv/publish/ILdapPluginImpl.java
diff --git a/pki/base/common/src/com/netscape/certsrv/publish/ILdapPublishModule.java b/base/common/src/com/netscape/certsrv/publish/ILdapPublishModule.java
index 81e5be952..81e5be952 100644
--- a/pki/base/common/src/com/netscape/certsrv/publish/ILdapPublishModule.java
+++ b/base/common/src/com/netscape/certsrv/publish/ILdapPublishModule.java
diff --git a/pki/base/common/src/com/netscape/certsrv/publish/ILdapPublisher.java b/base/common/src/com/netscape/certsrv/publish/ILdapPublisher.java
index 398d86453..398d86453 100644
--- a/pki/base/common/src/com/netscape/certsrv/publish/ILdapPublisher.java
+++ b/base/common/src/com/netscape/certsrv/publish/ILdapPublisher.java
diff --git a/pki/base/common/src/com/netscape/certsrv/publish/ILdapRule.java b/base/common/src/com/netscape/certsrv/publish/ILdapRule.java
index 7bf19b070..7bf19b070 100644
--- a/pki/base/common/src/com/netscape/certsrv/publish/ILdapRule.java
+++ b/base/common/src/com/netscape/certsrv/publish/ILdapRule.java
diff --git a/pki/base/common/src/com/netscape/certsrv/publish/IPublishRuleSet.java b/base/common/src/com/netscape/certsrv/publish/IPublishRuleSet.java
index 911d4e132..911d4e132 100644
--- a/pki/base/common/src/com/netscape/certsrv/publish/IPublishRuleSet.java
+++ b/base/common/src/com/netscape/certsrv/publish/IPublishRuleSet.java
diff --git a/pki/base/common/src/com/netscape/certsrv/publish/IPublisherProcessor.java b/base/common/src/com/netscape/certsrv/publish/IPublisherProcessor.java
index 3ed985403..3ed985403 100644
--- a/pki/base/common/src/com/netscape/certsrv/publish/IPublisherProcessor.java
+++ b/base/common/src/com/netscape/certsrv/publish/IPublisherProcessor.java
diff --git a/pki/base/common/src/com/netscape/certsrv/publish/IXcertPublisherProcessor.java b/base/common/src/com/netscape/certsrv/publish/IXcertPublisherProcessor.java
index b70a0626d..b70a0626d 100644
--- a/pki/base/common/src/com/netscape/certsrv/publish/IXcertPublisherProcessor.java
+++ b/base/common/src/com/netscape/certsrv/publish/IXcertPublisherProcessor.java
diff --git a/pki/base/common/src/com/netscape/certsrv/publish/LdapCertMapResult.java b/base/common/src/com/netscape/certsrv/publish/LdapCertMapResult.java
index 84a866095..84a866095 100644
--- a/pki/base/common/src/com/netscape/certsrv/publish/LdapCertMapResult.java
+++ b/base/common/src/com/netscape/certsrv/publish/LdapCertMapResult.java
diff --git a/pki/base/common/src/com/netscape/certsrv/publish/MapperPlugin.java b/base/common/src/com/netscape/certsrv/publish/MapperPlugin.java
index b193e1b5f..b193e1b5f 100644
--- a/pki/base/common/src/com/netscape/certsrv/publish/MapperPlugin.java
+++ b/base/common/src/com/netscape/certsrv/publish/MapperPlugin.java
diff --git a/pki/base/common/src/com/netscape/certsrv/publish/MapperProxy.java b/base/common/src/com/netscape/certsrv/publish/MapperProxy.java
index 95dc98d9c..95dc98d9c 100644
--- a/pki/base/common/src/com/netscape/certsrv/publish/MapperProxy.java
+++ b/base/common/src/com/netscape/certsrv/publish/MapperProxy.java
diff --git a/pki/base/common/src/com/netscape/certsrv/publish/PublisherPlugin.java b/base/common/src/com/netscape/certsrv/publish/PublisherPlugin.java
index 5a163b80c..5a163b80c 100644
--- a/pki/base/common/src/com/netscape/certsrv/publish/PublisherPlugin.java
+++ b/base/common/src/com/netscape/certsrv/publish/PublisherPlugin.java
diff --git a/pki/base/common/src/com/netscape/certsrv/publish/PublisherProxy.java b/base/common/src/com/netscape/certsrv/publish/PublisherProxy.java
index eb71f3e56..eb71f3e56 100644
--- a/pki/base/common/src/com/netscape/certsrv/publish/PublisherProxy.java
+++ b/base/common/src/com/netscape/certsrv/publish/PublisherProxy.java
diff --git a/pki/base/common/src/com/netscape/certsrv/publish/RulePlugin.java b/base/common/src/com/netscape/certsrv/publish/RulePlugin.java
index b37a24d51..b37a24d51 100644
--- a/pki/base/common/src/com/netscape/certsrv/publish/RulePlugin.java
+++ b/base/common/src/com/netscape/certsrv/publish/RulePlugin.java
diff --git a/pki/base/common/src/com/netscape/certsrv/ra/IRAService.java b/base/common/src/com/netscape/certsrv/ra/IRAService.java
index 4bab4745c..4bab4745c 100644
--- a/pki/base/common/src/com/netscape/certsrv/ra/IRAService.java
+++ b/base/common/src/com/netscape/certsrv/ra/IRAService.java
diff --git a/pki/base/common/src/com/netscape/certsrv/ra/IRegistrationAuthority.java b/base/common/src/com/netscape/certsrv/ra/IRegistrationAuthority.java
index 8302e2d23..8302e2d23 100644
--- a/pki/base/common/src/com/netscape/certsrv/ra/IRegistrationAuthority.java
+++ b/base/common/src/com/netscape/certsrv/ra/IRegistrationAuthority.java
diff --git a/pki/base/common/src/com/netscape/certsrv/registry/ERegistryException.java b/base/common/src/com/netscape/certsrv/registry/ERegistryException.java
index 5d2e2c91c..5d2e2c91c 100644
--- a/pki/base/common/src/com/netscape/certsrv/registry/ERegistryException.java
+++ b/base/common/src/com/netscape/certsrv/registry/ERegistryException.java
diff --git a/pki/base/common/src/com/netscape/certsrv/registry/IPluginInfo.java b/base/common/src/com/netscape/certsrv/registry/IPluginInfo.java
index 8e6a87365..8e6a87365 100644
--- a/pki/base/common/src/com/netscape/certsrv/registry/IPluginInfo.java
+++ b/base/common/src/com/netscape/certsrv/registry/IPluginInfo.java
diff --git a/pki/base/common/src/com/netscape/certsrv/registry/IPluginRegistry.java b/base/common/src/com/netscape/certsrv/registry/IPluginRegistry.java
index 1c85aeba9..1c85aeba9 100644
--- a/pki/base/common/src/com/netscape/certsrv/registry/IPluginRegistry.java
+++ b/base/common/src/com/netscape/certsrv/registry/IPluginRegistry.java
diff --git a/pki/base/common/src/com/netscape/certsrv/request/ARequestNotifier.java b/base/common/src/com/netscape/certsrv/request/ARequestNotifier.java
index a50996f2b..a50996f2b 100644
--- a/pki/base/common/src/com/netscape/certsrv/request/ARequestNotifier.java
+++ b/base/common/src/com/netscape/certsrv/request/ARequestNotifier.java
diff --git a/pki/base/common/src/com/netscape/certsrv/request/AgentApproval.java b/base/common/src/com/netscape/certsrv/request/AgentApproval.java
index eb3ca06a8..eb3ca06a8 100644
--- a/pki/base/common/src/com/netscape/certsrv/request/AgentApproval.java
+++ b/base/common/src/com/netscape/certsrv/request/AgentApproval.java
diff --git a/pki/base/common/src/com/netscape/certsrv/request/AgentApprovals.java b/base/common/src/com/netscape/certsrv/request/AgentApprovals.java
index d6fa41b8f..d6fa41b8f 100644
--- a/pki/base/common/src/com/netscape/certsrv/request/AgentApprovals.java
+++ b/base/common/src/com/netscape/certsrv/request/AgentApprovals.java
diff --git a/pki/base/common/src/com/netscape/certsrv/request/IEnrollmentRequest.java b/base/common/src/com/netscape/certsrv/request/IEnrollmentRequest.java
index 32c3f53a9..32c3f53a9 100644
--- a/pki/base/common/src/com/netscape/certsrv/request/IEnrollmentRequest.java
+++ b/base/common/src/com/netscape/certsrv/request/IEnrollmentRequest.java
diff --git a/pki/base/common/src/com/netscape/certsrv/request/INotify.java b/base/common/src/com/netscape/certsrv/request/INotify.java
index 938cd855b..938cd855b 100644
--- a/pki/base/common/src/com/netscape/certsrv/request/INotify.java
+++ b/base/common/src/com/netscape/certsrv/request/INotify.java
diff --git a/pki/base/common/src/com/netscape/certsrv/request/IPolicy.java b/base/common/src/com/netscape/certsrv/request/IPolicy.java
index 9998abee7..9998abee7 100644
--- a/pki/base/common/src/com/netscape/certsrv/request/IPolicy.java
+++ b/base/common/src/com/netscape/certsrv/request/IPolicy.java
diff --git a/pki/base/common/src/com/netscape/certsrv/request/IRequest.java b/base/common/src/com/netscape/certsrv/request/IRequest.java
index e43856e2d..e43856e2d 100644
--- a/pki/base/common/src/com/netscape/certsrv/request/IRequest.java
+++ b/base/common/src/com/netscape/certsrv/request/IRequest.java
diff --git a/pki/base/common/src/com/netscape/certsrv/request/IRequestList.java b/base/common/src/com/netscape/certsrv/request/IRequestList.java
index 5f265941a..5f265941a 100644
--- a/pki/base/common/src/com/netscape/certsrv/request/IRequestList.java
+++ b/base/common/src/com/netscape/certsrv/request/IRequestList.java
diff --git a/pki/base/common/src/com/netscape/certsrv/request/IRequestListener.java b/base/common/src/com/netscape/certsrv/request/IRequestListener.java
index 8dc8a42a9..8dc8a42a9 100644
--- a/pki/base/common/src/com/netscape/certsrv/request/IRequestListener.java
+++ b/base/common/src/com/netscape/certsrv/request/IRequestListener.java
diff --git a/pki/base/common/src/com/netscape/certsrv/request/IRequestNotifier.java b/base/common/src/com/netscape/certsrv/request/IRequestNotifier.java
index 66bd35432..66bd35432 100644
--- a/pki/base/common/src/com/netscape/certsrv/request/IRequestNotifier.java
+++ b/base/common/src/com/netscape/certsrv/request/IRequestNotifier.java
diff --git a/pki/base/common/src/com/netscape/certsrv/request/IRequestQueue.java b/base/common/src/com/netscape/certsrv/request/IRequestQueue.java
index a8f5f7332..a8f5f7332 100644
--- a/pki/base/common/src/com/netscape/certsrv/request/IRequestQueue.java
+++ b/base/common/src/com/netscape/certsrv/request/IRequestQueue.java
diff --git a/pki/base/common/src/com/netscape/certsrv/request/IRequestRecord.java b/base/common/src/com/netscape/certsrv/request/IRequestRecord.java
index 53531b133..53531b133 100644
--- a/pki/base/common/src/com/netscape/certsrv/request/IRequestRecord.java
+++ b/base/common/src/com/netscape/certsrv/request/IRequestRecord.java
diff --git a/pki/base/common/src/com/netscape/certsrv/request/IRequestScheduler.java b/base/common/src/com/netscape/certsrv/request/IRequestScheduler.java
index 5012f5b0c..5012f5b0c 100644
--- a/pki/base/common/src/com/netscape/certsrv/request/IRequestScheduler.java
+++ b/base/common/src/com/netscape/certsrv/request/IRequestScheduler.java
diff --git a/pki/base/common/src/com/netscape/certsrv/request/IRequestSubsystem.java b/base/common/src/com/netscape/certsrv/request/IRequestSubsystem.java
index 164e84a37..164e84a37 100644
--- a/pki/base/common/src/com/netscape/certsrv/request/IRequestSubsystem.java
+++ b/base/common/src/com/netscape/certsrv/request/IRequestSubsystem.java
diff --git a/pki/base/common/src/com/netscape/certsrv/request/IRequestVirtualList.java b/base/common/src/com/netscape/certsrv/request/IRequestVirtualList.java
index 540ec679c..540ec679c 100644
--- a/pki/base/common/src/com/netscape/certsrv/request/IRequestVirtualList.java
+++ b/base/common/src/com/netscape/certsrv/request/IRequestVirtualList.java
diff --git a/pki/base/common/src/com/netscape/certsrv/request/IService.java b/base/common/src/com/netscape/certsrv/request/IService.java
index adf2c5095..adf2c5095 100644
--- a/pki/base/common/src/com/netscape/certsrv/request/IService.java
+++ b/base/common/src/com/netscape/certsrv/request/IService.java
diff --git a/pki/base/common/src/com/netscape/certsrv/request/PolicyMessage.java b/base/common/src/com/netscape/certsrv/request/PolicyMessage.java
index c21b8ca4d..c21b8ca4d 100644
--- a/pki/base/common/src/com/netscape/certsrv/request/PolicyMessage.java
+++ b/base/common/src/com/netscape/certsrv/request/PolicyMessage.java
diff --git a/pki/base/common/src/com/netscape/certsrv/request/PolicyResult.java b/base/common/src/com/netscape/certsrv/request/PolicyResult.java
index c7cad94f2..c7cad94f2 100644
--- a/pki/base/common/src/com/netscape/certsrv/request/PolicyResult.java
+++ b/base/common/src/com/netscape/certsrv/request/PolicyResult.java
diff --git a/pki/base/common/src/com/netscape/certsrv/request/RequestId.java b/base/common/src/com/netscape/certsrv/request/RequestId.java
index da61f2bc0..da61f2bc0 100644
--- a/pki/base/common/src/com/netscape/certsrv/request/RequestId.java
+++ b/base/common/src/com/netscape/certsrv/request/RequestId.java
diff --git a/pki/base/common/src/com/netscape/certsrv/request/RequestIdAdapter.java b/base/common/src/com/netscape/certsrv/request/RequestIdAdapter.java
index 1780bc337..1780bc337 100644
--- a/pki/base/common/src/com/netscape/certsrv/request/RequestIdAdapter.java
+++ b/base/common/src/com/netscape/certsrv/request/RequestIdAdapter.java
diff --git a/pki/base/common/src/com/netscape/certsrv/request/RequestStatus.java b/base/common/src/com/netscape/certsrv/request/RequestStatus.java
index f58a568d8..f58a568d8 100644
--- a/pki/base/common/src/com/netscape/certsrv/request/RequestStatus.java
+++ b/base/common/src/com/netscape/certsrv/request/RequestStatus.java
diff --git a/pki/base/common/src/com/netscape/certsrv/request/ldap/IRequestMod.java b/base/common/src/com/netscape/certsrv/request/ldap/IRequestMod.java
index c1e153a81..c1e153a81 100644
--- a/pki/base/common/src/com/netscape/certsrv/request/ldap/IRequestMod.java
+++ b/base/common/src/com/netscape/certsrv/request/ldap/IRequestMod.java
diff --git a/pki/base/common/src/com/netscape/certsrv/security/Credential.java b/base/common/src/com/netscape/certsrv/security/Credential.java
index 48038a40b..48038a40b 100644
--- a/pki/base/common/src/com/netscape/certsrv/security/Credential.java
+++ b/base/common/src/com/netscape/certsrv/security/Credential.java
diff --git a/pki/base/common/src/com/netscape/certsrv/security/ICryptoSubsystem.java b/base/common/src/com/netscape/certsrv/security/ICryptoSubsystem.java
index 3d26d6f3a..3d26d6f3a 100644
--- a/pki/base/common/src/com/netscape/certsrv/security/ICryptoSubsystem.java
+++ b/base/common/src/com/netscape/certsrv/security/ICryptoSubsystem.java
diff --git a/pki/base/common/src/com/netscape/certsrv/security/IEncryptionUnit.java b/base/common/src/com/netscape/certsrv/security/IEncryptionUnit.java
index 0a526e582..0a526e582 100644
--- a/pki/base/common/src/com/netscape/certsrv/security/IEncryptionUnit.java
+++ b/base/common/src/com/netscape/certsrv/security/IEncryptionUnit.java
diff --git a/pki/base/common/src/com/netscape/certsrv/security/ISigningUnit.java b/base/common/src/com/netscape/certsrv/security/ISigningUnit.java
index 7fbed0b6c..7fbed0b6c 100644
--- a/pki/base/common/src/com/netscape/certsrv/security/ISigningUnit.java
+++ b/base/common/src/com/netscape/certsrv/security/ISigningUnit.java
diff --git a/pki/base/common/src/com/netscape/certsrv/security/IStorageKeyUnit.java b/base/common/src/com/netscape/certsrv/security/IStorageKeyUnit.java
index 5f3b0ec48..5f3b0ec48 100644
--- a/pki/base/common/src/com/netscape/certsrv/security/IStorageKeyUnit.java
+++ b/base/common/src/com/netscape/certsrv/security/IStorageKeyUnit.java
diff --git a/pki/base/common/src/com/netscape/certsrv/security/IToken.java b/base/common/src/com/netscape/certsrv/security/IToken.java
index 05aff64f9..05aff64f9 100644
--- a/pki/base/common/src/com/netscape/certsrv/security/IToken.java
+++ b/base/common/src/com/netscape/certsrv/security/IToken.java
diff --git a/pki/base/common/src/com/netscape/certsrv/security/ITransportKeyUnit.java b/base/common/src/com/netscape/certsrv/security/ITransportKeyUnit.java
index 6e1c7ab4a..6e1c7ab4a 100644
--- a/pki/base/common/src/com/netscape/certsrv/security/ITransportKeyUnit.java
+++ b/base/common/src/com/netscape/certsrv/security/ITransportKeyUnit.java
diff --git a/pki/base/common/src/com/netscape/certsrv/security/KeyCertData.java b/base/common/src/com/netscape/certsrv/security/KeyCertData.java
index dbcc0118f..dbcc0118f 100644
--- a/pki/base/common/src/com/netscape/certsrv/security/KeyCertData.java
+++ b/base/common/src/com/netscape/certsrv/security/KeyCertData.java
diff --git a/pki/base/common/src/com/netscape/certsrv/selftests/EDuplicateSelfTestException.java b/base/common/src/com/netscape/certsrv/selftests/EDuplicateSelfTestException.java
index 958919e1e..958919e1e 100644
--- a/pki/base/common/src/com/netscape/certsrv/selftests/EDuplicateSelfTestException.java
+++ b/base/common/src/com/netscape/certsrv/selftests/EDuplicateSelfTestException.java
diff --git a/pki/base/common/src/com/netscape/certsrv/selftests/EInvalidSelfTestException.java b/base/common/src/com/netscape/certsrv/selftests/EInvalidSelfTestException.java
index 58592b89b..58592b89b 100644
--- a/pki/base/common/src/com/netscape/certsrv/selftests/EInvalidSelfTestException.java
+++ b/base/common/src/com/netscape/certsrv/selftests/EInvalidSelfTestException.java
diff --git a/pki/base/common/src/com/netscape/certsrv/selftests/EMissingSelfTestException.java b/base/common/src/com/netscape/certsrv/selftests/EMissingSelfTestException.java
index c15852f4f..c15852f4f 100644
--- a/pki/base/common/src/com/netscape/certsrv/selftests/EMissingSelfTestException.java
+++ b/base/common/src/com/netscape/certsrv/selftests/EMissingSelfTestException.java
diff --git a/pki/base/common/src/com/netscape/certsrv/selftests/ESelfTestException.java b/base/common/src/com/netscape/certsrv/selftests/ESelfTestException.java
index 6c4f6bf2f..6c4f6bf2f 100644
--- a/pki/base/common/src/com/netscape/certsrv/selftests/ESelfTestException.java
+++ b/base/common/src/com/netscape/certsrv/selftests/ESelfTestException.java
diff --git a/pki/base/common/src/com/netscape/certsrv/selftests/ISelfTest.java b/base/common/src/com/netscape/certsrv/selftests/ISelfTest.java
index 04285a9dc..04285a9dc 100644
--- a/pki/base/common/src/com/netscape/certsrv/selftests/ISelfTest.java
+++ b/base/common/src/com/netscape/certsrv/selftests/ISelfTest.java
diff --git a/pki/base/common/src/com/netscape/certsrv/selftests/ISelfTestSubsystem.java b/base/common/src/com/netscape/certsrv/selftests/ISelfTestSubsystem.java
index d16627ab5..d16627ab5 100644
--- a/pki/base/common/src/com/netscape/certsrv/selftests/ISelfTestSubsystem.java
+++ b/base/common/src/com/netscape/certsrv/selftests/ISelfTestSubsystem.java
diff --git a/pki/base/common/src/com/netscape/certsrv/selftests/SelfTestResources.java b/base/common/src/com/netscape/certsrv/selftests/SelfTestResources.java
index c7c4d372d..c7c4d372d 100644
--- a/pki/base/common/src/com/netscape/certsrv/selftests/SelfTestResources.java
+++ b/base/common/src/com/netscape/certsrv/selftests/SelfTestResources.java
diff --git a/pki/base/common/src/com/netscape/certsrv/template/ArgList.java b/base/common/src/com/netscape/certsrv/template/ArgList.java
index 586bf7663..586bf7663 100644
--- a/pki/base/common/src/com/netscape/certsrv/template/ArgList.java
+++ b/base/common/src/com/netscape/certsrv/template/ArgList.java
diff --git a/pki/base/common/src/com/netscape/certsrv/template/ArgSet.java b/base/common/src/com/netscape/certsrv/template/ArgSet.java
index 333a51e50..333a51e50 100644
--- a/pki/base/common/src/com/netscape/certsrv/template/ArgSet.java
+++ b/base/common/src/com/netscape/certsrv/template/ArgSet.java
diff --git a/pki/base/common/src/com/netscape/certsrv/template/ArgString.java b/base/common/src/com/netscape/certsrv/template/ArgString.java
index 4fb982eb6..4fb982eb6 100644
--- a/pki/base/common/src/com/netscape/certsrv/template/ArgString.java
+++ b/base/common/src/com/netscape/certsrv/template/ArgString.java
diff --git a/pki/base/common/src/com/netscape/certsrv/template/IArgValue.java b/base/common/src/com/netscape/certsrv/template/IArgValue.java
index e820ce69f..e820ce69f 100644
--- a/pki/base/common/src/com/netscape/certsrv/template/IArgValue.java
+++ b/base/common/src/com/netscape/certsrv/template/IArgValue.java
diff --git a/pki/base/common/src/com/netscape/certsrv/tks/ITKSAuthority.java b/base/common/src/com/netscape/certsrv/tks/ITKSAuthority.java
index 0a045a6fb..0a045a6fb 100644
--- a/pki/base/common/src/com/netscape/certsrv/tks/ITKSAuthority.java
+++ b/base/common/src/com/netscape/certsrv/tks/ITKSAuthority.java
diff --git a/pki/base/common/src/com/netscape/certsrv/usrgrp/Certificates.java b/base/common/src/com/netscape/certsrv/usrgrp/Certificates.java
index fdfa3cd38..fdfa3cd38 100644
--- a/pki/base/common/src/com/netscape/certsrv/usrgrp/Certificates.java
+++ b/base/common/src/com/netscape/certsrv/usrgrp/Certificates.java
diff --git a/pki/base/common/src/com/netscape/certsrv/usrgrp/EUsrGrpException.java b/base/common/src/com/netscape/certsrv/usrgrp/EUsrGrpException.java
index a25a1a6b3..a25a1a6b3 100644
--- a/pki/base/common/src/com/netscape/certsrv/usrgrp/EUsrGrpException.java
+++ b/base/common/src/com/netscape/certsrv/usrgrp/EUsrGrpException.java
diff --git a/pki/base/common/src/com/netscape/certsrv/usrgrp/ICertUserLocator.java b/base/common/src/com/netscape/certsrv/usrgrp/ICertUserLocator.java
index dbbd068c4..dbbd068c4 100644
--- a/pki/base/common/src/com/netscape/certsrv/usrgrp/ICertUserLocator.java
+++ b/base/common/src/com/netscape/certsrv/usrgrp/ICertUserLocator.java
diff --git a/pki/base/common/src/com/netscape/certsrv/usrgrp/IGroup.java b/base/common/src/com/netscape/certsrv/usrgrp/IGroup.java
index 522d0fc89..522d0fc89 100644
--- a/pki/base/common/src/com/netscape/certsrv/usrgrp/IGroup.java
+++ b/base/common/src/com/netscape/certsrv/usrgrp/IGroup.java
diff --git a/pki/base/common/src/com/netscape/certsrv/usrgrp/IGroupConstants.java b/base/common/src/com/netscape/certsrv/usrgrp/IGroupConstants.java
index 22d89455c..22d89455c 100644
--- a/pki/base/common/src/com/netscape/certsrv/usrgrp/IGroupConstants.java
+++ b/base/common/src/com/netscape/certsrv/usrgrp/IGroupConstants.java
diff --git a/pki/base/common/src/com/netscape/certsrv/usrgrp/IIdEvaluator.java b/base/common/src/com/netscape/certsrv/usrgrp/IIdEvaluator.java
index 41209b4b9..41209b4b9 100644
--- a/pki/base/common/src/com/netscape/certsrv/usrgrp/IIdEvaluator.java
+++ b/base/common/src/com/netscape/certsrv/usrgrp/IIdEvaluator.java
diff --git a/pki/base/common/src/com/netscape/certsrv/usrgrp/IUGSubsystem.java b/base/common/src/com/netscape/certsrv/usrgrp/IUGSubsystem.java
index 282d672f1..282d672f1 100644
--- a/pki/base/common/src/com/netscape/certsrv/usrgrp/IUGSubsystem.java
+++ b/base/common/src/com/netscape/certsrv/usrgrp/IUGSubsystem.java
diff --git a/pki/base/common/src/com/netscape/certsrv/usrgrp/IUser.java b/base/common/src/com/netscape/certsrv/usrgrp/IUser.java
index 9370a6718..9370a6718 100644
--- a/pki/base/common/src/com/netscape/certsrv/usrgrp/IUser.java
+++ b/base/common/src/com/netscape/certsrv/usrgrp/IUser.java
diff --git a/pki/base/common/src/com/netscape/certsrv/usrgrp/IUserConstants.java b/base/common/src/com/netscape/certsrv/usrgrp/IUserConstants.java
index f66f01c73..f66f01c73 100644
--- a/pki/base/common/src/com/netscape/certsrv/usrgrp/IUserConstants.java
+++ b/base/common/src/com/netscape/certsrv/usrgrp/IUserConstants.java
diff --git a/pki/base/common/src/com/netscape/certsrv/usrgrp/IUsrGrp.java b/base/common/src/com/netscape/certsrv/usrgrp/IUsrGrp.java
index f6cef0d46..f6cef0d46 100644
--- a/pki/base/common/src/com/netscape/certsrv/usrgrp/IUsrGrp.java
+++ b/base/common/src/com/netscape/certsrv/usrgrp/IUsrGrp.java
diff --git a/pki/base/common/src/com/netscape/certsrv/usrgrp/UsrGrpResources.java b/base/common/src/com/netscape/certsrv/usrgrp/UsrGrpResources.java
index 11a3da23b..11a3da23b 100644
--- a/pki/base/common/src/com/netscape/certsrv/usrgrp/UsrGrpResources.java
+++ b/base/common/src/com/netscape/certsrv/usrgrp/UsrGrpResources.java
diff --git a/pki/base/common/src/com/netscape/certsrv/util/HttpInput.java b/base/common/src/com/netscape/certsrv/util/HttpInput.java
index 7e7fe7c4a..7e7fe7c4a 100644
--- a/pki/base/common/src/com/netscape/certsrv/util/HttpInput.java
+++ b/base/common/src/com/netscape/certsrv/util/HttpInput.java
diff --git a/pki/base/common/src/com/netscape/certsrv/util/IStatsSubsystem.java b/base/common/src/com/netscape/certsrv/util/IStatsSubsystem.java
index 989d7a4a1..989d7a4a1 100644
--- a/pki/base/common/src/com/netscape/certsrv/util/IStatsSubsystem.java
+++ b/base/common/src/com/netscape/certsrv/util/IStatsSubsystem.java
diff --git a/pki/base/common/src/com/netscape/certsrv/util/StatsEvent.java b/base/common/src/com/netscape/certsrv/util/StatsEvent.java
index eafd90d05..eafd90d05 100644
--- a/pki/base/common/src/com/netscape/certsrv/util/StatsEvent.java
+++ b/base/common/src/com/netscape/certsrv/util/StatsEvent.java
diff --git a/pki/base/common/src/com/netscape/cms/authentication/AVAPattern.java b/base/common/src/com/netscape/cms/authentication/AVAPattern.java
index 6a8bbcbf2..6a8bbcbf2 100644
--- a/pki/base/common/src/com/netscape/cms/authentication/AVAPattern.java
+++ b/base/common/src/com/netscape/cms/authentication/AVAPattern.java
diff --git a/pki/base/common/src/com/netscape/cms/authentication/AgentCertAuthentication.java b/base/common/src/com/netscape/cms/authentication/AgentCertAuthentication.java
index 65ef434a9..65ef434a9 100644
--- a/pki/base/common/src/com/netscape/cms/authentication/AgentCertAuthentication.java
+++ b/base/common/src/com/netscape/cms/authentication/AgentCertAuthentication.java
diff --git a/pki/base/common/src/com/netscape/cms/authentication/CMCAuth.java b/base/common/src/com/netscape/cms/authentication/CMCAuth.java
index 06d4eaa0f..06d4eaa0f 100644
--- a/pki/base/common/src/com/netscape/cms/authentication/CMCAuth.java
+++ b/base/common/src/com/netscape/cms/authentication/CMCAuth.java
diff --git a/pki/base/common/src/com/netscape/cms/authentication/Crypt.java b/base/common/src/com/netscape/cms/authentication/Crypt.java
index e6dd7087d..e6dd7087d 100644
--- a/pki/base/common/src/com/netscape/cms/authentication/Crypt.java
+++ b/base/common/src/com/netscape/cms/authentication/Crypt.java
diff --git a/pki/base/common/src/com/netscape/cms/authentication/DNPattern.java b/base/common/src/com/netscape/cms/authentication/DNPattern.java
index 480b5b909..480b5b909 100644
--- a/pki/base/common/src/com/netscape/cms/authentication/DNPattern.java
+++ b/base/common/src/com/netscape/cms/authentication/DNPattern.java
diff --git a/pki/base/common/src/com/netscape/cms/authentication/DirBasedAuthentication.java b/base/common/src/com/netscape/cms/authentication/DirBasedAuthentication.java
index da8d5bd51..da8d5bd51 100644
--- a/pki/base/common/src/com/netscape/cms/authentication/DirBasedAuthentication.java
+++ b/base/common/src/com/netscape/cms/authentication/DirBasedAuthentication.java
diff --git a/pki/base/common/src/com/netscape/cms/authentication/FlatFileAuth.java b/base/common/src/com/netscape/cms/authentication/FlatFileAuth.java
index f60110b0b..f60110b0b 100644
--- a/pki/base/common/src/com/netscape/cms/authentication/FlatFileAuth.java
+++ b/base/common/src/com/netscape/cms/authentication/FlatFileAuth.java
diff --git a/pki/base/common/src/com/netscape/cms/authentication/HashAuthData.java b/base/common/src/com/netscape/cms/authentication/HashAuthData.java
index 3a447d282..3a447d282 100644
--- a/pki/base/common/src/com/netscape/cms/authentication/HashAuthData.java
+++ b/base/common/src/com/netscape/cms/authentication/HashAuthData.java
diff --git a/pki/base/common/src/com/netscape/cms/authentication/HashAuthentication.java b/base/common/src/com/netscape/cms/authentication/HashAuthentication.java
index 2537efa10..2537efa10 100644
--- a/pki/base/common/src/com/netscape/cms/authentication/HashAuthentication.java
+++ b/base/common/src/com/netscape/cms/authentication/HashAuthentication.java
diff --git a/pki/base/common/src/com/netscape/cms/authentication/PortalEnroll.java b/base/common/src/com/netscape/cms/authentication/PortalEnroll.java
index 38a3e6fcf..38a3e6fcf 100644
--- a/pki/base/common/src/com/netscape/cms/authentication/PortalEnroll.java
+++ b/base/common/src/com/netscape/cms/authentication/PortalEnroll.java
diff --git a/pki/base/common/src/com/netscape/cms/authentication/RDNPattern.java b/base/common/src/com/netscape/cms/authentication/RDNPattern.java
index 722aefbc3..722aefbc3 100644
--- a/pki/base/common/src/com/netscape/cms/authentication/RDNPattern.java
+++ b/base/common/src/com/netscape/cms/authentication/RDNPattern.java
diff --git a/pki/base/common/src/com/netscape/cms/authentication/SSLclientCertAuthentication.java b/base/common/src/com/netscape/cms/authentication/SSLclientCertAuthentication.java
index 35c23bd0f..35c23bd0f 100644
--- a/pki/base/common/src/com/netscape/cms/authentication/SSLclientCertAuthentication.java
+++ b/base/common/src/com/netscape/cms/authentication/SSLclientCertAuthentication.java
diff --git a/pki/base/common/src/com/netscape/cms/authentication/SharedSecret.java b/base/common/src/com/netscape/cms/authentication/SharedSecret.java
index 7a0784c53..7a0784c53 100644
--- a/pki/base/common/src/com/netscape/cms/authentication/SharedSecret.java
+++ b/base/common/src/com/netscape/cms/authentication/SharedSecret.java
diff --git a/pki/base/common/src/com/netscape/cms/authentication/TokenAuthentication.java b/base/common/src/com/netscape/cms/authentication/TokenAuthentication.java
index f8e0669e9..f8e0669e9 100644
--- a/pki/base/common/src/com/netscape/cms/authentication/TokenAuthentication.java
+++ b/base/common/src/com/netscape/cms/authentication/TokenAuthentication.java
diff --git a/pki/base/common/src/com/netscape/cms/authentication/UdnPwdDirAuthentication.java b/base/common/src/com/netscape/cms/authentication/UdnPwdDirAuthentication.java
index c9fbbf9ac..c9fbbf9ac 100644
--- a/pki/base/common/src/com/netscape/cms/authentication/UdnPwdDirAuthentication.java
+++ b/base/common/src/com/netscape/cms/authentication/UdnPwdDirAuthentication.java
diff --git a/pki/base/common/src/com/netscape/cms/authentication/UidPwdDirAuthentication.java b/base/common/src/com/netscape/cms/authentication/UidPwdDirAuthentication.java
index d4a9de108..d4a9de108 100644
--- a/pki/base/common/src/com/netscape/cms/authentication/UidPwdDirAuthentication.java
+++ b/base/common/src/com/netscape/cms/authentication/UidPwdDirAuthentication.java
diff --git a/pki/base/common/src/com/netscape/cms/authentication/UidPwdPinDirAuthentication.java b/base/common/src/com/netscape/cms/authentication/UidPwdPinDirAuthentication.java
index 880b7c767..880b7c767 100644
--- a/pki/base/common/src/com/netscape/cms/authentication/UidPwdPinDirAuthentication.java
+++ b/base/common/src/com/netscape/cms/authentication/UidPwdPinDirAuthentication.java
diff --git a/pki/base/common/src/com/netscape/cms/authorization/AAclAuthz.java b/base/common/src/com/netscape/cms/authorization/AAclAuthz.java
index 570fe3a88..570fe3a88 100644
--- a/pki/base/common/src/com/netscape/cms/authorization/AAclAuthz.java
+++ b/base/common/src/com/netscape/cms/authorization/AAclAuthz.java
diff --git a/pki/base/common/src/com/netscape/cms/authorization/BasicAclAuthz.java b/base/common/src/com/netscape/cms/authorization/BasicAclAuthz.java
index f6b1b6713..f6b1b6713 100644
--- a/pki/base/common/src/com/netscape/cms/authorization/BasicAclAuthz.java
+++ b/base/common/src/com/netscape/cms/authorization/BasicAclAuthz.java
diff --git a/pki/base/common/src/com/netscape/cms/authorization/DirAclAuthz.java b/base/common/src/com/netscape/cms/authorization/DirAclAuthz.java
index acc3ffbb7..acc3ffbb7 100644
--- a/pki/base/common/src/com/netscape/cms/authorization/DirAclAuthz.java
+++ b/base/common/src/com/netscape/cms/authorization/DirAclAuthz.java
diff --git a/pki/base/common/src/com/netscape/cms/crl/CMSAuthInfoAccessExtension.java b/base/common/src/com/netscape/cms/crl/CMSAuthInfoAccessExtension.java
index d4cef0148..d4cef0148 100644
--- a/pki/base/common/src/com/netscape/cms/crl/CMSAuthInfoAccessExtension.java
+++ b/base/common/src/com/netscape/cms/crl/CMSAuthInfoAccessExtension.java
diff --git a/pki/base/common/src/com/netscape/cms/crl/CMSAuthorityKeyIdentifierExtension.java b/base/common/src/com/netscape/cms/crl/CMSAuthorityKeyIdentifierExtension.java
index 26c8c1d0e..26c8c1d0e 100644
--- a/pki/base/common/src/com/netscape/cms/crl/CMSAuthorityKeyIdentifierExtension.java
+++ b/base/common/src/com/netscape/cms/crl/CMSAuthorityKeyIdentifierExtension.java
diff --git a/pki/base/common/src/com/netscape/cms/crl/CMSCRLNumberExtension.java b/base/common/src/com/netscape/cms/crl/CMSCRLNumberExtension.java
index e7f4e7b3f..e7f4e7b3f 100644
--- a/pki/base/common/src/com/netscape/cms/crl/CMSCRLNumberExtension.java
+++ b/base/common/src/com/netscape/cms/crl/CMSCRLNumberExtension.java
diff --git a/pki/base/common/src/com/netscape/cms/crl/CMSCRLReasonExtension.java b/base/common/src/com/netscape/cms/crl/CMSCRLReasonExtension.java
index 6ed993d54..6ed993d54 100644
--- a/pki/base/common/src/com/netscape/cms/crl/CMSCRLReasonExtension.java
+++ b/base/common/src/com/netscape/cms/crl/CMSCRLReasonExtension.java
diff --git a/pki/base/common/src/com/netscape/cms/crl/CMSCertificateIssuerExtension.java b/base/common/src/com/netscape/cms/crl/CMSCertificateIssuerExtension.java
index b0bf20856..b0bf20856 100644
--- a/pki/base/common/src/com/netscape/cms/crl/CMSCertificateIssuerExtension.java
+++ b/base/common/src/com/netscape/cms/crl/CMSCertificateIssuerExtension.java
diff --git a/pki/base/common/src/com/netscape/cms/crl/CMSDeltaCRLIndicatorExtension.java b/base/common/src/com/netscape/cms/crl/CMSDeltaCRLIndicatorExtension.java
index 8672502ab..8672502ab 100644
--- a/pki/base/common/src/com/netscape/cms/crl/CMSDeltaCRLIndicatorExtension.java
+++ b/base/common/src/com/netscape/cms/crl/CMSDeltaCRLIndicatorExtension.java
diff --git a/pki/base/common/src/com/netscape/cms/crl/CMSFreshestCRLExtension.java b/base/common/src/com/netscape/cms/crl/CMSFreshestCRLExtension.java
index 72dbe5502..72dbe5502 100644
--- a/pki/base/common/src/com/netscape/cms/crl/CMSFreshestCRLExtension.java
+++ b/base/common/src/com/netscape/cms/crl/CMSFreshestCRLExtension.java
diff --git a/pki/base/common/src/com/netscape/cms/crl/CMSHoldInstructionExtension.java b/base/common/src/com/netscape/cms/crl/CMSHoldInstructionExtension.java
index 4023e3b2f..4023e3b2f 100644
--- a/pki/base/common/src/com/netscape/cms/crl/CMSHoldInstructionExtension.java
+++ b/base/common/src/com/netscape/cms/crl/CMSHoldInstructionExtension.java
diff --git a/pki/base/common/src/com/netscape/cms/crl/CMSInvalidityDateExtension.java b/base/common/src/com/netscape/cms/crl/CMSInvalidityDateExtension.java
index 083873c31..083873c31 100644
--- a/pki/base/common/src/com/netscape/cms/crl/CMSInvalidityDateExtension.java
+++ b/base/common/src/com/netscape/cms/crl/CMSInvalidityDateExtension.java
diff --git a/pki/base/common/src/com/netscape/cms/crl/CMSIssuerAlternativeNameExtension.java b/base/common/src/com/netscape/cms/crl/CMSIssuerAlternativeNameExtension.java
index 64252a0b9..64252a0b9 100644
--- a/pki/base/common/src/com/netscape/cms/crl/CMSIssuerAlternativeNameExtension.java
+++ b/base/common/src/com/netscape/cms/crl/CMSIssuerAlternativeNameExtension.java
diff --git a/pki/base/common/src/com/netscape/cms/crl/CMSIssuingDistributionPointExtension.java b/base/common/src/com/netscape/cms/crl/CMSIssuingDistributionPointExtension.java
index 4253584ce..4253584ce 100644
--- a/pki/base/common/src/com/netscape/cms/crl/CMSIssuingDistributionPointExtension.java
+++ b/base/common/src/com/netscape/cms/crl/CMSIssuingDistributionPointExtension.java
diff --git a/pki/base/common/src/com/netscape/cms/evaluators/GroupAccessEvaluator.java b/base/common/src/com/netscape/cms/evaluators/GroupAccessEvaluator.java
index 530ca9447..530ca9447 100644
--- a/pki/base/common/src/com/netscape/cms/evaluators/GroupAccessEvaluator.java
+++ b/base/common/src/com/netscape/cms/evaluators/GroupAccessEvaluator.java
diff --git a/pki/base/common/src/com/netscape/cms/evaluators/IPAddressAccessEvaluator.java b/base/common/src/com/netscape/cms/evaluators/IPAddressAccessEvaluator.java
index 17d383688..17d383688 100644
--- a/pki/base/common/src/com/netscape/cms/evaluators/IPAddressAccessEvaluator.java
+++ b/base/common/src/com/netscape/cms/evaluators/IPAddressAccessEvaluator.java
diff --git a/pki/base/common/src/com/netscape/cms/evaluators/UserAccessEvaluator.java b/base/common/src/com/netscape/cms/evaluators/UserAccessEvaluator.java
index bf7727c92..bf7727c92 100644
--- a/pki/base/common/src/com/netscape/cms/evaluators/UserAccessEvaluator.java
+++ b/base/common/src/com/netscape/cms/evaluators/UserAccessEvaluator.java
diff --git a/pki/base/common/src/com/netscape/cms/evaluators/UserOrigReqAccessEvaluator.java b/base/common/src/com/netscape/cms/evaluators/UserOrigReqAccessEvaluator.java
index 442828e75..442828e75 100644
--- a/pki/base/common/src/com/netscape/cms/evaluators/UserOrigReqAccessEvaluator.java
+++ b/base/common/src/com/netscape/cms/evaluators/UserOrigReqAccessEvaluator.java
diff --git a/pki/base/common/src/com/netscape/cms/jobs/AJobBase.java b/base/common/src/com/netscape/cms/jobs/AJobBase.java
index 0da5d2028..0da5d2028 100644
--- a/pki/base/common/src/com/netscape/cms/jobs/AJobBase.java
+++ b/base/common/src/com/netscape/cms/jobs/AJobBase.java
diff --git a/pki/base/common/src/com/netscape/cms/jobs/PublishCertsJob.java b/base/common/src/com/netscape/cms/jobs/PublishCertsJob.java
index 28268dfab..28268dfab 100644
--- a/pki/base/common/src/com/netscape/cms/jobs/PublishCertsJob.java
+++ b/base/common/src/com/netscape/cms/jobs/PublishCertsJob.java
diff --git a/pki/base/common/src/com/netscape/cms/jobs/RenewalNotificationJob.java b/base/common/src/com/netscape/cms/jobs/RenewalNotificationJob.java
index 5ca581445..5ca581445 100644
--- a/pki/base/common/src/com/netscape/cms/jobs/RenewalNotificationJob.java
+++ b/base/common/src/com/netscape/cms/jobs/RenewalNotificationJob.java
diff --git a/pki/base/common/src/com/netscape/cms/jobs/RequestInQueueJob.java b/base/common/src/com/netscape/cms/jobs/RequestInQueueJob.java
index b04461941..b04461941 100644
--- a/pki/base/common/src/com/netscape/cms/jobs/RequestInQueueJob.java
+++ b/base/common/src/com/netscape/cms/jobs/RequestInQueueJob.java
diff --git a/pki/base/common/src/com/netscape/cms/jobs/UnpublishExpiredJob.java b/base/common/src/com/netscape/cms/jobs/UnpublishExpiredJob.java
index 2f4a6ad75..2f4a6ad75 100644
--- a/pki/base/common/src/com/netscape/cms/jobs/UnpublishExpiredJob.java
+++ b/base/common/src/com/netscape/cms/jobs/UnpublishExpiredJob.java
diff --git a/pki/base/common/src/com/netscape/cms/listeners/CertificateIssuedListener.java b/base/common/src/com/netscape/cms/listeners/CertificateIssuedListener.java
index 91526d583..91526d583 100644
--- a/pki/base/common/src/com/netscape/cms/listeners/CertificateIssuedListener.java
+++ b/base/common/src/com/netscape/cms/listeners/CertificateIssuedListener.java
diff --git a/pki/base/common/src/com/netscape/cms/listeners/CertificateRevokedListener.java b/base/common/src/com/netscape/cms/listeners/CertificateRevokedListener.java
index da041b85d..da041b85d 100644
--- a/pki/base/common/src/com/netscape/cms/listeners/CertificateRevokedListener.java
+++ b/base/common/src/com/netscape/cms/listeners/CertificateRevokedListener.java
diff --git a/pki/base/common/src/com/netscape/cms/listeners/PinRemovalListener.java b/base/common/src/com/netscape/cms/listeners/PinRemovalListener.java
index 662e762b0..662e762b0 100644
--- a/pki/base/common/src/com/netscape/cms/listeners/PinRemovalListener.java
+++ b/base/common/src/com/netscape/cms/listeners/PinRemovalListener.java
diff --git a/pki/base/common/src/com/netscape/cms/listeners/RequestInQListener.java b/base/common/src/com/netscape/cms/listeners/RequestInQListener.java
index 7ff13db54..7ff13db54 100644
--- a/pki/base/common/src/com/netscape/cms/listeners/RequestInQListener.java
+++ b/base/common/src/com/netscape/cms/listeners/RequestInQListener.java
diff --git a/pki/base/common/src/com/netscape/cms/logging/LogEntry.java b/base/common/src/com/netscape/cms/logging/LogEntry.java
index d91bd7406..d91bd7406 100644
--- a/pki/base/common/src/com/netscape/cms/logging/LogEntry.java
+++ b/base/common/src/com/netscape/cms/logging/LogEntry.java
diff --git a/pki/base/common/src/com/netscape/cms/logging/LogFile.java b/base/common/src/com/netscape/cms/logging/LogFile.java
index 5144bf16d..5144bf16d 100644
--- a/pki/base/common/src/com/netscape/cms/logging/LogFile.java
+++ b/base/common/src/com/netscape/cms/logging/LogFile.java
diff --git a/pki/base/common/src/com/netscape/cms/logging/RollingLogFile.java b/base/common/src/com/netscape/cms/logging/RollingLogFile.java
index 93455e9fe..93455e9fe 100644
--- a/pki/base/common/src/com/netscape/cms/logging/RollingLogFile.java
+++ b/base/common/src/com/netscape/cms/logging/RollingLogFile.java
diff --git a/pki/base/common/src/com/netscape/cms/notification/MailNotification.java b/base/common/src/com/netscape/cms/notification/MailNotification.java
index ef09d8f71..ef09d8f71 100644
--- a/pki/base/common/src/com/netscape/cms/notification/MailNotification.java
+++ b/base/common/src/com/netscape/cms/notification/MailNotification.java
diff --git a/pki/base/common/src/com/netscape/cms/ocsp/DefStore.java b/base/common/src/com/netscape/cms/ocsp/DefStore.java
index 21f7023d8..21f7023d8 100644
--- a/pki/base/common/src/com/netscape/cms/ocsp/DefStore.java
+++ b/base/common/src/com/netscape/cms/ocsp/DefStore.java
diff --git a/pki/base/common/src/com/netscape/cms/ocsp/LDAPStore.java b/base/common/src/com/netscape/cms/ocsp/LDAPStore.java
index bca02f4a6..bca02f4a6 100644
--- a/pki/base/common/src/com/netscape/cms/ocsp/LDAPStore.java
+++ b/base/common/src/com/netscape/cms/ocsp/LDAPStore.java
diff --git a/pki/base/common/src/com/netscape/cms/password/PasswordChecker.java b/base/common/src/com/netscape/cms/password/PasswordChecker.java
index 847f3a2c1..847f3a2c1 100644
--- a/pki/base/common/src/com/netscape/cms/password/PasswordChecker.java
+++ b/base/common/src/com/netscape/cms/password/PasswordChecker.java
diff --git a/pki/base/common/src/com/netscape/cms/policy/APolicyRule.java b/base/common/src/com/netscape/cms/policy/APolicyRule.java
index 0faf7591d..0faf7591d 100644
--- a/pki/base/common/src/com/netscape/cms/policy/APolicyRule.java
+++ b/base/common/src/com/netscape/cms/policy/APolicyRule.java
diff --git a/pki/base/common/src/com/netscape/cms/policy/constraints/AgentPolicy.java b/base/common/src/com/netscape/cms/policy/constraints/AgentPolicy.java
index b7a24bd65..b7a24bd65 100644
--- a/pki/base/common/src/com/netscape/cms/policy/constraints/AgentPolicy.java
+++ b/base/common/src/com/netscape/cms/policy/constraints/AgentPolicy.java
diff --git a/pki/base/common/src/com/netscape/cms/policy/constraints/AttributePresentConstraints.java b/base/common/src/com/netscape/cms/policy/constraints/AttributePresentConstraints.java
index 93327445e..93327445e 100644
--- a/pki/base/common/src/com/netscape/cms/policy/constraints/AttributePresentConstraints.java
+++ b/base/common/src/com/netscape/cms/policy/constraints/AttributePresentConstraints.java
diff --git a/pki/base/common/src/com/netscape/cms/policy/constraints/DSAKeyConstraints.java b/base/common/src/com/netscape/cms/policy/constraints/DSAKeyConstraints.java
index 387b702bf..387b702bf 100644
--- a/pki/base/common/src/com/netscape/cms/policy/constraints/DSAKeyConstraints.java
+++ b/base/common/src/com/netscape/cms/policy/constraints/DSAKeyConstraints.java
diff --git a/pki/base/common/src/com/netscape/cms/policy/constraints/DefaultRevocation.java b/base/common/src/com/netscape/cms/policy/constraints/DefaultRevocation.java
index 2af145475..2af145475 100644
--- a/pki/base/common/src/com/netscape/cms/policy/constraints/DefaultRevocation.java
+++ b/base/common/src/com/netscape/cms/policy/constraints/DefaultRevocation.java
diff --git a/pki/base/common/src/com/netscape/cms/policy/constraints/IssuerConstraints.java b/base/common/src/com/netscape/cms/policy/constraints/IssuerConstraints.java
index a08bde78c..a08bde78c 100644
--- a/pki/base/common/src/com/netscape/cms/policy/constraints/IssuerConstraints.java
+++ b/base/common/src/com/netscape/cms/policy/constraints/IssuerConstraints.java
diff --git a/pki/base/common/src/com/netscape/cms/policy/constraints/KeyAlgorithmConstraints.java b/base/common/src/com/netscape/cms/policy/constraints/KeyAlgorithmConstraints.java
index 3779b16e3..3779b16e3 100644
--- a/pki/base/common/src/com/netscape/cms/policy/constraints/KeyAlgorithmConstraints.java
+++ b/base/common/src/com/netscape/cms/policy/constraints/KeyAlgorithmConstraints.java
diff --git a/pki/base/common/src/com/netscape/cms/policy/constraints/ManualAuthentication.java b/base/common/src/com/netscape/cms/policy/constraints/ManualAuthentication.java
index 3af9e636f..3af9e636f 100644
--- a/pki/base/common/src/com/netscape/cms/policy/constraints/ManualAuthentication.java
+++ b/base/common/src/com/netscape/cms/policy/constraints/ManualAuthentication.java
diff --git a/pki/base/common/src/com/netscape/cms/policy/constraints/RSAKeyConstraints.java b/base/common/src/com/netscape/cms/policy/constraints/RSAKeyConstraints.java
index 7c53808c5..7c53808c5 100644
--- a/pki/base/common/src/com/netscape/cms/policy/constraints/RSAKeyConstraints.java
+++ b/base/common/src/com/netscape/cms/policy/constraints/RSAKeyConstraints.java
diff --git a/pki/base/common/src/com/netscape/cms/policy/constraints/RenewalConstraints.java b/base/common/src/com/netscape/cms/policy/constraints/RenewalConstraints.java
index f3e5efc9b..f3e5efc9b 100644
--- a/pki/base/common/src/com/netscape/cms/policy/constraints/RenewalConstraints.java
+++ b/base/common/src/com/netscape/cms/policy/constraints/RenewalConstraints.java
diff --git a/pki/base/common/src/com/netscape/cms/policy/constraints/RenewalValidityConstraints.java b/base/common/src/com/netscape/cms/policy/constraints/RenewalValidityConstraints.java
index 0265ff855..0265ff855 100644
--- a/pki/base/common/src/com/netscape/cms/policy/constraints/RenewalValidityConstraints.java
+++ b/base/common/src/com/netscape/cms/policy/constraints/RenewalValidityConstraints.java
diff --git a/pki/base/common/src/com/netscape/cms/policy/constraints/RevocationConstraints.java b/base/common/src/com/netscape/cms/policy/constraints/RevocationConstraints.java
index 513e199c4..513e199c4 100644
--- a/pki/base/common/src/com/netscape/cms/policy/constraints/RevocationConstraints.java
+++ b/base/common/src/com/netscape/cms/policy/constraints/RevocationConstraints.java
diff --git a/pki/base/common/src/com/netscape/cms/policy/constraints/SigningAlgorithmConstraints.java b/base/common/src/com/netscape/cms/policy/constraints/SigningAlgorithmConstraints.java
index 8b504eb50..8b504eb50 100644
--- a/pki/base/common/src/com/netscape/cms/policy/constraints/SigningAlgorithmConstraints.java
+++ b/base/common/src/com/netscape/cms/policy/constraints/SigningAlgorithmConstraints.java
diff --git a/pki/base/common/src/com/netscape/cms/policy/constraints/SubCANameConstraints.java b/base/common/src/com/netscape/cms/policy/constraints/SubCANameConstraints.java
index da63f6f24..da63f6f24 100644
--- a/pki/base/common/src/com/netscape/cms/policy/constraints/SubCANameConstraints.java
+++ b/base/common/src/com/netscape/cms/policy/constraints/SubCANameConstraints.java
diff --git a/pki/base/common/src/com/netscape/cms/policy/constraints/UniqueSubjectName.java b/base/common/src/com/netscape/cms/policy/constraints/UniqueSubjectName.java
index 9afbf7650..9afbf7650 100644
--- a/pki/base/common/src/com/netscape/cms/policy/constraints/UniqueSubjectName.java
+++ b/base/common/src/com/netscape/cms/policy/constraints/UniqueSubjectName.java
diff --git a/pki/base/common/src/com/netscape/cms/policy/constraints/UniqueSubjectNameConstraints.java b/base/common/src/com/netscape/cms/policy/constraints/UniqueSubjectNameConstraints.java
index 8c106800a..8c106800a 100644
--- a/pki/base/common/src/com/netscape/cms/policy/constraints/UniqueSubjectNameConstraints.java
+++ b/base/common/src/com/netscape/cms/policy/constraints/UniqueSubjectNameConstraints.java
diff --git a/pki/base/common/src/com/netscape/cms/policy/constraints/ValidityConstraints.java b/base/common/src/com/netscape/cms/policy/constraints/ValidityConstraints.java
index 0409f3c33..0409f3c33 100644
--- a/pki/base/common/src/com/netscape/cms/policy/constraints/ValidityConstraints.java
+++ b/base/common/src/com/netscape/cms/policy/constraints/ValidityConstraints.java
diff --git a/pki/base/common/src/com/netscape/cms/policy/extensions/AuthInfoAccessExt.java b/base/common/src/com/netscape/cms/policy/extensions/AuthInfoAccessExt.java
index fea126567..fea126567 100644
--- a/pki/base/common/src/com/netscape/cms/policy/extensions/AuthInfoAccessExt.java
+++ b/base/common/src/com/netscape/cms/policy/extensions/AuthInfoAccessExt.java
diff --git a/pki/base/common/src/com/netscape/cms/policy/extensions/AuthorityKeyIdentifierExt.java b/base/common/src/com/netscape/cms/policy/extensions/AuthorityKeyIdentifierExt.java
index 971379a46..971379a46 100644
--- a/pki/base/common/src/com/netscape/cms/policy/extensions/AuthorityKeyIdentifierExt.java
+++ b/base/common/src/com/netscape/cms/policy/extensions/AuthorityKeyIdentifierExt.java
diff --git a/pki/base/common/src/com/netscape/cms/policy/extensions/BasicConstraintsExt.java b/base/common/src/com/netscape/cms/policy/extensions/BasicConstraintsExt.java
index f830b7e3d..f830b7e3d 100644
--- a/pki/base/common/src/com/netscape/cms/policy/extensions/BasicConstraintsExt.java
+++ b/base/common/src/com/netscape/cms/policy/extensions/BasicConstraintsExt.java
diff --git a/pki/base/common/src/com/netscape/cms/policy/extensions/CRLDistributionPointsExt.java b/base/common/src/com/netscape/cms/policy/extensions/CRLDistributionPointsExt.java
index 1ede3d5d0..1ede3d5d0 100644
--- a/pki/base/common/src/com/netscape/cms/policy/extensions/CRLDistributionPointsExt.java
+++ b/base/common/src/com/netscape/cms/policy/extensions/CRLDistributionPointsExt.java
diff --git a/pki/base/common/src/com/netscape/cms/policy/extensions/CertificatePoliciesExt.java b/base/common/src/com/netscape/cms/policy/extensions/CertificatePoliciesExt.java
index 597357318..597357318 100644
--- a/pki/base/common/src/com/netscape/cms/policy/extensions/CertificatePoliciesExt.java
+++ b/base/common/src/com/netscape/cms/policy/extensions/CertificatePoliciesExt.java
diff --git a/pki/base/common/src/com/netscape/cms/policy/extensions/CertificateRenewalWindowExt.java b/base/common/src/com/netscape/cms/policy/extensions/CertificateRenewalWindowExt.java
index 28366ade8..28366ade8 100644
--- a/pki/base/common/src/com/netscape/cms/policy/extensions/CertificateRenewalWindowExt.java
+++ b/base/common/src/com/netscape/cms/policy/extensions/CertificateRenewalWindowExt.java
diff --git a/pki/base/common/src/com/netscape/cms/policy/extensions/CertificateScopeOfUseExt.java b/base/common/src/com/netscape/cms/policy/extensions/CertificateScopeOfUseExt.java
index b385923af..b385923af 100644
--- a/pki/base/common/src/com/netscape/cms/policy/extensions/CertificateScopeOfUseExt.java
+++ b/base/common/src/com/netscape/cms/policy/extensions/CertificateScopeOfUseExt.java
diff --git a/pki/base/common/src/com/netscape/cms/policy/extensions/ExtendedKeyUsageExt.java b/base/common/src/com/netscape/cms/policy/extensions/ExtendedKeyUsageExt.java
index 65ef6b937..65ef6b937 100644
--- a/pki/base/common/src/com/netscape/cms/policy/extensions/ExtendedKeyUsageExt.java
+++ b/base/common/src/com/netscape/cms/policy/extensions/ExtendedKeyUsageExt.java
diff --git a/pki/base/common/src/com/netscape/cms/policy/extensions/GenericASN1Ext.java b/base/common/src/com/netscape/cms/policy/extensions/GenericASN1Ext.java
index 0202ee784..0202ee784 100644
--- a/pki/base/common/src/com/netscape/cms/policy/extensions/GenericASN1Ext.java
+++ b/base/common/src/com/netscape/cms/policy/extensions/GenericASN1Ext.java
diff --git a/pki/base/common/src/com/netscape/cms/policy/extensions/IssuerAltNameExt.java b/base/common/src/com/netscape/cms/policy/extensions/IssuerAltNameExt.java
index bb9abd9cf..bb9abd9cf 100644
--- a/pki/base/common/src/com/netscape/cms/policy/extensions/IssuerAltNameExt.java
+++ b/base/common/src/com/netscape/cms/policy/extensions/IssuerAltNameExt.java
diff --git a/pki/base/common/src/com/netscape/cms/policy/extensions/KeyUsageExt.java b/base/common/src/com/netscape/cms/policy/extensions/KeyUsageExt.java
index 6594cc4a2..6594cc4a2 100644
--- a/pki/base/common/src/com/netscape/cms/policy/extensions/KeyUsageExt.java
+++ b/base/common/src/com/netscape/cms/policy/extensions/KeyUsageExt.java
diff --git a/pki/base/common/src/com/netscape/cms/policy/extensions/NSCCommentExt.java b/base/common/src/com/netscape/cms/policy/extensions/NSCCommentExt.java
index ecc084d29..ecc084d29 100644
--- a/pki/base/common/src/com/netscape/cms/policy/extensions/NSCCommentExt.java
+++ b/base/common/src/com/netscape/cms/policy/extensions/NSCCommentExt.java
diff --git a/pki/base/common/src/com/netscape/cms/policy/extensions/NSCertTypeExt.java b/base/common/src/com/netscape/cms/policy/extensions/NSCertTypeExt.java
index 2fb09b2b7..2fb09b2b7 100644
--- a/pki/base/common/src/com/netscape/cms/policy/extensions/NSCertTypeExt.java
+++ b/base/common/src/com/netscape/cms/policy/extensions/NSCertTypeExt.java
diff --git a/pki/base/common/src/com/netscape/cms/policy/extensions/NameConstraintsExt.java b/base/common/src/com/netscape/cms/policy/extensions/NameConstraintsExt.java
index f010bf3f1..f010bf3f1 100644
--- a/pki/base/common/src/com/netscape/cms/policy/extensions/NameConstraintsExt.java
+++ b/base/common/src/com/netscape/cms/policy/extensions/NameConstraintsExt.java
diff --git a/pki/base/common/src/com/netscape/cms/policy/extensions/OCSPNoCheckExt.java b/base/common/src/com/netscape/cms/policy/extensions/OCSPNoCheckExt.java
index 33f2f85e0..33f2f85e0 100644
--- a/pki/base/common/src/com/netscape/cms/policy/extensions/OCSPNoCheckExt.java
+++ b/base/common/src/com/netscape/cms/policy/extensions/OCSPNoCheckExt.java
diff --git a/pki/base/common/src/com/netscape/cms/policy/extensions/PolicyConstraintsExt.java b/base/common/src/com/netscape/cms/policy/extensions/PolicyConstraintsExt.java
index 861107b8e..861107b8e 100644
--- a/pki/base/common/src/com/netscape/cms/policy/extensions/PolicyConstraintsExt.java
+++ b/base/common/src/com/netscape/cms/policy/extensions/PolicyConstraintsExt.java
diff --git a/pki/base/common/src/com/netscape/cms/policy/extensions/PolicyMappingsExt.java b/base/common/src/com/netscape/cms/policy/extensions/PolicyMappingsExt.java
index 7623f455f..7623f455f 100644
--- a/pki/base/common/src/com/netscape/cms/policy/extensions/PolicyMappingsExt.java
+++ b/base/common/src/com/netscape/cms/policy/extensions/PolicyMappingsExt.java
diff --git a/pki/base/common/src/com/netscape/cms/policy/extensions/PresenceExt.java b/base/common/src/com/netscape/cms/policy/extensions/PresenceExt.java
index e13a7a84c..e13a7a84c 100644
--- a/pki/base/common/src/com/netscape/cms/policy/extensions/PresenceExt.java
+++ b/base/common/src/com/netscape/cms/policy/extensions/PresenceExt.java
diff --git a/pki/base/common/src/com/netscape/cms/policy/extensions/PrivateKeyUsagePeriodExt.java b/base/common/src/com/netscape/cms/policy/extensions/PrivateKeyUsagePeriodExt.java
index 3b80246a9..3b80246a9 100644
--- a/pki/base/common/src/com/netscape/cms/policy/extensions/PrivateKeyUsagePeriodExt.java
+++ b/base/common/src/com/netscape/cms/policy/extensions/PrivateKeyUsagePeriodExt.java
diff --git a/pki/base/common/src/com/netscape/cms/policy/extensions/RemoveBasicConstraintsExt.java b/base/common/src/com/netscape/cms/policy/extensions/RemoveBasicConstraintsExt.java
index 2a5af4240..2a5af4240 100644
--- a/pki/base/common/src/com/netscape/cms/policy/extensions/RemoveBasicConstraintsExt.java
+++ b/base/common/src/com/netscape/cms/policy/extensions/RemoveBasicConstraintsExt.java
diff --git a/pki/base/common/src/com/netscape/cms/policy/extensions/SubjAltNameExt.java b/base/common/src/com/netscape/cms/policy/extensions/SubjAltNameExt.java
index 63bd8804c..63bd8804c 100644
--- a/pki/base/common/src/com/netscape/cms/policy/extensions/SubjAltNameExt.java
+++ b/base/common/src/com/netscape/cms/policy/extensions/SubjAltNameExt.java
diff --git a/pki/base/common/src/com/netscape/cms/policy/extensions/SubjectAltNameExt.java b/base/common/src/com/netscape/cms/policy/extensions/SubjectAltNameExt.java
index 62f0b21da..62f0b21da 100644
--- a/pki/base/common/src/com/netscape/cms/policy/extensions/SubjectAltNameExt.java
+++ b/base/common/src/com/netscape/cms/policy/extensions/SubjectAltNameExt.java
diff --git a/pki/base/common/src/com/netscape/cms/policy/extensions/SubjectDirectoryAttributesExt.java b/base/common/src/com/netscape/cms/policy/extensions/SubjectDirectoryAttributesExt.java
index 6b4e7ead9..6b4e7ead9 100644
--- a/pki/base/common/src/com/netscape/cms/policy/extensions/SubjectDirectoryAttributesExt.java
+++ b/base/common/src/com/netscape/cms/policy/extensions/SubjectDirectoryAttributesExt.java
diff --git a/pki/base/common/src/com/netscape/cms/policy/extensions/SubjectKeyIdentifierExt.java b/base/common/src/com/netscape/cms/policy/extensions/SubjectKeyIdentifierExt.java
index 32d254c40..32d254c40 100644
--- a/pki/base/common/src/com/netscape/cms/policy/extensions/SubjectKeyIdentifierExt.java
+++ b/base/common/src/com/netscape/cms/policy/extensions/SubjectKeyIdentifierExt.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/common/BasicProfile.java b/base/common/src/com/netscape/cms/profile/common/BasicProfile.java
index 696d0cd13..696d0cd13 100644
--- a/pki/base/common/src/com/netscape/cms/profile/common/BasicProfile.java
+++ b/base/common/src/com/netscape/cms/profile/common/BasicProfile.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/common/CACertCAEnrollProfile.java b/base/common/src/com/netscape/cms/profile/common/CACertCAEnrollProfile.java
index b95b22339..b95b22339 100644
--- a/pki/base/common/src/com/netscape/cms/profile/common/CACertCAEnrollProfile.java
+++ b/base/common/src/com/netscape/cms/profile/common/CACertCAEnrollProfile.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/common/CAEnrollProfile.java b/base/common/src/com/netscape/cms/profile/common/CAEnrollProfile.java
index c03f90a4b..c03f90a4b 100644
--- a/pki/base/common/src/com/netscape/cms/profile/common/CAEnrollProfile.java
+++ b/base/common/src/com/netscape/cms/profile/common/CAEnrollProfile.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/common/EnrollProfile.java b/base/common/src/com/netscape/cms/profile/common/EnrollProfile.java
index d574f0f94..d574f0f94 100644
--- a/pki/base/common/src/com/netscape/cms/profile/common/EnrollProfile.java
+++ b/base/common/src/com/netscape/cms/profile/common/EnrollProfile.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/common/EnrollProfileContext.java b/base/common/src/com/netscape/cms/profile/common/EnrollProfileContext.java
index 3610520fd..3610520fd 100644
--- a/pki/base/common/src/com/netscape/cms/profile/common/EnrollProfileContext.java
+++ b/base/common/src/com/netscape/cms/profile/common/EnrollProfileContext.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/common/ProfileContext.java b/base/common/src/com/netscape/cms/profile/common/ProfileContext.java
index 7d0686378..7d0686378 100644
--- a/pki/base/common/src/com/netscape/cms/profile/common/ProfileContext.java
+++ b/base/common/src/com/netscape/cms/profile/common/ProfileContext.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/common/ProfilePolicy.java b/base/common/src/com/netscape/cms/profile/common/ProfilePolicy.java
index a8a90aef9..a8a90aef9 100644
--- a/pki/base/common/src/com/netscape/cms/profile/common/ProfilePolicy.java
+++ b/base/common/src/com/netscape/cms/profile/common/ProfilePolicy.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/common/RAEnrollProfile.java b/base/common/src/com/netscape/cms/profile/common/RAEnrollProfile.java
index 36bac1fa7..36bac1fa7 100644
--- a/pki/base/common/src/com/netscape/cms/profile/common/RAEnrollProfile.java
+++ b/base/common/src/com/netscape/cms/profile/common/RAEnrollProfile.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/common/ServerCertCAEnrollProfile.java b/base/common/src/com/netscape/cms/profile/common/ServerCertCAEnrollProfile.java
index 9be1e43c4..9be1e43c4 100644
--- a/pki/base/common/src/com/netscape/cms/profile/common/ServerCertCAEnrollProfile.java
+++ b/base/common/src/com/netscape/cms/profile/common/ServerCertCAEnrollProfile.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/common/UserCertCAEnrollProfile.java b/base/common/src/com/netscape/cms/profile/common/UserCertCAEnrollProfile.java
index 3f1cdfb21..3f1cdfb21 100644
--- a/pki/base/common/src/com/netscape/cms/profile/common/UserCertCAEnrollProfile.java
+++ b/base/common/src/com/netscape/cms/profile/common/UserCertCAEnrollProfile.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/constraint/BasicConstraintsExtConstraint.java b/base/common/src/com/netscape/cms/profile/constraint/BasicConstraintsExtConstraint.java
index f924c587f..f924c587f 100644
--- a/pki/base/common/src/com/netscape/cms/profile/constraint/BasicConstraintsExtConstraint.java
+++ b/base/common/src/com/netscape/cms/profile/constraint/BasicConstraintsExtConstraint.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/constraint/CAEnrollConstraint.java b/base/common/src/com/netscape/cms/profile/constraint/CAEnrollConstraint.java
index c0a9758da..c0a9758da 100644
--- a/pki/base/common/src/com/netscape/cms/profile/constraint/CAEnrollConstraint.java
+++ b/base/common/src/com/netscape/cms/profile/constraint/CAEnrollConstraint.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/constraint/CAValidityConstraint.java b/base/common/src/com/netscape/cms/profile/constraint/CAValidityConstraint.java
index e118fa215..e118fa215 100644
--- a/pki/base/common/src/com/netscape/cms/profile/constraint/CAValidityConstraint.java
+++ b/base/common/src/com/netscape/cms/profile/constraint/CAValidityConstraint.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/constraint/EnrollConstraint.java b/base/common/src/com/netscape/cms/profile/constraint/EnrollConstraint.java
index 40c2153a8..40c2153a8 100644
--- a/pki/base/common/src/com/netscape/cms/profile/constraint/EnrollConstraint.java
+++ b/base/common/src/com/netscape/cms/profile/constraint/EnrollConstraint.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/constraint/ExtendedKeyUsageExtConstraint.java b/base/common/src/com/netscape/cms/profile/constraint/ExtendedKeyUsageExtConstraint.java
index 3c737e8a5..3c737e8a5 100644
--- a/pki/base/common/src/com/netscape/cms/profile/constraint/ExtendedKeyUsageExtConstraint.java
+++ b/base/common/src/com/netscape/cms/profile/constraint/ExtendedKeyUsageExtConstraint.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/constraint/ExtensionConstraint.java b/base/common/src/com/netscape/cms/profile/constraint/ExtensionConstraint.java
index 1562fddb8..1562fddb8 100644
--- a/pki/base/common/src/com/netscape/cms/profile/constraint/ExtensionConstraint.java
+++ b/base/common/src/com/netscape/cms/profile/constraint/ExtensionConstraint.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/constraint/KeyConstraint.java b/base/common/src/com/netscape/cms/profile/constraint/KeyConstraint.java
index e6f5019a0..e6f5019a0 100644
--- a/pki/base/common/src/com/netscape/cms/profile/constraint/KeyConstraint.java
+++ b/base/common/src/com/netscape/cms/profile/constraint/KeyConstraint.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/constraint/KeyUsageExtConstraint.java b/base/common/src/com/netscape/cms/profile/constraint/KeyUsageExtConstraint.java
index 927c64ec2..927c64ec2 100644
--- a/pki/base/common/src/com/netscape/cms/profile/constraint/KeyUsageExtConstraint.java
+++ b/base/common/src/com/netscape/cms/profile/constraint/KeyUsageExtConstraint.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/constraint/NSCertTypeExtConstraint.java b/base/common/src/com/netscape/cms/profile/constraint/NSCertTypeExtConstraint.java
index 843360542..843360542 100644
--- a/pki/base/common/src/com/netscape/cms/profile/constraint/NSCertTypeExtConstraint.java
+++ b/base/common/src/com/netscape/cms/profile/constraint/NSCertTypeExtConstraint.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/constraint/NoConstraint.java b/base/common/src/com/netscape/cms/profile/constraint/NoConstraint.java
index 459e9f219..459e9f219 100644
--- a/pki/base/common/src/com/netscape/cms/profile/constraint/NoConstraint.java
+++ b/base/common/src/com/netscape/cms/profile/constraint/NoConstraint.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/constraint/RenewGracePeriodConstraint.java b/base/common/src/com/netscape/cms/profile/constraint/RenewGracePeriodConstraint.java
index fb01d7d14..fb01d7d14 100644
--- a/pki/base/common/src/com/netscape/cms/profile/constraint/RenewGracePeriodConstraint.java
+++ b/base/common/src/com/netscape/cms/profile/constraint/RenewGracePeriodConstraint.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/constraint/SigningAlgConstraint.java b/base/common/src/com/netscape/cms/profile/constraint/SigningAlgConstraint.java
index 4dbe329b3..4dbe329b3 100644
--- a/pki/base/common/src/com/netscape/cms/profile/constraint/SigningAlgConstraint.java
+++ b/base/common/src/com/netscape/cms/profile/constraint/SigningAlgConstraint.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/constraint/SubjectNameConstraint.java b/base/common/src/com/netscape/cms/profile/constraint/SubjectNameConstraint.java
index 477e99b98..477e99b98 100644
--- a/pki/base/common/src/com/netscape/cms/profile/constraint/SubjectNameConstraint.java
+++ b/base/common/src/com/netscape/cms/profile/constraint/SubjectNameConstraint.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/constraint/UniqueKeyConstraint.java b/base/common/src/com/netscape/cms/profile/constraint/UniqueKeyConstraint.java
index f10130aa6..f10130aa6 100644
--- a/pki/base/common/src/com/netscape/cms/profile/constraint/UniqueKeyConstraint.java
+++ b/base/common/src/com/netscape/cms/profile/constraint/UniqueKeyConstraint.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/constraint/UniqueSubjectNameConstraint.java b/base/common/src/com/netscape/cms/profile/constraint/UniqueSubjectNameConstraint.java
index 7a985b631..7a985b631 100644
--- a/pki/base/common/src/com/netscape/cms/profile/constraint/UniqueSubjectNameConstraint.java
+++ b/base/common/src/com/netscape/cms/profile/constraint/UniqueSubjectNameConstraint.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/constraint/ValidityConstraint.java b/base/common/src/com/netscape/cms/profile/constraint/ValidityConstraint.java
index 98a7b4f96..98a7b4f96 100644
--- a/pki/base/common/src/com/netscape/cms/profile/constraint/ValidityConstraint.java
+++ b/base/common/src/com/netscape/cms/profile/constraint/ValidityConstraint.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/def/AuthInfoAccessExtDefault.java b/base/common/src/com/netscape/cms/profile/def/AuthInfoAccessExtDefault.java
index 4e4f951f7..4e4f951f7 100644
--- a/pki/base/common/src/com/netscape/cms/profile/def/AuthInfoAccessExtDefault.java
+++ b/base/common/src/com/netscape/cms/profile/def/AuthInfoAccessExtDefault.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/def/AuthTokenSubjectNameDefault.java b/base/common/src/com/netscape/cms/profile/def/AuthTokenSubjectNameDefault.java
index 6c0f6e9fc..6c0f6e9fc 100644
--- a/pki/base/common/src/com/netscape/cms/profile/def/AuthTokenSubjectNameDefault.java
+++ b/base/common/src/com/netscape/cms/profile/def/AuthTokenSubjectNameDefault.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/def/AuthorityKeyIdentifierExtDefault.java b/base/common/src/com/netscape/cms/profile/def/AuthorityKeyIdentifierExtDefault.java
index 6ec75990c..6ec75990c 100644
--- a/pki/base/common/src/com/netscape/cms/profile/def/AuthorityKeyIdentifierExtDefault.java
+++ b/base/common/src/com/netscape/cms/profile/def/AuthorityKeyIdentifierExtDefault.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/def/AutoAssignDefault.java b/base/common/src/com/netscape/cms/profile/def/AutoAssignDefault.java
index 043cf029b..043cf029b 100644
--- a/pki/base/common/src/com/netscape/cms/profile/def/AutoAssignDefault.java
+++ b/base/common/src/com/netscape/cms/profile/def/AutoAssignDefault.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/def/BasicConstraintsExtDefault.java b/base/common/src/com/netscape/cms/profile/def/BasicConstraintsExtDefault.java
index c442bf576..c442bf576 100644
--- a/pki/base/common/src/com/netscape/cms/profile/def/BasicConstraintsExtDefault.java
+++ b/base/common/src/com/netscape/cms/profile/def/BasicConstraintsExtDefault.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/def/CAEnrollDefault.java b/base/common/src/com/netscape/cms/profile/def/CAEnrollDefault.java
index 872e32960..872e32960 100644
--- a/pki/base/common/src/com/netscape/cms/profile/def/CAEnrollDefault.java
+++ b/base/common/src/com/netscape/cms/profile/def/CAEnrollDefault.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/def/CAValidityDefault.java b/base/common/src/com/netscape/cms/profile/def/CAValidityDefault.java
index e3b834ce5..e3b834ce5 100644
--- a/pki/base/common/src/com/netscape/cms/profile/def/CAValidityDefault.java
+++ b/base/common/src/com/netscape/cms/profile/def/CAValidityDefault.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/def/CRLDistributionPointsExtDefault.java b/base/common/src/com/netscape/cms/profile/def/CRLDistributionPointsExtDefault.java
index d1def3d5d..d1def3d5d 100644
--- a/pki/base/common/src/com/netscape/cms/profile/def/CRLDistributionPointsExtDefault.java
+++ b/base/common/src/com/netscape/cms/profile/def/CRLDistributionPointsExtDefault.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/def/CertificatePoliciesExtDefault.java b/base/common/src/com/netscape/cms/profile/def/CertificatePoliciesExtDefault.java
index 8d4ae2288..8d4ae2288 100644
--- a/pki/base/common/src/com/netscape/cms/profile/def/CertificatePoliciesExtDefault.java
+++ b/base/common/src/com/netscape/cms/profile/def/CertificatePoliciesExtDefault.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/def/CertificateVersionDefault.java b/base/common/src/com/netscape/cms/profile/def/CertificateVersionDefault.java
index d30f971dd..d30f971dd 100644
--- a/pki/base/common/src/com/netscape/cms/profile/def/CertificateVersionDefault.java
+++ b/base/common/src/com/netscape/cms/profile/def/CertificateVersionDefault.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/def/EnrollDefault.java b/base/common/src/com/netscape/cms/profile/def/EnrollDefault.java
index 67ebadbe4..67ebadbe4 100644
--- a/pki/base/common/src/com/netscape/cms/profile/def/EnrollDefault.java
+++ b/base/common/src/com/netscape/cms/profile/def/EnrollDefault.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/def/EnrollExtDefault.java b/base/common/src/com/netscape/cms/profile/def/EnrollExtDefault.java
index 24f79cdec..24f79cdec 100644
--- a/pki/base/common/src/com/netscape/cms/profile/def/EnrollExtDefault.java
+++ b/base/common/src/com/netscape/cms/profile/def/EnrollExtDefault.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/def/ExtendedKeyUsageExtDefault.java b/base/common/src/com/netscape/cms/profile/def/ExtendedKeyUsageExtDefault.java
index f1d63a348..f1d63a348 100644
--- a/pki/base/common/src/com/netscape/cms/profile/def/ExtendedKeyUsageExtDefault.java
+++ b/base/common/src/com/netscape/cms/profile/def/ExtendedKeyUsageExtDefault.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/def/FreshestCRLExtDefault.java b/base/common/src/com/netscape/cms/profile/def/FreshestCRLExtDefault.java
index acbbd1089..acbbd1089 100644
--- a/pki/base/common/src/com/netscape/cms/profile/def/FreshestCRLExtDefault.java
+++ b/base/common/src/com/netscape/cms/profile/def/FreshestCRLExtDefault.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/def/GenericExtDefault.java b/base/common/src/com/netscape/cms/profile/def/GenericExtDefault.java
index 1797091b7..1797091b7 100644
--- a/pki/base/common/src/com/netscape/cms/profile/def/GenericExtDefault.java
+++ b/base/common/src/com/netscape/cms/profile/def/GenericExtDefault.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/def/ImageDefault.java b/base/common/src/com/netscape/cms/profile/def/ImageDefault.java
index 16a7ac402..16a7ac402 100644
--- a/pki/base/common/src/com/netscape/cms/profile/def/ImageDefault.java
+++ b/base/common/src/com/netscape/cms/profile/def/ImageDefault.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/def/InhibitAnyPolicyExtDefault.java b/base/common/src/com/netscape/cms/profile/def/InhibitAnyPolicyExtDefault.java
index 97cfb3ff4..97cfb3ff4 100644
--- a/pki/base/common/src/com/netscape/cms/profile/def/InhibitAnyPolicyExtDefault.java
+++ b/base/common/src/com/netscape/cms/profile/def/InhibitAnyPolicyExtDefault.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/def/IssuerAltNameExtDefault.java b/base/common/src/com/netscape/cms/profile/def/IssuerAltNameExtDefault.java
index 251d8a3e7..251d8a3e7 100644
--- a/pki/base/common/src/com/netscape/cms/profile/def/IssuerAltNameExtDefault.java
+++ b/base/common/src/com/netscape/cms/profile/def/IssuerAltNameExtDefault.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/def/KeyUsageExtDefault.java b/base/common/src/com/netscape/cms/profile/def/KeyUsageExtDefault.java
index 1bfda9ad9..1bfda9ad9 100644
--- a/pki/base/common/src/com/netscape/cms/profile/def/KeyUsageExtDefault.java
+++ b/base/common/src/com/netscape/cms/profile/def/KeyUsageExtDefault.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/def/NSCCommentExtDefault.java b/base/common/src/com/netscape/cms/profile/def/NSCCommentExtDefault.java
index cc96f3e90..cc96f3e90 100644
--- a/pki/base/common/src/com/netscape/cms/profile/def/NSCCommentExtDefault.java
+++ b/base/common/src/com/netscape/cms/profile/def/NSCCommentExtDefault.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/def/NSCertTypeExtDefault.java b/base/common/src/com/netscape/cms/profile/def/NSCertTypeExtDefault.java
index 0677ef69f..0677ef69f 100644
--- a/pki/base/common/src/com/netscape/cms/profile/def/NSCertTypeExtDefault.java
+++ b/base/common/src/com/netscape/cms/profile/def/NSCertTypeExtDefault.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/def/NameConstraintsExtDefault.java b/base/common/src/com/netscape/cms/profile/def/NameConstraintsExtDefault.java
index e57d04067..e57d04067 100644
--- a/pki/base/common/src/com/netscape/cms/profile/def/NameConstraintsExtDefault.java
+++ b/base/common/src/com/netscape/cms/profile/def/NameConstraintsExtDefault.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/def/NoDefault.java b/base/common/src/com/netscape/cms/profile/def/NoDefault.java
index 4678f4487..4678f4487 100644
--- a/pki/base/common/src/com/netscape/cms/profile/def/NoDefault.java
+++ b/base/common/src/com/netscape/cms/profile/def/NoDefault.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/def/OCSPNoCheckExtDefault.java b/base/common/src/com/netscape/cms/profile/def/OCSPNoCheckExtDefault.java
index 382f3cec3..382f3cec3 100644
--- a/pki/base/common/src/com/netscape/cms/profile/def/OCSPNoCheckExtDefault.java
+++ b/base/common/src/com/netscape/cms/profile/def/OCSPNoCheckExtDefault.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/def/PolicyConstraintsExtDefault.java b/base/common/src/com/netscape/cms/profile/def/PolicyConstraintsExtDefault.java
index db9b95a04..db9b95a04 100644
--- a/pki/base/common/src/com/netscape/cms/profile/def/PolicyConstraintsExtDefault.java
+++ b/base/common/src/com/netscape/cms/profile/def/PolicyConstraintsExtDefault.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/def/PolicyMappingsExtDefault.java b/base/common/src/com/netscape/cms/profile/def/PolicyMappingsExtDefault.java
index 712641c0d..712641c0d 100644
--- a/pki/base/common/src/com/netscape/cms/profile/def/PolicyMappingsExtDefault.java
+++ b/base/common/src/com/netscape/cms/profile/def/PolicyMappingsExtDefault.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/def/PrivateKeyUsagePeriodExtDefault.java b/base/common/src/com/netscape/cms/profile/def/PrivateKeyUsagePeriodExtDefault.java
index 20285567e..20285567e 100644
--- a/pki/base/common/src/com/netscape/cms/profile/def/PrivateKeyUsagePeriodExtDefault.java
+++ b/base/common/src/com/netscape/cms/profile/def/PrivateKeyUsagePeriodExtDefault.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/def/SigningAlgDefault.java b/base/common/src/com/netscape/cms/profile/def/SigningAlgDefault.java
index 11da93fc8..11da93fc8 100644
--- a/pki/base/common/src/com/netscape/cms/profile/def/SigningAlgDefault.java
+++ b/base/common/src/com/netscape/cms/profile/def/SigningAlgDefault.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/def/SubjectAltNameExtDefault.java b/base/common/src/com/netscape/cms/profile/def/SubjectAltNameExtDefault.java
index d3838577e..d3838577e 100644
--- a/pki/base/common/src/com/netscape/cms/profile/def/SubjectAltNameExtDefault.java
+++ b/base/common/src/com/netscape/cms/profile/def/SubjectAltNameExtDefault.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/def/SubjectDirAttributesExtDefault.java b/base/common/src/com/netscape/cms/profile/def/SubjectDirAttributesExtDefault.java
index cca5ab234..cca5ab234 100644
--- a/pki/base/common/src/com/netscape/cms/profile/def/SubjectDirAttributesExtDefault.java
+++ b/base/common/src/com/netscape/cms/profile/def/SubjectDirAttributesExtDefault.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/def/SubjectInfoAccessExtDefault.java b/base/common/src/com/netscape/cms/profile/def/SubjectInfoAccessExtDefault.java
index 8ea7533cc..8ea7533cc 100644
--- a/pki/base/common/src/com/netscape/cms/profile/def/SubjectInfoAccessExtDefault.java
+++ b/base/common/src/com/netscape/cms/profile/def/SubjectInfoAccessExtDefault.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/def/SubjectKeyIdentifierExtDefault.java b/base/common/src/com/netscape/cms/profile/def/SubjectKeyIdentifierExtDefault.java
index 9476e45f6..9476e45f6 100644
--- a/pki/base/common/src/com/netscape/cms/profile/def/SubjectKeyIdentifierExtDefault.java
+++ b/base/common/src/com/netscape/cms/profile/def/SubjectKeyIdentifierExtDefault.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/def/SubjectNameDefault.java b/base/common/src/com/netscape/cms/profile/def/SubjectNameDefault.java
index 479219b84..479219b84 100644
--- a/pki/base/common/src/com/netscape/cms/profile/def/SubjectNameDefault.java
+++ b/base/common/src/com/netscape/cms/profile/def/SubjectNameDefault.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/def/UserExtensionDefault.java b/base/common/src/com/netscape/cms/profile/def/UserExtensionDefault.java
index 46a78c731..46a78c731 100644
--- a/pki/base/common/src/com/netscape/cms/profile/def/UserExtensionDefault.java
+++ b/base/common/src/com/netscape/cms/profile/def/UserExtensionDefault.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/def/UserKeyDefault.java b/base/common/src/com/netscape/cms/profile/def/UserKeyDefault.java
index b1dc9d116..b1dc9d116 100644
--- a/pki/base/common/src/com/netscape/cms/profile/def/UserKeyDefault.java
+++ b/base/common/src/com/netscape/cms/profile/def/UserKeyDefault.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/def/UserSigningAlgDefault.java b/base/common/src/com/netscape/cms/profile/def/UserSigningAlgDefault.java
index 4aeed6ba3..4aeed6ba3 100644
--- a/pki/base/common/src/com/netscape/cms/profile/def/UserSigningAlgDefault.java
+++ b/base/common/src/com/netscape/cms/profile/def/UserSigningAlgDefault.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/def/UserSubjectNameDefault.java b/base/common/src/com/netscape/cms/profile/def/UserSubjectNameDefault.java
index 65456e256..65456e256 100644
--- a/pki/base/common/src/com/netscape/cms/profile/def/UserSubjectNameDefault.java
+++ b/base/common/src/com/netscape/cms/profile/def/UserSubjectNameDefault.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/def/UserValidityDefault.java b/base/common/src/com/netscape/cms/profile/def/UserValidityDefault.java
index 3fadb81fd..3fadb81fd 100644
--- a/pki/base/common/src/com/netscape/cms/profile/def/UserValidityDefault.java
+++ b/base/common/src/com/netscape/cms/profile/def/UserValidityDefault.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/def/ValidityDefault.java b/base/common/src/com/netscape/cms/profile/def/ValidityDefault.java
index ad06400f3..ad06400f3 100644
--- a/pki/base/common/src/com/netscape/cms/profile/def/ValidityDefault.java
+++ b/base/common/src/com/netscape/cms/profile/def/ValidityDefault.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/def/nsHKeySubjectNameDefault.java b/base/common/src/com/netscape/cms/profile/def/nsHKeySubjectNameDefault.java
index 6b5ab6bc0..6b5ab6bc0 100644
--- a/pki/base/common/src/com/netscape/cms/profile/def/nsHKeySubjectNameDefault.java
+++ b/base/common/src/com/netscape/cms/profile/def/nsHKeySubjectNameDefault.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/def/nsNKeySubjectNameDefault.java b/base/common/src/com/netscape/cms/profile/def/nsNKeySubjectNameDefault.java
index cc1a8de81..cc1a8de81 100644
--- a/pki/base/common/src/com/netscape/cms/profile/def/nsNKeySubjectNameDefault.java
+++ b/base/common/src/com/netscape/cms/profile/def/nsNKeySubjectNameDefault.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/def/nsTokenDeviceKeySubjectNameDefault.java b/base/common/src/com/netscape/cms/profile/def/nsTokenDeviceKeySubjectNameDefault.java
index 77fa417f6..77fa417f6 100644
--- a/pki/base/common/src/com/netscape/cms/profile/def/nsTokenDeviceKeySubjectNameDefault.java
+++ b/base/common/src/com/netscape/cms/profile/def/nsTokenDeviceKeySubjectNameDefault.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/def/nsTokenUserKeySubjectNameDefault.java b/base/common/src/com/netscape/cms/profile/def/nsTokenUserKeySubjectNameDefault.java
index 65adabfad..65adabfad 100644
--- a/pki/base/common/src/com/netscape/cms/profile/def/nsTokenUserKeySubjectNameDefault.java
+++ b/base/common/src/com/netscape/cms/profile/def/nsTokenUserKeySubjectNameDefault.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/input/CMCCertReqInput.java b/base/common/src/com/netscape/cms/profile/input/CMCCertReqInput.java
index 77d4b1ce0..77d4b1ce0 100644
--- a/pki/base/common/src/com/netscape/cms/profile/input/CMCCertReqInput.java
+++ b/base/common/src/com/netscape/cms/profile/input/CMCCertReqInput.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/input/CertReqInput.java b/base/common/src/com/netscape/cms/profile/input/CertReqInput.java
index 0b7e9f071..0b7e9f071 100644
--- a/pki/base/common/src/com/netscape/cms/profile/input/CertReqInput.java
+++ b/base/common/src/com/netscape/cms/profile/input/CertReqInput.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/input/DualKeyGenInput.java b/base/common/src/com/netscape/cms/profile/input/DualKeyGenInput.java
index 18b9ecf52..18b9ecf52 100644
--- a/pki/base/common/src/com/netscape/cms/profile/input/DualKeyGenInput.java
+++ b/base/common/src/com/netscape/cms/profile/input/DualKeyGenInput.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/input/EncryptionKeyGenInput.java b/base/common/src/com/netscape/cms/profile/input/EncryptionKeyGenInput.java
index d59629f78..d59629f78 100644
--- a/pki/base/common/src/com/netscape/cms/profile/input/EncryptionKeyGenInput.java
+++ b/base/common/src/com/netscape/cms/profile/input/EncryptionKeyGenInput.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/input/EnrollInput.java b/base/common/src/com/netscape/cms/profile/input/EnrollInput.java
index c4269ba7d..c4269ba7d 100644
--- a/pki/base/common/src/com/netscape/cms/profile/input/EnrollInput.java
+++ b/base/common/src/com/netscape/cms/profile/input/EnrollInput.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/input/FileSigningInput.java b/base/common/src/com/netscape/cms/profile/input/FileSigningInput.java
index 357488186..357488186 100644
--- a/pki/base/common/src/com/netscape/cms/profile/input/FileSigningInput.java
+++ b/base/common/src/com/netscape/cms/profile/input/FileSigningInput.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/input/GenericInput.java b/base/common/src/com/netscape/cms/profile/input/GenericInput.java
index e8edfaa6d..e8edfaa6d 100644
--- a/pki/base/common/src/com/netscape/cms/profile/input/GenericInput.java
+++ b/base/common/src/com/netscape/cms/profile/input/GenericInput.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/input/ImageInput.java b/base/common/src/com/netscape/cms/profile/input/ImageInput.java
index 30570b56c..30570b56c 100644
--- a/pki/base/common/src/com/netscape/cms/profile/input/ImageInput.java
+++ b/base/common/src/com/netscape/cms/profile/input/ImageInput.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/input/KeyGenInput.java b/base/common/src/com/netscape/cms/profile/input/KeyGenInput.java
index c2b3cf0d5..c2b3cf0d5 100644
--- a/pki/base/common/src/com/netscape/cms/profile/input/KeyGenInput.java
+++ b/base/common/src/com/netscape/cms/profile/input/KeyGenInput.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/input/SerialNumRenewInput.java b/base/common/src/com/netscape/cms/profile/input/SerialNumRenewInput.java
index 542a2c940..542a2c940 100644
--- a/pki/base/common/src/com/netscape/cms/profile/input/SerialNumRenewInput.java
+++ b/base/common/src/com/netscape/cms/profile/input/SerialNumRenewInput.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/input/SigningKeyGenInput.java b/base/common/src/com/netscape/cms/profile/input/SigningKeyGenInput.java
index aa471d4f6..aa471d4f6 100644
--- a/pki/base/common/src/com/netscape/cms/profile/input/SigningKeyGenInput.java
+++ b/base/common/src/com/netscape/cms/profile/input/SigningKeyGenInput.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/input/SubjectDNInput.java b/base/common/src/com/netscape/cms/profile/input/SubjectDNInput.java
index a12351f8a..a12351f8a 100644
--- a/pki/base/common/src/com/netscape/cms/profile/input/SubjectDNInput.java
+++ b/base/common/src/com/netscape/cms/profile/input/SubjectDNInput.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/input/SubjectNameInput.java b/base/common/src/com/netscape/cms/profile/input/SubjectNameInput.java
index db70da666..db70da666 100644
--- a/pki/base/common/src/com/netscape/cms/profile/input/SubjectNameInput.java
+++ b/base/common/src/com/netscape/cms/profile/input/SubjectNameInput.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/input/SubmitterInfoInput.java b/base/common/src/com/netscape/cms/profile/input/SubmitterInfoInput.java
index 984706f42..984706f42 100644
--- a/pki/base/common/src/com/netscape/cms/profile/input/SubmitterInfoInput.java
+++ b/base/common/src/com/netscape/cms/profile/input/SubmitterInfoInput.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/input/nsHKeyCertReqInput.java b/base/common/src/com/netscape/cms/profile/input/nsHKeyCertReqInput.java
index 3c6067891..3c6067891 100644
--- a/pki/base/common/src/com/netscape/cms/profile/input/nsHKeyCertReqInput.java
+++ b/base/common/src/com/netscape/cms/profile/input/nsHKeyCertReqInput.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/input/nsNKeyCertReqInput.java b/base/common/src/com/netscape/cms/profile/input/nsNKeyCertReqInput.java
index 196798683..196798683 100644
--- a/pki/base/common/src/com/netscape/cms/profile/input/nsNKeyCertReqInput.java
+++ b/base/common/src/com/netscape/cms/profile/input/nsNKeyCertReqInput.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/output/CMMFOutput.java b/base/common/src/com/netscape/cms/profile/output/CMMFOutput.java
index 2253460b1..2253460b1 100644
--- a/pki/base/common/src/com/netscape/cms/profile/output/CMMFOutput.java
+++ b/base/common/src/com/netscape/cms/profile/output/CMMFOutput.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/output/CertOutput.java b/base/common/src/com/netscape/cms/profile/output/CertOutput.java
index 1293c055c..1293c055c 100644
--- a/pki/base/common/src/com/netscape/cms/profile/output/CertOutput.java
+++ b/base/common/src/com/netscape/cms/profile/output/CertOutput.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/output/EnrollOutput.java b/base/common/src/com/netscape/cms/profile/output/EnrollOutput.java
index 25a4b4908..25a4b4908 100644
--- a/pki/base/common/src/com/netscape/cms/profile/output/EnrollOutput.java
+++ b/base/common/src/com/netscape/cms/profile/output/EnrollOutput.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/output/PKCS7Output.java b/base/common/src/com/netscape/cms/profile/output/PKCS7Output.java
index 0e01e15dd..0e01e15dd 100644
--- a/pki/base/common/src/com/netscape/cms/profile/output/PKCS7Output.java
+++ b/base/common/src/com/netscape/cms/profile/output/PKCS7Output.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/output/nsNKeyOutput.java b/base/common/src/com/netscape/cms/profile/output/nsNKeyOutput.java
index 6bf03f436..6bf03f436 100644
--- a/pki/base/common/src/com/netscape/cms/profile/output/nsNKeyOutput.java
+++ b/base/common/src/com/netscape/cms/profile/output/nsNKeyOutput.java
diff --git a/pki/base/common/src/com/netscape/cms/profile/updater/SubsystemGroupUpdater.java b/base/common/src/com/netscape/cms/profile/updater/SubsystemGroupUpdater.java
index 52c87113d..52c87113d 100644
--- a/pki/base/common/src/com/netscape/cms/profile/updater/SubsystemGroupUpdater.java
+++ b/base/common/src/com/netscape/cms/profile/updater/SubsystemGroupUpdater.java
diff --git a/pki/base/common/src/com/netscape/cms/publish/mappers/AVAPattern.java b/base/common/src/com/netscape/cms/publish/mappers/AVAPattern.java
index 7f70722d0..7f70722d0 100644
--- a/pki/base/common/src/com/netscape/cms/publish/mappers/AVAPattern.java
+++ b/base/common/src/com/netscape/cms/publish/mappers/AVAPattern.java
diff --git a/pki/base/common/src/com/netscape/cms/publish/mappers/LdapCaSimpleMap.java b/base/common/src/com/netscape/cms/publish/mappers/LdapCaSimpleMap.java
index bbf641540..bbf641540 100644
--- a/pki/base/common/src/com/netscape/cms/publish/mappers/LdapCaSimpleMap.java
+++ b/base/common/src/com/netscape/cms/publish/mappers/LdapCaSimpleMap.java
diff --git a/pki/base/common/src/com/netscape/cms/publish/mappers/LdapCertCompsMap.java b/base/common/src/com/netscape/cms/publish/mappers/LdapCertCompsMap.java
index 2373e3c66..2373e3c66 100644
--- a/pki/base/common/src/com/netscape/cms/publish/mappers/LdapCertCompsMap.java
+++ b/base/common/src/com/netscape/cms/publish/mappers/LdapCertCompsMap.java
diff --git a/pki/base/common/src/com/netscape/cms/publish/mappers/LdapCertExactMap.java b/base/common/src/com/netscape/cms/publish/mappers/LdapCertExactMap.java
index 11b53a797..11b53a797 100644
--- a/pki/base/common/src/com/netscape/cms/publish/mappers/LdapCertExactMap.java
+++ b/base/common/src/com/netscape/cms/publish/mappers/LdapCertExactMap.java
diff --git a/pki/base/common/src/com/netscape/cms/publish/mappers/LdapCertSubjMap.java b/base/common/src/com/netscape/cms/publish/mappers/LdapCertSubjMap.java
index 4d5ff38c8..4d5ff38c8 100644
--- a/pki/base/common/src/com/netscape/cms/publish/mappers/LdapCertSubjMap.java
+++ b/base/common/src/com/netscape/cms/publish/mappers/LdapCertSubjMap.java
diff --git a/pki/base/common/src/com/netscape/cms/publish/mappers/LdapCrlIssuerCompsMap.java b/base/common/src/com/netscape/cms/publish/mappers/LdapCrlIssuerCompsMap.java
index 654de5d30..654de5d30 100644
--- a/pki/base/common/src/com/netscape/cms/publish/mappers/LdapCrlIssuerCompsMap.java
+++ b/base/common/src/com/netscape/cms/publish/mappers/LdapCrlIssuerCompsMap.java
diff --git a/pki/base/common/src/com/netscape/cms/publish/mappers/LdapDNCompsMap.java b/base/common/src/com/netscape/cms/publish/mappers/LdapDNCompsMap.java
index 73549f1b5..73549f1b5 100644
--- a/pki/base/common/src/com/netscape/cms/publish/mappers/LdapDNCompsMap.java
+++ b/base/common/src/com/netscape/cms/publish/mappers/LdapDNCompsMap.java
diff --git a/pki/base/common/src/com/netscape/cms/publish/mappers/LdapEnhancedMap.java b/base/common/src/com/netscape/cms/publish/mappers/LdapEnhancedMap.java
index c9a7f867c..c9a7f867c 100644
--- a/pki/base/common/src/com/netscape/cms/publish/mappers/LdapEnhancedMap.java
+++ b/base/common/src/com/netscape/cms/publish/mappers/LdapEnhancedMap.java
diff --git a/pki/base/common/src/com/netscape/cms/publish/mappers/LdapSimpleMap.java b/base/common/src/com/netscape/cms/publish/mappers/LdapSimpleMap.java
index 642729673..642729673 100644
--- a/pki/base/common/src/com/netscape/cms/publish/mappers/LdapSimpleMap.java
+++ b/base/common/src/com/netscape/cms/publish/mappers/LdapSimpleMap.java
diff --git a/pki/base/common/src/com/netscape/cms/publish/mappers/MapAVAPattern.java b/base/common/src/com/netscape/cms/publish/mappers/MapAVAPattern.java
index 7aeb672d0..7aeb672d0 100644
--- a/pki/base/common/src/com/netscape/cms/publish/mappers/MapAVAPattern.java
+++ b/base/common/src/com/netscape/cms/publish/mappers/MapAVAPattern.java
diff --git a/pki/base/common/src/com/netscape/cms/publish/mappers/MapDNPattern.java b/base/common/src/com/netscape/cms/publish/mappers/MapDNPattern.java
index 7a9025b1d..7a9025b1d 100644
--- a/pki/base/common/src/com/netscape/cms/publish/mappers/MapDNPattern.java
+++ b/base/common/src/com/netscape/cms/publish/mappers/MapDNPattern.java
diff --git a/pki/base/common/src/com/netscape/cms/publish/mappers/MapRDNPattern.java b/base/common/src/com/netscape/cms/publish/mappers/MapRDNPattern.java
index c1688345b..c1688345b 100644
--- a/pki/base/common/src/com/netscape/cms/publish/mappers/MapRDNPattern.java
+++ b/base/common/src/com/netscape/cms/publish/mappers/MapRDNPattern.java
diff --git a/pki/base/common/src/com/netscape/cms/publish/mappers/NoMap.java b/base/common/src/com/netscape/cms/publish/mappers/NoMap.java
index 155c54ce0..155c54ce0 100644
--- a/pki/base/common/src/com/netscape/cms/publish/mappers/NoMap.java
+++ b/base/common/src/com/netscape/cms/publish/mappers/NoMap.java
diff --git a/pki/base/common/src/com/netscape/cms/publish/publishers/FileBasedPublisher.java b/base/common/src/com/netscape/cms/publish/publishers/FileBasedPublisher.java
index cb13b2452..cb13b2452 100644
--- a/pki/base/common/src/com/netscape/cms/publish/publishers/FileBasedPublisher.java
+++ b/base/common/src/com/netscape/cms/publish/publishers/FileBasedPublisher.java
diff --git a/pki/base/common/src/com/netscape/cms/publish/publishers/LdapCaCertPublisher.java b/base/common/src/com/netscape/cms/publish/publishers/LdapCaCertPublisher.java
index e47318b76..e47318b76 100644
--- a/pki/base/common/src/com/netscape/cms/publish/publishers/LdapCaCertPublisher.java
+++ b/base/common/src/com/netscape/cms/publish/publishers/LdapCaCertPublisher.java
diff --git a/pki/base/common/src/com/netscape/cms/publish/publishers/LdapCertSubjPublisher.java b/base/common/src/com/netscape/cms/publish/publishers/LdapCertSubjPublisher.java
index 9000f6834..9000f6834 100644
--- a/pki/base/common/src/com/netscape/cms/publish/publishers/LdapCertSubjPublisher.java
+++ b/base/common/src/com/netscape/cms/publish/publishers/LdapCertSubjPublisher.java
diff --git a/pki/base/common/src/com/netscape/cms/publish/publishers/LdapCertificatePairPublisher.java b/base/common/src/com/netscape/cms/publish/publishers/LdapCertificatePairPublisher.java
index c65ff79d5..c65ff79d5 100644
--- a/pki/base/common/src/com/netscape/cms/publish/publishers/LdapCertificatePairPublisher.java
+++ b/base/common/src/com/netscape/cms/publish/publishers/LdapCertificatePairPublisher.java
diff --git a/pki/base/common/src/com/netscape/cms/publish/publishers/LdapCrlPublisher.java b/base/common/src/com/netscape/cms/publish/publishers/LdapCrlPublisher.java
index 6826cc801..6826cc801 100644
--- a/pki/base/common/src/com/netscape/cms/publish/publishers/LdapCrlPublisher.java
+++ b/base/common/src/com/netscape/cms/publish/publishers/LdapCrlPublisher.java
diff --git a/pki/base/common/src/com/netscape/cms/publish/publishers/LdapEncryptCertPublisher.java b/base/common/src/com/netscape/cms/publish/publishers/LdapEncryptCertPublisher.java
index d2c488620..d2c488620 100644
--- a/pki/base/common/src/com/netscape/cms/publish/publishers/LdapEncryptCertPublisher.java
+++ b/base/common/src/com/netscape/cms/publish/publishers/LdapEncryptCertPublisher.java
diff --git a/pki/base/common/src/com/netscape/cms/publish/publishers/LdapUserCertPublisher.java b/base/common/src/com/netscape/cms/publish/publishers/LdapUserCertPublisher.java
index e31ce674c..e31ce674c 100644
--- a/pki/base/common/src/com/netscape/cms/publish/publishers/LdapUserCertPublisher.java
+++ b/base/common/src/com/netscape/cms/publish/publishers/LdapUserCertPublisher.java
diff --git a/pki/base/common/src/com/netscape/cms/publish/publishers/OCSPPublisher.java b/base/common/src/com/netscape/cms/publish/publishers/OCSPPublisher.java
index 600bbd110..600bbd110 100644
--- a/pki/base/common/src/com/netscape/cms/publish/publishers/OCSPPublisher.java
+++ b/base/common/src/com/netscape/cms/publish/publishers/OCSPPublisher.java
diff --git a/pki/base/common/src/com/netscape/cms/publish/publishers/PublisherUtils.java b/base/common/src/com/netscape/cms/publish/publishers/PublisherUtils.java
index af8d283dd..af8d283dd 100644
--- a/pki/base/common/src/com/netscape/cms/publish/publishers/PublisherUtils.java
+++ b/base/common/src/com/netscape/cms/publish/publishers/PublisherUtils.java
diff --git a/pki/base/common/src/com/netscape/cms/request/RequestScheduler.java b/base/common/src/com/netscape/cms/request/RequestScheduler.java
index e0ebaefc4..e0ebaefc4 100644
--- a/pki/base/common/src/com/netscape/cms/request/RequestScheduler.java
+++ b/base/common/src/com/netscape/cms/request/RequestScheduler.java
diff --git a/pki/base/common/src/com/netscape/cms/selftests/ASelfTest.java b/base/common/src/com/netscape/cms/selftests/ASelfTest.java
index cdd86ccaf..cdd86ccaf 100644
--- a/pki/base/common/src/com/netscape/cms/selftests/ASelfTest.java
+++ b/base/common/src/com/netscape/cms/selftests/ASelfTest.java
diff --git a/pki/base/common/src/com/netscape/cms/selftests/ca/CAPresence.java b/base/common/src/com/netscape/cms/selftests/ca/CAPresence.java
index c9c12bb42..c9c12bb42 100644
--- a/pki/base/common/src/com/netscape/cms/selftests/ca/CAPresence.java
+++ b/base/common/src/com/netscape/cms/selftests/ca/CAPresence.java
diff --git a/pki/base/common/src/com/netscape/cms/selftests/ca/CAValidity.java b/base/common/src/com/netscape/cms/selftests/ca/CAValidity.java
index 9325208f9..9325208f9 100644
--- a/pki/base/common/src/com/netscape/cms/selftests/ca/CAValidity.java
+++ b/base/common/src/com/netscape/cms/selftests/ca/CAValidity.java
diff --git a/pki/base/common/src/com/netscape/cms/selftests/common/SystemCertsVerification.java b/base/common/src/com/netscape/cms/selftests/common/SystemCertsVerification.java
index 57afffdf2..57afffdf2 100644
--- a/pki/base/common/src/com/netscape/cms/selftests/common/SystemCertsVerification.java
+++ b/base/common/src/com/netscape/cms/selftests/common/SystemCertsVerification.java
diff --git a/pki/base/common/src/com/netscape/cms/selftests/kra/KRAPresence.java b/base/common/src/com/netscape/cms/selftests/kra/KRAPresence.java
index 01f5609bf..01f5609bf 100644
--- a/pki/base/common/src/com/netscape/cms/selftests/kra/KRAPresence.java
+++ b/base/common/src/com/netscape/cms/selftests/kra/KRAPresence.java
diff --git a/pki/base/common/src/com/netscape/cms/selftests/ocsp/OCSPPresence.java b/base/common/src/com/netscape/cms/selftests/ocsp/OCSPPresence.java
index c862362a2..c862362a2 100644
--- a/pki/base/common/src/com/netscape/cms/selftests/ocsp/OCSPPresence.java
+++ b/base/common/src/com/netscape/cms/selftests/ocsp/OCSPPresence.java
diff --git a/pki/base/common/src/com/netscape/cms/selftests/ocsp/OCSPValidity.java b/base/common/src/com/netscape/cms/selftests/ocsp/OCSPValidity.java
index 478746827..478746827 100644
--- a/pki/base/common/src/com/netscape/cms/selftests/ocsp/OCSPValidity.java
+++ b/base/common/src/com/netscape/cms/selftests/ocsp/OCSPValidity.java
diff --git a/pki/base/common/src/com/netscape/cms/selftests/ra/RAPresence.java b/base/common/src/com/netscape/cms/selftests/ra/RAPresence.java
index 9790bf619..9790bf619 100644
--- a/pki/base/common/src/com/netscape/cms/selftests/ra/RAPresence.java
+++ b/base/common/src/com/netscape/cms/selftests/ra/RAPresence.java
diff --git a/pki/base/common/src/com/netscape/cms/selftests/tks/TKSKnownSessionKey.java b/base/common/src/com/netscape/cms/selftests/tks/TKSKnownSessionKey.java
index 69edeb24f..69edeb24f 100644
--- a/pki/base/common/src/com/netscape/cms/selftests/tks/TKSKnownSessionKey.java
+++ b/base/common/src/com/netscape/cms/selftests/tks/TKSKnownSessionKey.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/admin/ACLAdminServlet.java b/base/common/src/com/netscape/cms/servlet/admin/ACLAdminServlet.java
index 12575675c..12575675c 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/admin/ACLAdminServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/admin/ACLAdminServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/admin/AdminResources.java b/base/common/src/com/netscape/cms/servlet/admin/AdminResources.java
index a36c859d9..a36c859d9 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/admin/AdminResources.java
+++ b/base/common/src/com/netscape/cms/servlet/admin/AdminResources.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/admin/AdminServlet.java b/base/common/src/com/netscape/cms/servlet/admin/AdminServlet.java
index ce4c966ad..ce4c966ad 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/admin/AdminServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/admin/AdminServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/admin/AuthAdminServlet.java b/base/common/src/com/netscape/cms/servlet/admin/AuthAdminServlet.java
index cacd0b5d0..cacd0b5d0 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/admin/AuthAdminServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/admin/AuthAdminServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/admin/AuthCredentials.java b/base/common/src/com/netscape/cms/servlet/admin/AuthCredentials.java
index 69cfd9aaf..69cfd9aaf 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/admin/AuthCredentials.java
+++ b/base/common/src/com/netscape/cms/servlet/admin/AuthCredentials.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/admin/CAAdminServlet.java b/base/common/src/com/netscape/cms/servlet/admin/CAAdminServlet.java
index e7b32e844..e7b32e844 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/admin/CAAdminServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/admin/CAAdminServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/admin/CMSAdminServlet.java b/base/common/src/com/netscape/cms/servlet/admin/CMSAdminServlet.java
index 3a2ae0a11..3a2ae0a11 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/admin/CMSAdminServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/admin/CMSAdminServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/admin/JobsAdminServlet.java b/base/common/src/com/netscape/cms/servlet/admin/JobsAdminServlet.java
index 42ff32ebe..42ff32ebe 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/admin/JobsAdminServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/admin/JobsAdminServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/admin/KRAAdminServlet.java b/base/common/src/com/netscape/cms/servlet/admin/KRAAdminServlet.java
index eaa5a95c4..eaa5a95c4 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/admin/KRAAdminServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/admin/KRAAdminServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/admin/LogAdminServlet.java b/base/common/src/com/netscape/cms/servlet/admin/LogAdminServlet.java
index 1b32018bc..1b32018bc 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/admin/LogAdminServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/admin/LogAdminServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/admin/OCSPAdminServlet.java b/base/common/src/com/netscape/cms/servlet/admin/OCSPAdminServlet.java
index 0e6784413..0e6784413 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/admin/OCSPAdminServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/admin/OCSPAdminServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/admin/PolicyAdminServlet.java b/base/common/src/com/netscape/cms/servlet/admin/PolicyAdminServlet.java
index 0bcb962ea..0bcb962ea 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/admin/PolicyAdminServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/admin/PolicyAdminServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/admin/ProfileAdminServlet.java b/base/common/src/com/netscape/cms/servlet/admin/ProfileAdminServlet.java
index 94235f532..94235f532 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/admin/ProfileAdminServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/admin/ProfileAdminServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/admin/PublisherAdminServlet.java b/base/common/src/com/netscape/cms/servlet/admin/PublisherAdminServlet.java
index 483ac42ef..483ac42ef 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/admin/PublisherAdminServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/admin/PublisherAdminServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/admin/RAAdminServlet.java b/base/common/src/com/netscape/cms/servlet/admin/RAAdminServlet.java
index 5bdb14177..5bdb14177 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/admin/RAAdminServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/admin/RAAdminServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/admin/RegistryAdminServlet.java b/base/common/src/com/netscape/cms/servlet/admin/RegistryAdminServlet.java
index 4bebe85d3..4bebe85d3 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/admin/RegistryAdminServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/admin/RegistryAdminServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/admin/SystemCertificateResource.java b/base/common/src/com/netscape/cms/servlet/admin/SystemCertificateResource.java
index d4cfcd296..d4cfcd296 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/admin/SystemCertificateResource.java
+++ b/base/common/src/com/netscape/cms/servlet/admin/SystemCertificateResource.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/admin/SystemCertificateResourceService.java b/base/common/src/com/netscape/cms/servlet/admin/SystemCertificateResourceService.java
index 48f410c73..48f410c73 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/admin/SystemCertificateResourceService.java
+++ b/base/common/src/com/netscape/cms/servlet/admin/SystemCertificateResourceService.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/admin/UsrGrpAdminServlet.java b/base/common/src/com/netscape/cms/servlet/admin/UsrGrpAdminServlet.java
index e5a6dd3c4..e5a6dd3c4 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/admin/UsrGrpAdminServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/admin/UsrGrpAdminServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/base/CMSResourceService.java b/base/common/src/com/netscape/cms/servlet/base/CMSResourceService.java
index acddba559..acddba559 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/base/CMSResourceService.java
+++ b/base/common/src/com/netscape/cms/servlet/base/CMSResourceService.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/base/CMSServlet.java b/base/common/src/com/netscape/cms/servlet/base/CMSServlet.java
index c0931ee2f..c0931ee2f 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/base/CMSServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/base/CMSServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/base/CMSStartServlet.java b/base/common/src/com/netscape/cms/servlet/base/CMSStartServlet.java
index 4bfc74607..4bfc74607 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/base/CMSStartServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/base/CMSStartServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/base/DisplayHtmlServlet.java b/base/common/src/com/netscape/cms/servlet/base/DisplayHtmlServlet.java
index 54e453f30..54e453f30 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/base/DisplayHtmlServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/base/DisplayHtmlServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/base/DynamicVariablesServlet.java b/base/common/src/com/netscape/cms/servlet/base/DynamicVariablesServlet.java
index 0bf726879..0bf726879 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/base/DynamicVariablesServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/base/DynamicVariablesServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/base/GetStats.java b/base/common/src/com/netscape/cms/servlet/base/GetStats.java
index c21b56835..c21b56835 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/base/GetStats.java
+++ b/base/common/src/com/netscape/cms/servlet/base/GetStats.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/base/IndexServlet.java b/base/common/src/com/netscape/cms/servlet/base/IndexServlet.java
index 95dbf2abf..95dbf2abf 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/base/IndexServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/base/IndexServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/base/PortsServlet.java b/base/common/src/com/netscape/cms/servlet/base/PortsServlet.java
index fced583a2..fced583a2 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/base/PortsServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/base/PortsServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/base/ProxyServlet.java b/base/common/src/com/netscape/cms/servlet/base/ProxyServlet.java
index 41666ab31..41666ab31 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/base/ProxyServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/base/ProxyServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/base/SystemInfoServlet.java b/base/common/src/com/netscape/cms/servlet/base/SystemInfoServlet.java
index f883fd373..f883fd373 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/base/SystemInfoServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/base/SystemInfoServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/base/UserInfo.java b/base/common/src/com/netscape/cms/servlet/base/UserInfo.java
index dd8f69613..dd8f69613 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/base/UserInfo.java
+++ b/base/common/src/com/netscape/cms/servlet/base/UserInfo.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/base/model/Link.java b/base/common/src/com/netscape/cms/servlet/base/model/Link.java
index 7fd850a22..7fd850a22 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/base/model/Link.java
+++ b/base/common/src/com/netscape/cms/servlet/base/model/Link.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/CMCRevReqServlet.java b/base/common/src/com/netscape/cms/servlet/cert/CMCRevReqServlet.java
index 5af09ad0d..5af09ad0d 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/cert/CMCRevReqServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/cert/CMCRevReqServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/ChallengeRevocationServlet1.java b/base/common/src/com/netscape/cms/servlet/cert/ChallengeRevocationServlet1.java
index f056047cc..f056047cc 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/cert/ChallengeRevocationServlet1.java
+++ b/base/common/src/com/netscape/cms/servlet/cert/ChallengeRevocationServlet1.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/CloneRedirect.java b/base/common/src/com/netscape/cms/servlet/cert/CloneRedirect.java
index d17fd959b..d17fd959b 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/cert/CloneRedirect.java
+++ b/base/common/src/com/netscape/cms/servlet/cert/CloneRedirect.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/DirAuthServlet.java b/base/common/src/com/netscape/cms/servlet/cert/DirAuthServlet.java
index ced92ba85..ced92ba85 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/cert/DirAuthServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/cert/DirAuthServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/DisableEnrollResult.java b/base/common/src/com/netscape/cms/servlet/cert/DisableEnrollResult.java
index a5cdc98e8..a5cdc98e8 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/cert/DisableEnrollResult.java
+++ b/base/common/src/com/netscape/cms/servlet/cert/DisableEnrollResult.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/DisplayBySerial.java b/base/common/src/com/netscape/cms/servlet/cert/DisplayBySerial.java
index 5a1e4ed65..5a1e4ed65 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/cert/DisplayBySerial.java
+++ b/base/common/src/com/netscape/cms/servlet/cert/DisplayBySerial.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/DisplayCRL.java b/base/common/src/com/netscape/cms/servlet/cert/DisplayCRL.java
index ad503272a..ad503272a 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/cert/DisplayCRL.java
+++ b/base/common/src/com/netscape/cms/servlet/cert/DisplayCRL.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/DisplayHashUserEnroll.java b/base/common/src/com/netscape/cms/servlet/cert/DisplayHashUserEnroll.java
index 99082d4c5..99082d4c5 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/cert/DisplayHashUserEnroll.java
+++ b/base/common/src/com/netscape/cms/servlet/cert/DisplayHashUserEnroll.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/DoRevoke.java b/base/common/src/com/netscape/cms/servlet/cert/DoRevoke.java
index 1594c5323..1594c5323 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/cert/DoRevoke.java
+++ b/base/common/src/com/netscape/cms/servlet/cert/DoRevoke.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/DoRevokeTPS.java b/base/common/src/com/netscape/cms/servlet/cert/DoRevokeTPS.java
index c4603dd51..c4603dd51 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/cert/DoRevokeTPS.java
+++ b/base/common/src/com/netscape/cms/servlet/cert/DoRevokeTPS.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/DoUnrevoke.java b/base/common/src/com/netscape/cms/servlet/cert/DoUnrevoke.java
index c6b6065b4..c6b6065b4 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/cert/DoUnrevoke.java
+++ b/base/common/src/com/netscape/cms/servlet/cert/DoUnrevoke.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/DoUnrevokeTPS.java b/base/common/src/com/netscape/cms/servlet/cert/DoUnrevokeTPS.java
index 5d096aff3..5d096aff3 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/cert/DoUnrevokeTPS.java
+++ b/base/common/src/com/netscape/cms/servlet/cert/DoUnrevokeTPS.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/EnableEnrollResult.java b/base/common/src/com/netscape/cms/servlet/cert/EnableEnrollResult.java
index 2a143b668..2a143b668 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/cert/EnableEnrollResult.java
+++ b/base/common/src/com/netscape/cms/servlet/cert/EnableEnrollResult.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/EnrollServlet.java b/base/common/src/com/netscape/cms/servlet/cert/EnrollServlet.java
index a73a8146c..a73a8146c 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/cert/EnrollServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/cert/EnrollServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/GetBySerial.java b/base/common/src/com/netscape/cms/servlet/cert/GetBySerial.java
index 663397f54..663397f54 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/cert/GetBySerial.java
+++ b/base/common/src/com/netscape/cms/servlet/cert/GetBySerial.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/GetCAChain.java b/base/common/src/com/netscape/cms/servlet/cert/GetCAChain.java
index fe55f335b..fe55f335b 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/cert/GetCAChain.java
+++ b/base/common/src/com/netscape/cms/servlet/cert/GetCAChain.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/GetCRL.java b/base/common/src/com/netscape/cms/servlet/cert/GetCRL.java
index 4c8661359..4c8661359 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/cert/GetCRL.java
+++ b/base/common/src/com/netscape/cms/servlet/cert/GetCRL.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/GetCertFromRequest.java b/base/common/src/com/netscape/cms/servlet/cert/GetCertFromRequest.java
index 71b0004cd..71b0004cd 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/cert/GetCertFromRequest.java
+++ b/base/common/src/com/netscape/cms/servlet/cert/GetCertFromRequest.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/GetEnableStatus.java b/base/common/src/com/netscape/cms/servlet/cert/GetEnableStatus.java
index d0dfb8f9a..d0dfb8f9a 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/cert/GetEnableStatus.java
+++ b/base/common/src/com/netscape/cms/servlet/cert/GetEnableStatus.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/GetInfo.java b/base/common/src/com/netscape/cms/servlet/cert/GetInfo.java
index 6af5c0c39..6af5c0c39 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/cert/GetInfo.java
+++ b/base/common/src/com/netscape/cms/servlet/cert/GetInfo.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/HashEnrollServlet.java b/base/common/src/com/netscape/cms/servlet/cert/HashEnrollServlet.java
index 5e6207e1a..5e6207e1a 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/cert/HashEnrollServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/cert/HashEnrollServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/ImportCertsTemplateFiller.java b/base/common/src/com/netscape/cms/servlet/cert/ImportCertsTemplateFiller.java
index 2f551d3f5..2f551d3f5 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/cert/ImportCertsTemplateFiller.java
+++ b/base/common/src/com/netscape/cms/servlet/cert/ImportCertsTemplateFiller.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/ListCerts.java b/base/common/src/com/netscape/cms/servlet/cert/ListCerts.java
index b93a82fb8..b93a82fb8 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/cert/ListCerts.java
+++ b/base/common/src/com/netscape/cms/servlet/cert/ListCerts.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/Monitor.java b/base/common/src/com/netscape/cms/servlet/cert/Monitor.java
index ac531caca..ac531caca 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/cert/Monitor.java
+++ b/base/common/src/com/netscape/cms/servlet/cert/Monitor.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/ReasonToRevoke.java b/base/common/src/com/netscape/cms/servlet/cert/ReasonToRevoke.java
index 0f21e1921..0f21e1921 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/cert/ReasonToRevoke.java
+++ b/base/common/src/com/netscape/cms/servlet/cert/ReasonToRevoke.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/RemoteAuthConfig.java b/base/common/src/com/netscape/cms/servlet/cert/RemoteAuthConfig.java
index 478df161d..478df161d 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/cert/RemoteAuthConfig.java
+++ b/base/common/src/com/netscape/cms/servlet/cert/RemoteAuthConfig.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/RenewalServlet.java b/base/common/src/com/netscape/cms/servlet/cert/RenewalServlet.java
index 223121577..223121577 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/cert/RenewalServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/cert/RenewalServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/RevocationServlet.java b/base/common/src/com/netscape/cms/servlet/cert/RevocationServlet.java
index 22aa29eda..22aa29eda 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/cert/RevocationServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/cert/RevocationServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/RevocationSuccessTemplateFiller.java b/base/common/src/com/netscape/cms/servlet/cert/RevocationSuccessTemplateFiller.java
index cfc562d71..cfc562d71 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/cert/RevocationSuccessTemplateFiller.java
+++ b/base/common/src/com/netscape/cms/servlet/cert/RevocationSuccessTemplateFiller.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/SrchCerts.java b/base/common/src/com/netscape/cms/servlet/cert/SrchCerts.java
index 3602515c9..3602515c9 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/cert/SrchCerts.java
+++ b/base/common/src/com/netscape/cms/servlet/cert/SrchCerts.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/UpdateCRL.java b/base/common/src/com/netscape/cms/servlet/cert/UpdateCRL.java
index c0298d1e7..c0298d1e7 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/cert/UpdateCRL.java
+++ b/base/common/src/com/netscape/cms/servlet/cert/UpdateCRL.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/UpdateDir.java b/base/common/src/com/netscape/cms/servlet/cert/UpdateDir.java
index 707e7ff5f..707e7ff5f 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/cert/UpdateDir.java
+++ b/base/common/src/com/netscape/cms/servlet/cert/UpdateDir.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/model/CertificateData.java b/base/common/src/com/netscape/cms/servlet/cert/model/CertificateData.java
index 14c537098..14c537098 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/cert/model/CertificateData.java
+++ b/base/common/src/com/netscape/cms/servlet/cert/model/CertificateData.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/scep/CRSEnrollment.java b/base/common/src/com/netscape/cms/servlet/cert/scep/CRSEnrollment.java
index 90a48cb4e..90a48cb4e 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/cert/scep/CRSEnrollment.java
+++ b/base/common/src/com/netscape/cms/servlet/cert/scep/CRSEnrollment.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/scep/ChallengePassword.java b/base/common/src/com/netscape/cms/servlet/cert/scep/ChallengePassword.java
index ff55dc9ce..ff55dc9ce 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/cert/scep/ChallengePassword.java
+++ b/base/common/src/com/netscape/cms/servlet/cert/scep/ChallengePassword.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/scep/ExtensionsRequested.java b/base/common/src/com/netscape/cms/servlet/cert/scep/ExtensionsRequested.java
index 85f3938b8..85f3938b8 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/cert/scep/ExtensionsRequested.java
+++ b/base/common/src/com/netscape/cms/servlet/cert/scep/ExtensionsRequested.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/common/AuthCredentials.java b/base/common/src/com/netscape/cms/servlet/common/AuthCredentials.java
index 88369ace3..88369ace3 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/common/AuthCredentials.java
+++ b/base/common/src/com/netscape/cms/servlet/common/AuthCredentials.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/common/CMCOutputTemplate.java b/base/common/src/com/netscape/cms/servlet/common/CMCOutputTemplate.java
index 38fcf24f9..38fcf24f9 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/common/CMCOutputTemplate.java
+++ b/base/common/src/com/netscape/cms/servlet/common/CMCOutputTemplate.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/common/CMSFile.java b/base/common/src/com/netscape/cms/servlet/common/CMSFile.java
index 4d7c4cdd6..4d7c4cdd6 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/common/CMSFile.java
+++ b/base/common/src/com/netscape/cms/servlet/common/CMSFile.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/common/CMSFileLoader.java b/base/common/src/com/netscape/cms/servlet/common/CMSFileLoader.java
index 808bdda78..808bdda78 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/common/CMSFileLoader.java
+++ b/base/common/src/com/netscape/cms/servlet/common/CMSFileLoader.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/common/CMSGWResources.java b/base/common/src/com/netscape/cms/servlet/common/CMSGWResources.java
index 7ae242ae7..7ae242ae7 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/common/CMSGWResources.java
+++ b/base/common/src/com/netscape/cms/servlet/common/CMSGWResources.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/common/CMSGateway.java b/base/common/src/com/netscape/cms/servlet/common/CMSGateway.java
index 20743022a..20743022a 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/common/CMSGateway.java
+++ b/base/common/src/com/netscape/cms/servlet/common/CMSGateway.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/common/CMSLoadTemplate.java b/base/common/src/com/netscape/cms/servlet/common/CMSLoadTemplate.java
index 62276df14..62276df14 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/common/CMSLoadTemplate.java
+++ b/base/common/src/com/netscape/cms/servlet/common/CMSLoadTemplate.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/common/CMSRequest.java b/base/common/src/com/netscape/cms/servlet/common/CMSRequest.java
index 256c01010..256c01010 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/common/CMSRequest.java
+++ b/base/common/src/com/netscape/cms/servlet/common/CMSRequest.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/common/CMSTemplate.java b/base/common/src/com/netscape/cms/servlet/common/CMSTemplate.java
index 317bddbcd..317bddbcd 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/common/CMSTemplate.java
+++ b/base/common/src/com/netscape/cms/servlet/common/CMSTemplate.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/common/CMSTemplateParams.java b/base/common/src/com/netscape/cms/servlet/common/CMSTemplateParams.java
index ce2c26c3c..ce2c26c3c 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/common/CMSTemplateParams.java
+++ b/base/common/src/com/netscape/cms/servlet/common/CMSTemplateParams.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/common/ECMSGWException.java b/base/common/src/com/netscape/cms/servlet/common/ECMSGWException.java
index e8b848f7d..e8b848f7d 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/common/ECMSGWException.java
+++ b/base/common/src/com/netscape/cms/servlet/common/ECMSGWException.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/common/GenErrorTemplateFiller.java b/base/common/src/com/netscape/cms/servlet/common/GenErrorTemplateFiller.java
index 40edb3bda..40edb3bda 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/common/GenErrorTemplateFiller.java
+++ b/base/common/src/com/netscape/cms/servlet/common/GenErrorTemplateFiller.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/common/GenPendingTemplateFiller.java b/base/common/src/com/netscape/cms/servlet/common/GenPendingTemplateFiller.java
index 1d479fef3..1d479fef3 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/common/GenPendingTemplateFiller.java
+++ b/base/common/src/com/netscape/cms/servlet/common/GenPendingTemplateFiller.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/common/GenRejectedTemplateFiller.java b/base/common/src/com/netscape/cms/servlet/common/GenRejectedTemplateFiller.java
index 9e75cc799..9e75cc799 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/common/GenRejectedTemplateFiller.java
+++ b/base/common/src/com/netscape/cms/servlet/common/GenRejectedTemplateFiller.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/common/GenSuccessTemplateFiller.java b/base/common/src/com/netscape/cms/servlet/common/GenSuccessTemplateFiller.java
index f6de38412..f6de38412 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/common/GenSuccessTemplateFiller.java
+++ b/base/common/src/com/netscape/cms/servlet/common/GenSuccessTemplateFiller.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/common/GenSvcPendingTemplateFiller.java b/base/common/src/com/netscape/cms/servlet/common/GenSvcPendingTemplateFiller.java
index ec1b97779..ec1b97779 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/common/GenSvcPendingTemplateFiller.java
+++ b/base/common/src/com/netscape/cms/servlet/common/GenSvcPendingTemplateFiller.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/common/GenUnauthorizedTemplateFiller.java b/base/common/src/com/netscape/cms/servlet/common/GenUnauthorizedTemplateFiller.java
index cab1b36e6..cab1b36e6 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/common/GenUnauthorizedTemplateFiller.java
+++ b/base/common/src/com/netscape/cms/servlet/common/GenUnauthorizedTemplateFiller.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/common/GenUnexpectedErrorTemplateFiller.java b/base/common/src/com/netscape/cms/servlet/common/GenUnexpectedErrorTemplateFiller.java
index 8b560d7bc..8b560d7bc 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/common/GenUnexpectedErrorTemplateFiller.java
+++ b/base/common/src/com/netscape/cms/servlet/common/GenUnexpectedErrorTemplateFiller.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/common/ICMSTemplateFiller.java b/base/common/src/com/netscape/cms/servlet/common/ICMSTemplateFiller.java
index 2d046f0ee..2d046f0ee 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/common/ICMSTemplateFiller.java
+++ b/base/common/src/com/netscape/cms/servlet/common/ICMSTemplateFiller.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/common/IRawJS.java b/base/common/src/com/netscape/cms/servlet/common/IRawJS.java
index 827f24f1d..827f24f1d 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/common/IRawJS.java
+++ b/base/common/src/com/netscape/cms/servlet/common/IRawJS.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/common/IndexTemplateFiller.java b/base/common/src/com/netscape/cms/servlet/common/IndexTemplateFiller.java
index 59c4a0fe4..59c4a0fe4 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/common/IndexTemplateFiller.java
+++ b/base/common/src/com/netscape/cms/servlet/common/IndexTemplateFiller.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/common/RawJS.java b/base/common/src/com/netscape/cms/servlet/common/RawJS.java
index f936e0757..f936e0757 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/common/RawJS.java
+++ b/base/common/src/com/netscape/cms/servlet/common/RawJS.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/common/ServletUtils.java b/base/common/src/com/netscape/cms/servlet/common/ServletUtils.java
index 5c16b8195..5c16b8195 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/common/ServletUtils.java
+++ b/base/common/src/com/netscape/cms/servlet/common/ServletUtils.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/connector/CloneServlet.java b/base/common/src/com/netscape/cms/servlet/connector/CloneServlet.java
index f9085a5bc..f9085a5bc 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/connector/CloneServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/connector/CloneServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/connector/ConnectorServlet.java b/base/common/src/com/netscape/cms/servlet/connector/ConnectorServlet.java
index e8d4f898f..e8d4f898f 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/connector/ConnectorServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/connector/ConnectorServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/connector/GenerateKeyPairServlet.java b/base/common/src/com/netscape/cms/servlet/connector/GenerateKeyPairServlet.java
index bb787c7ad..bb787c7ad 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/connector/GenerateKeyPairServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/connector/GenerateKeyPairServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/connector/TokenKeyRecoveryServlet.java b/base/common/src/com/netscape/cms/servlet/connector/TokenKeyRecoveryServlet.java
index 337b24259..337b24259 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/connector/TokenKeyRecoveryServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/connector/TokenKeyRecoveryServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/AdminAuthenticatePanel.java b/base/common/src/com/netscape/cms/servlet/csadmin/AdminAuthenticatePanel.java
index 585d444d4..585d444d4 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/AdminAuthenticatePanel.java
+++ b/base/common/src/com/netscape/cms/servlet/csadmin/AdminAuthenticatePanel.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/AdminPanel.java b/base/common/src/com/netscape/cms/servlet/csadmin/AdminPanel.java
index 1f5a3327c..1f5a3327c 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/AdminPanel.java
+++ b/base/common/src/com/netscape/cms/servlet/csadmin/AdminPanel.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/AgentAuthenticatePanel.java b/base/common/src/com/netscape/cms/servlet/csadmin/AgentAuthenticatePanel.java
index c1e6bffd1..c1e6bffd1 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/AgentAuthenticatePanel.java
+++ b/base/common/src/com/netscape/cms/servlet/csadmin/AgentAuthenticatePanel.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/AuthenticatePanel.java b/base/common/src/com/netscape/cms/servlet/csadmin/AuthenticatePanel.java
index 6700b9312..6700b9312 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/AuthenticatePanel.java
+++ b/base/common/src/com/netscape/cms/servlet/csadmin/AuthenticatePanel.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/BackupKeyCertPanel.java b/base/common/src/com/netscape/cms/servlet/csadmin/BackupKeyCertPanel.java
index d216a9212..d216a9212 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/BackupKeyCertPanel.java
+++ b/base/common/src/com/netscape/cms/servlet/csadmin/BackupKeyCertPanel.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/BaseServlet.java b/base/common/src/com/netscape/cms/servlet/csadmin/BaseServlet.java
index 9e800b9cc..9e800b9cc 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/BaseServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/csadmin/BaseServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/CAInfoPanel.java b/base/common/src/com/netscape/cms/servlet/csadmin/CAInfoPanel.java
index 827f0ce92..827f0ce92 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/CAInfoPanel.java
+++ b/base/common/src/com/netscape/cms/servlet/csadmin/CAInfoPanel.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/Cert.java b/base/common/src/com/netscape/cms/servlet/csadmin/Cert.java
index 0aedded83..0aedded83 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/Cert.java
+++ b/base/common/src/com/netscape/cms/servlet/csadmin/Cert.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/CertPrettyPrintPanel.java b/base/common/src/com/netscape/cms/servlet/csadmin/CertPrettyPrintPanel.java
index 9c4315c05..9c4315c05 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/CertPrettyPrintPanel.java
+++ b/base/common/src/com/netscape/cms/servlet/csadmin/CertPrettyPrintPanel.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/CertRequestPanel.java b/base/common/src/com/netscape/cms/servlet/csadmin/CertRequestPanel.java
index 20ddf9f2d..20ddf9f2d 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/CertRequestPanel.java
+++ b/base/common/src/com/netscape/cms/servlet/csadmin/CertRequestPanel.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/CertUtil.java b/base/common/src/com/netscape/cms/servlet/csadmin/CertUtil.java
index e956edebe..e956edebe 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/CertUtil.java
+++ b/base/common/src/com/netscape/cms/servlet/csadmin/CertUtil.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/CheckIdentity.java b/base/common/src/com/netscape/cms/servlet/csadmin/CheckIdentity.java
index 52a98d540..52a98d540 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/CheckIdentity.java
+++ b/base/common/src/com/netscape/cms/servlet/csadmin/CheckIdentity.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigBaseServlet.java b/base/common/src/com/netscape/cms/servlet/csadmin/ConfigBaseServlet.java
index dbda788f6..dbda788f6 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigBaseServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/csadmin/ConfigBaseServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigCertApprovalCallback.java b/base/common/src/com/netscape/cms/servlet/csadmin/ConfigCertApprovalCallback.java
index 956c285b5..956c285b5 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigCertApprovalCallback.java
+++ b/base/common/src/com/netscape/cms/servlet/csadmin/ConfigCertApprovalCallback.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigCertReqServlet.java b/base/common/src/com/netscape/cms/servlet/csadmin/ConfigCertReqServlet.java
index b04de4144..b04de4144 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigCertReqServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/csadmin/ConfigCertReqServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigCloneServlet.java b/base/common/src/com/netscape/cms/servlet/csadmin/ConfigCloneServlet.java
index ed1d9cc07..ed1d9cc07 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigCloneServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/csadmin/ConfigCloneServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigDatabaseServlet.java b/base/common/src/com/netscape/cms/servlet/csadmin/ConfigDatabaseServlet.java
index 2b4a82a08..2b4a82a08 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigDatabaseServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/csadmin/ConfigDatabaseServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigHSMLoginPanel.java b/base/common/src/com/netscape/cms/servlet/csadmin/ConfigHSMLoginPanel.java
index 03233042c..03233042c 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigHSMLoginPanel.java
+++ b/base/common/src/com/netscape/cms/servlet/csadmin/ConfigHSMLoginPanel.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigHSMServlet.java b/base/common/src/com/netscape/cms/servlet/csadmin/ConfigHSMServlet.java
index 9eb146294..9eb146294 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigHSMServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/csadmin/ConfigHSMServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigImportCertServlet.java b/base/common/src/com/netscape/cms/servlet/csadmin/ConfigImportCertServlet.java
index c65e559df..c65e559df 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigImportCertServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/csadmin/ConfigImportCertServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigJoinServlet.java b/base/common/src/com/netscape/cms/servlet/csadmin/ConfigJoinServlet.java
index 5d50193cb..5d50193cb 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigJoinServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/csadmin/ConfigJoinServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigRootCAServlet.java b/base/common/src/com/netscape/cms/servlet/csadmin/ConfigRootCAServlet.java
index c9618db19..c9618db19 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/ConfigRootCAServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/csadmin/ConfigRootCAServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/CreateSubsystemPanel.java b/base/common/src/com/netscape/cms/servlet/csadmin/CreateSubsystemPanel.java
index 9e430e2fd..9e430e2fd 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/CreateSubsystemPanel.java
+++ b/base/common/src/com/netscape/cms/servlet/csadmin/CreateSubsystemPanel.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/DatabasePanel.java b/base/common/src/com/netscape/cms/servlet/csadmin/DatabasePanel.java
index 82c45d1cd..82c45d1cd 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/DatabasePanel.java
+++ b/base/common/src/com/netscape/cms/servlet/csadmin/DatabasePanel.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/DatabaseServlet.java b/base/common/src/com/netscape/cms/servlet/csadmin/DatabaseServlet.java
index c44f61130..c44f61130 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/DatabaseServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/csadmin/DatabaseServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/DisplayCertChainPanel.java b/base/common/src/com/netscape/cms/servlet/csadmin/DisplayCertChainPanel.java
index c6db8a8b7..c6db8a8b7 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/DisplayCertChainPanel.java
+++ b/base/common/src/com/netscape/cms/servlet/csadmin/DisplayCertChainPanel.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/DisplayServlet.java b/base/common/src/com/netscape/cms/servlet/csadmin/DisplayServlet.java
index 3bb8c73c8..3bb8c73c8 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/DisplayServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/csadmin/DisplayServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/DonePanel.java b/base/common/src/com/netscape/cms/servlet/csadmin/DonePanel.java
index 6d0e92618..6d0e92618 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/DonePanel.java
+++ b/base/common/src/com/netscape/cms/servlet/csadmin/DonePanel.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/DownloadPKCS12.java b/base/common/src/com/netscape/cms/servlet/csadmin/DownloadPKCS12.java
index 094aa7166..094aa7166 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/DownloadPKCS12.java
+++ b/base/common/src/com/netscape/cms/servlet/csadmin/DownloadPKCS12.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetCertChain.java b/base/common/src/com/netscape/cms/servlet/csadmin/GetCertChain.java
index 02fbd7643..02fbd7643 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetCertChain.java
+++ b/base/common/src/com/netscape/cms/servlet/csadmin/GetCertChain.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetConfigEntries.java b/base/common/src/com/netscape/cms/servlet/csadmin/GetConfigEntries.java
index 33d82e9b8..33d82e9b8 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetConfigEntries.java
+++ b/base/common/src/com/netscape/cms/servlet/csadmin/GetConfigEntries.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetCookie.java b/base/common/src/com/netscape/cms/servlet/csadmin/GetCookie.java
index e6810ff42..e6810ff42 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetCookie.java
+++ b/base/common/src/com/netscape/cms/servlet/csadmin/GetCookie.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetDomainXML.java b/base/common/src/com/netscape/cms/servlet/csadmin/GetDomainXML.java
index 999f13815..999f13815 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetDomainXML.java
+++ b/base/common/src/com/netscape/cms/servlet/csadmin/GetDomainXML.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetStatus.java b/base/common/src/com/netscape/cms/servlet/csadmin/GetStatus.java
index 4dc6f0ff6..4dc6f0ff6 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetStatus.java
+++ b/base/common/src/com/netscape/cms/servlet/csadmin/GetStatus.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetSubsystemCert.java b/base/common/src/com/netscape/cms/servlet/csadmin/GetSubsystemCert.java
index 288cfad60..288cfad60 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetSubsystemCert.java
+++ b/base/common/src/com/netscape/cms/servlet/csadmin/GetSubsystemCert.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetTokenInfo.java b/base/common/src/com/netscape/cms/servlet/csadmin/GetTokenInfo.java
index f97d3e5e1..f97d3e5e1 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetTokenInfo.java
+++ b/base/common/src/com/netscape/cms/servlet/csadmin/GetTokenInfo.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetTransportCert.java b/base/common/src/com/netscape/cms/servlet/csadmin/GetTransportCert.java
index 87a1788d6..87a1788d6 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetTransportCert.java
+++ b/base/common/src/com/netscape/cms/servlet/csadmin/GetTransportCert.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/HierarchyPanel.java b/base/common/src/com/netscape/cms/servlet/csadmin/HierarchyPanel.java
index 9044dec04..9044dec04 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/HierarchyPanel.java
+++ b/base/common/src/com/netscape/cms/servlet/csadmin/HierarchyPanel.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/ImportAdminCertPanel.java b/base/common/src/com/netscape/cms/servlet/csadmin/ImportAdminCertPanel.java
index 93c26cdf3..93c26cdf3 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/ImportAdminCertPanel.java
+++ b/base/common/src/com/netscape/cms/servlet/csadmin/ImportAdminCertPanel.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/ImportCAChainPanel.java b/base/common/src/com/netscape/cms/servlet/csadmin/ImportCAChainPanel.java
index d0ccb58e9..d0ccb58e9 100755
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/ImportCAChainPanel.java
+++ b/base/common/src/com/netscape/cms/servlet/csadmin/ImportCAChainPanel.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/ImportTransportCert.java b/base/common/src/com/netscape/cms/servlet/csadmin/ImportTransportCert.java
index 66ca8a8bf..66ca8a8bf 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/ImportTransportCert.java
+++ b/base/common/src/com/netscape/cms/servlet/csadmin/ImportTransportCert.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/LDAPSecurityDomainSessionTable.java b/base/common/src/com/netscape/cms/servlet/csadmin/LDAPSecurityDomainSessionTable.java
index b9932722e..b9932722e 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/LDAPSecurityDomainSessionTable.java
+++ b/base/common/src/com/netscape/cms/servlet/csadmin/LDAPSecurityDomainSessionTable.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/LoginServlet.java b/base/common/src/com/netscape/cms/servlet/csadmin/LoginServlet.java
index 713cb170a..713cb170a 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/LoginServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/csadmin/LoginServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/MainPageServlet.java b/base/common/src/com/netscape/cms/servlet/csadmin/MainPageServlet.java
index 1d833ca9b..1d833ca9b 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/MainPageServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/csadmin/MainPageServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/ModulePanel.java b/base/common/src/com/netscape/cms/servlet/csadmin/ModulePanel.java
index 00474615f..00474615f 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/ModulePanel.java
+++ b/base/common/src/com/netscape/cms/servlet/csadmin/ModulePanel.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/ModuleServlet.java b/base/common/src/com/netscape/cms/servlet/csadmin/ModuleServlet.java
index 1c67654b4..1c67654b4 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/ModuleServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/csadmin/ModuleServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/NamePanel.java b/base/common/src/com/netscape/cms/servlet/csadmin/NamePanel.java
index 916ab199b..916ab199b 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/NamePanel.java
+++ b/base/common/src/com/netscape/cms/servlet/csadmin/NamePanel.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/RegisterUser.java b/base/common/src/com/netscape/cms/servlet/csadmin/RegisterUser.java
index 0042cdb5a..0042cdb5a 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/RegisterUser.java
+++ b/base/common/src/com/netscape/cms/servlet/csadmin/RegisterUser.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/RestoreKeyCertPanel.java b/base/common/src/com/netscape/cms/servlet/csadmin/RestoreKeyCertPanel.java
index 54a5ed3f6..54a5ed3f6 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/RestoreKeyCertPanel.java
+++ b/base/common/src/com/netscape/cms/servlet/csadmin/RestoreKeyCertPanel.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/SavePKCS12Panel.java b/base/common/src/com/netscape/cms/servlet/csadmin/SavePKCS12Panel.java
index 0c066268d..0c066268d 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/SavePKCS12Panel.java
+++ b/base/common/src/com/netscape/cms/servlet/csadmin/SavePKCS12Panel.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/SecurityDomainLogin.java b/base/common/src/com/netscape/cms/servlet/csadmin/SecurityDomainLogin.java
index 42165b08f..42165b08f 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/SecurityDomainLogin.java
+++ b/base/common/src/com/netscape/cms/servlet/csadmin/SecurityDomainLogin.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/SecurityDomainPanel.java b/base/common/src/com/netscape/cms/servlet/csadmin/SecurityDomainPanel.java
index f3a4169e8..f3a4169e8 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/SecurityDomainPanel.java
+++ b/base/common/src/com/netscape/cms/servlet/csadmin/SecurityDomainPanel.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/SecurityDomainSessionTable.java b/base/common/src/com/netscape/cms/servlet/csadmin/SecurityDomainSessionTable.java
index d15ca5ad3..d15ca5ad3 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/SecurityDomainSessionTable.java
+++ b/base/common/src/com/netscape/cms/servlet/csadmin/SecurityDomainSessionTable.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/SessionTimer.java b/base/common/src/com/netscape/cms/servlet/csadmin/SessionTimer.java
index 2d8a188af..2d8a188af 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/SessionTimer.java
+++ b/base/common/src/com/netscape/cms/servlet/csadmin/SessionTimer.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/SizePanel.java b/base/common/src/com/netscape/cms/servlet/csadmin/SizePanel.java
index 678145a92..678145a92 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/SizePanel.java
+++ b/base/common/src/com/netscape/cms/servlet/csadmin/SizePanel.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/TokenAuthenticate.java b/base/common/src/com/netscape/cms/servlet/csadmin/TokenAuthenticate.java
index 2372b3094..2372b3094 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/TokenAuthenticate.java
+++ b/base/common/src/com/netscape/cms/servlet/csadmin/TokenAuthenticate.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/UpdateConnector.java b/base/common/src/com/netscape/cms/servlet/csadmin/UpdateConnector.java
index f3df51bd1..f3df51bd1 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/UpdateConnector.java
+++ b/base/common/src/com/netscape/cms/servlet/csadmin/UpdateConnector.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/UpdateDomainXML.java b/base/common/src/com/netscape/cms/servlet/csadmin/UpdateDomainXML.java
index a2b6ebc72..a2b6ebc72 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/UpdateDomainXML.java
+++ b/base/common/src/com/netscape/cms/servlet/csadmin/UpdateDomainXML.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/UpdateNumberRange.java b/base/common/src/com/netscape/cms/servlet/csadmin/UpdateNumberRange.java
index 894afa5ff..894afa5ff 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/UpdateNumberRange.java
+++ b/base/common/src/com/netscape/cms/servlet/csadmin/UpdateNumberRange.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/UpdateOCSPConfig.java b/base/common/src/com/netscape/cms/servlet/csadmin/UpdateOCSPConfig.java
index 2d3e33f9a..2d3e33f9a 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/UpdateOCSPConfig.java
+++ b/base/common/src/com/netscape/cms/servlet/csadmin/UpdateOCSPConfig.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/WelcomePanel.java b/base/common/src/com/netscape/cms/servlet/csadmin/WelcomePanel.java
index 4224c4ebf..4224c4ebf 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/WelcomePanel.java
+++ b/base/common/src/com/netscape/cms/servlet/csadmin/WelcomePanel.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/WelcomeServlet.java b/base/common/src/com/netscape/cms/servlet/csadmin/WelcomeServlet.java
index f5a96bc8a..f5a96bc8a 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/WelcomeServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/csadmin/WelcomeServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/WizardPanelBase.java b/base/common/src/com/netscape/cms/servlet/csadmin/WizardPanelBase.java
index 55f7171ef..55f7171ef 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/WizardPanelBase.java
+++ b/base/common/src/com/netscape/cms/servlet/csadmin/WizardPanelBase.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/filter/AdminRequestFilter.java b/base/common/src/com/netscape/cms/servlet/filter/AdminRequestFilter.java
index c7532c7aa..c7532c7aa 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/filter/AdminRequestFilter.java
+++ b/base/common/src/com/netscape/cms/servlet/filter/AdminRequestFilter.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/filter/AgentRequestFilter.java b/base/common/src/com/netscape/cms/servlet/filter/AgentRequestFilter.java
index 4225aed77..4225aed77 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/filter/AgentRequestFilter.java
+++ b/base/common/src/com/netscape/cms/servlet/filter/AgentRequestFilter.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/filter/EEClientAuthRequestFilter.java b/base/common/src/com/netscape/cms/servlet/filter/EEClientAuthRequestFilter.java
index 8c62cd311..8c62cd311 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/filter/EEClientAuthRequestFilter.java
+++ b/base/common/src/com/netscape/cms/servlet/filter/EEClientAuthRequestFilter.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/filter/EERequestFilter.java b/base/common/src/com/netscape/cms/servlet/filter/EERequestFilter.java
index 8a8bea01c..8a8bea01c 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/filter/EERequestFilter.java
+++ b/base/common/src/com/netscape/cms/servlet/filter/EERequestFilter.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/key/ConfirmRecoverBySerial.java b/base/common/src/com/netscape/cms/servlet/key/ConfirmRecoverBySerial.java
index 59b01f26a..59b01f26a 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/key/ConfirmRecoverBySerial.java
+++ b/base/common/src/com/netscape/cms/servlet/key/ConfirmRecoverBySerial.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/key/DisplayBySerial.java b/base/common/src/com/netscape/cms/servlet/key/DisplayBySerial.java
index 8876d9350..8876d9350 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/key/DisplayBySerial.java
+++ b/base/common/src/com/netscape/cms/servlet/key/DisplayBySerial.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/key/DisplayBySerialForRecovery.java b/base/common/src/com/netscape/cms/servlet/key/DisplayBySerialForRecovery.java
index 29cc2b3b3..29cc2b3b3 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/key/DisplayBySerialForRecovery.java
+++ b/base/common/src/com/netscape/cms/servlet/key/DisplayBySerialForRecovery.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/key/DisplayTransport.java b/base/common/src/com/netscape/cms/servlet/key/DisplayTransport.java
index dd224cc8a..dd224cc8a 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/key/DisplayTransport.java
+++ b/base/common/src/com/netscape/cms/servlet/key/DisplayTransport.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/key/ExamineRecovery.java b/base/common/src/com/netscape/cms/servlet/key/ExamineRecovery.java
index cd440da08..cd440da08 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/key/ExamineRecovery.java
+++ b/base/common/src/com/netscape/cms/servlet/key/ExamineRecovery.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/key/GetApprovalStatus.java b/base/common/src/com/netscape/cms/servlet/key/GetApprovalStatus.java
index 55d79b1ab..55d79b1ab 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/key/GetApprovalStatus.java
+++ b/base/common/src/com/netscape/cms/servlet/key/GetApprovalStatus.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/key/GetAsyncPk12.java b/base/common/src/com/netscape/cms/servlet/key/GetAsyncPk12.java
index 9d67cab8d..9d67cab8d 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/key/GetAsyncPk12.java
+++ b/base/common/src/com/netscape/cms/servlet/key/GetAsyncPk12.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/key/GetPk12.java b/base/common/src/com/netscape/cms/servlet/key/GetPk12.java
index 96fe7c85d..96fe7c85d 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/key/GetPk12.java
+++ b/base/common/src/com/netscape/cms/servlet/key/GetPk12.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/key/GrantAsyncRecovery.java b/base/common/src/com/netscape/cms/servlet/key/GrantAsyncRecovery.java
index 7c0c0cb1c..7c0c0cb1c 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/key/GrantAsyncRecovery.java
+++ b/base/common/src/com/netscape/cms/servlet/key/GrantAsyncRecovery.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/key/GrantRecovery.java b/base/common/src/com/netscape/cms/servlet/key/GrantRecovery.java
index 02aacc31c..02aacc31c 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/key/GrantRecovery.java
+++ b/base/common/src/com/netscape/cms/servlet/key/GrantRecovery.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/key/KeyRecordParser.java b/base/common/src/com/netscape/cms/servlet/key/KeyRecordParser.java
index aeee624c0..aeee624c0 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/key/KeyRecordParser.java
+++ b/base/common/src/com/netscape/cms/servlet/key/KeyRecordParser.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/key/KeyResource.java b/base/common/src/com/netscape/cms/servlet/key/KeyResource.java
index a47c46d86..a47c46d86 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/key/KeyResource.java
+++ b/base/common/src/com/netscape/cms/servlet/key/KeyResource.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/key/KeyResourceService.java b/base/common/src/com/netscape/cms/servlet/key/KeyResourceService.java
index 79e6ccfdb..79e6ccfdb 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/key/KeyResourceService.java
+++ b/base/common/src/com/netscape/cms/servlet/key/KeyResourceService.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/key/KeysResource.java b/base/common/src/com/netscape/cms/servlet/key/KeysResource.java
index c93ffa4c9..c93ffa4c9 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/key/KeysResource.java
+++ b/base/common/src/com/netscape/cms/servlet/key/KeysResource.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/key/KeysResourceService.java b/base/common/src/com/netscape/cms/servlet/key/KeysResourceService.java
index a7876a6c6..a7876a6c6 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/key/KeysResourceService.java
+++ b/base/common/src/com/netscape/cms/servlet/key/KeysResourceService.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/key/RecoverBySerial.java b/base/common/src/com/netscape/cms/servlet/key/RecoverBySerial.java
index 28ff30803..28ff30803 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/key/RecoverBySerial.java
+++ b/base/common/src/com/netscape/cms/servlet/key/RecoverBySerial.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/key/SrchKey.java b/base/common/src/com/netscape/cms/servlet/key/SrchKey.java
index bff14e9f2..bff14e9f2 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/key/SrchKey.java
+++ b/base/common/src/com/netscape/cms/servlet/key/SrchKey.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/key/SrchKeyForRecovery.java b/base/common/src/com/netscape/cms/servlet/key/SrchKeyForRecovery.java
index 95c777701..95c777701 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/key/SrchKeyForRecovery.java
+++ b/base/common/src/com/netscape/cms/servlet/key/SrchKeyForRecovery.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/key/model/KeyDAO.java b/base/common/src/com/netscape/cms/servlet/key/model/KeyDAO.java
index f479c6f0d..f479c6f0d 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/key/model/KeyDAO.java
+++ b/base/common/src/com/netscape/cms/servlet/key/model/KeyDAO.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/key/model/KeyData.java b/base/common/src/com/netscape/cms/servlet/key/model/KeyData.java
index 4f303e27d..4f303e27d 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/key/model/KeyData.java
+++ b/base/common/src/com/netscape/cms/servlet/key/model/KeyData.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/key/model/KeyDataInfo.java b/base/common/src/com/netscape/cms/servlet/key/model/KeyDataInfo.java
index 88b31b4d1..88b31b4d1 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/key/model/KeyDataInfo.java
+++ b/base/common/src/com/netscape/cms/servlet/key/model/KeyDataInfo.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/key/model/KeyDataInfos.java b/base/common/src/com/netscape/cms/servlet/key/model/KeyDataInfos.java
index b01184708..b01184708 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/key/model/KeyDataInfos.java
+++ b/base/common/src/com/netscape/cms/servlet/key/model/KeyDataInfos.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/ocsp/AddCAServlet.java b/base/common/src/com/netscape/cms/servlet/ocsp/AddCAServlet.java
index 1ef680853..1ef680853 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/ocsp/AddCAServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/ocsp/AddCAServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/ocsp/AddCRLServlet.java b/base/common/src/com/netscape/cms/servlet/ocsp/AddCRLServlet.java
index 2dec0e1f5..2dec0e1f5 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/ocsp/AddCRLServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/ocsp/AddCRLServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/ocsp/CheckCertServlet.java b/base/common/src/com/netscape/cms/servlet/ocsp/CheckCertServlet.java
index dfe796366..dfe796366 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/ocsp/CheckCertServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/ocsp/CheckCertServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/ocsp/GetOCSPInfo.java b/base/common/src/com/netscape/cms/servlet/ocsp/GetOCSPInfo.java
index 3dfc1d5f3..3dfc1d5f3 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/ocsp/GetOCSPInfo.java
+++ b/base/common/src/com/netscape/cms/servlet/ocsp/GetOCSPInfo.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/ocsp/ListCAServlet.java b/base/common/src/com/netscape/cms/servlet/ocsp/ListCAServlet.java
index a93512ccd..a93512ccd 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/ocsp/ListCAServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/ocsp/ListCAServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/ocsp/OCSPServlet.java b/base/common/src/com/netscape/cms/servlet/ocsp/OCSPServlet.java
index 3ab20141c..3ab20141c 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/ocsp/OCSPServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/ocsp/OCSPServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/ocsp/RemoveCAServlet.java b/base/common/src/com/netscape/cms/servlet/ocsp/RemoveCAServlet.java
index 4262940d0..4262940d0 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/ocsp/RemoveCAServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/ocsp/RemoveCAServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/processors/CMCProcessor.java b/base/common/src/com/netscape/cms/servlet/processors/CMCProcessor.java
index 53c13510d..53c13510d 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/processors/CMCProcessor.java
+++ b/base/common/src/com/netscape/cms/servlet/processors/CMCProcessor.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/processors/CRMFProcessor.java b/base/common/src/com/netscape/cms/servlet/processors/CRMFProcessor.java
index 2d2f1430e..2d2f1430e 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/processors/CRMFProcessor.java
+++ b/base/common/src/com/netscape/cms/servlet/processors/CRMFProcessor.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/processors/IPKIProcessor.java b/base/common/src/com/netscape/cms/servlet/processors/IPKIProcessor.java
index 9139f888c..9139f888c 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/processors/IPKIProcessor.java
+++ b/base/common/src/com/netscape/cms/servlet/processors/IPKIProcessor.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/processors/KeyGenProcessor.java b/base/common/src/com/netscape/cms/servlet/processors/KeyGenProcessor.java
index cfe9754a8..cfe9754a8 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/processors/KeyGenProcessor.java
+++ b/base/common/src/com/netscape/cms/servlet/processors/KeyGenProcessor.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/processors/PKCS10Processor.java b/base/common/src/com/netscape/cms/servlet/processors/PKCS10Processor.java
index dad4b64ab..dad4b64ab 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/processors/PKCS10Processor.java
+++ b/base/common/src/com/netscape/cms/servlet/processors/PKCS10Processor.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/processors/PKIProcessor.java b/base/common/src/com/netscape/cms/servlet/processors/PKIProcessor.java
index 5b78bb42a..5b78bb42a 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/processors/PKIProcessor.java
+++ b/base/common/src/com/netscape/cms/servlet/processors/PKIProcessor.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/profile/ProfileApproveServlet.java b/base/common/src/com/netscape/cms/servlet/profile/ProfileApproveServlet.java
index 48848695f..48848695f 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/profile/ProfileApproveServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/profile/ProfileApproveServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/profile/ProfileListServlet.java b/base/common/src/com/netscape/cms/servlet/profile/ProfileListServlet.java
index 2ca5f0a5c..2ca5f0a5c 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/profile/ProfileListServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/profile/ProfileListServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/profile/ProfileProcessServlet.java b/base/common/src/com/netscape/cms/servlet/profile/ProfileProcessServlet.java
index e482b67da..e482b67da 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/profile/ProfileProcessServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/profile/ProfileProcessServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/profile/ProfileReviewServlet.java b/base/common/src/com/netscape/cms/servlet/profile/ProfileReviewServlet.java
index dd0ee7be7..dd0ee7be7 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/profile/ProfileReviewServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/profile/ProfileReviewServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/profile/ProfileSelectServlet.java b/base/common/src/com/netscape/cms/servlet/profile/ProfileSelectServlet.java
index 5b07951f8..5b07951f8 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/profile/ProfileSelectServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/profile/ProfileSelectServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/profile/ProfileServlet.java b/base/common/src/com/netscape/cms/servlet/profile/ProfileServlet.java
index 457b8422b..457b8422b 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/profile/ProfileServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/profile/ProfileServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/profile/ProfileSubmitCMCServlet.java b/base/common/src/com/netscape/cms/servlet/profile/ProfileSubmitCMCServlet.java
index 16451f6dd..16451f6dd 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/profile/ProfileSubmitCMCServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/profile/ProfileSubmitCMCServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/profile/ProfileSubmitServlet.java b/base/common/src/com/netscape/cms/servlet/profile/ProfileSubmitServlet.java
index eb3b93eb8..eb3b93eb8 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/profile/ProfileSubmitServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/profile/ProfileSubmitServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/profile/SSLClientCertProvider.java b/base/common/src/com/netscape/cms/servlet/profile/SSLClientCertProvider.java
index 0114f6323..0114f6323 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/profile/SSLClientCertProvider.java
+++ b/base/common/src/com/netscape/cms/servlet/profile/SSLClientCertProvider.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/request/CertReqParser.java b/base/common/src/com/netscape/cms/servlet/request/CertReqParser.java
index d8fc68a69..d8fc68a69 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/request/CertReqParser.java
+++ b/base/common/src/com/netscape/cms/servlet/request/CertReqParser.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/request/CheckRequest.java b/base/common/src/com/netscape/cms/servlet/request/CheckRequest.java
index b65c90fca..b65c90fca 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/request/CheckRequest.java
+++ b/base/common/src/com/netscape/cms/servlet/request/CheckRequest.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/request/IReqParser.java b/base/common/src/com/netscape/cms/servlet/request/IReqParser.java
index f90e97b70..f90e97b70 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/request/IReqParser.java
+++ b/base/common/src/com/netscape/cms/servlet/request/IReqParser.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/request/KeyReqParser.java b/base/common/src/com/netscape/cms/servlet/request/KeyReqParser.java
index b7ddc16d4..b7ddc16d4 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/request/KeyReqParser.java
+++ b/base/common/src/com/netscape/cms/servlet/request/KeyReqParser.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/request/KeyRequestResource.java b/base/common/src/com/netscape/cms/servlet/request/KeyRequestResource.java
index cd08f46bb..cd08f46bb 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/request/KeyRequestResource.java
+++ b/base/common/src/com/netscape/cms/servlet/request/KeyRequestResource.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/request/KeyRequestResourceService.java b/base/common/src/com/netscape/cms/servlet/request/KeyRequestResourceService.java
index 43e58bbdc..43e58bbdc 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/request/KeyRequestResourceService.java
+++ b/base/common/src/com/netscape/cms/servlet/request/KeyRequestResourceService.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/request/KeyRequestsResource.java b/base/common/src/com/netscape/cms/servlet/request/KeyRequestsResource.java
index fd6bc4c27..fd6bc4c27 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/request/KeyRequestsResource.java
+++ b/base/common/src/com/netscape/cms/servlet/request/KeyRequestsResource.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/request/KeyRequestsResourceService.java b/base/common/src/com/netscape/cms/servlet/request/KeyRequestsResourceService.java
index 11898ef7a..11898ef7a 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/request/KeyRequestsResourceService.java
+++ b/base/common/src/com/netscape/cms/servlet/request/KeyRequestsResourceService.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/request/ProcessCertReq.java b/base/common/src/com/netscape/cms/servlet/request/ProcessCertReq.java
index 820e9a654..820e9a654 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/request/ProcessCertReq.java
+++ b/base/common/src/com/netscape/cms/servlet/request/ProcessCertReq.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/request/ProcessReq.java b/base/common/src/com/netscape/cms/servlet/request/ProcessReq.java
index 9c173d832..9c173d832 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/request/ProcessReq.java
+++ b/base/common/src/com/netscape/cms/servlet/request/ProcessReq.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/request/QueryReq.java b/base/common/src/com/netscape/cms/servlet/request/QueryReq.java
index f6ae634f4..f6ae634f4 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/request/QueryReq.java
+++ b/base/common/src/com/netscape/cms/servlet/request/QueryReq.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/request/ReqParser.java b/base/common/src/com/netscape/cms/servlet/request/ReqParser.java
index 230ddb433..230ddb433 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/request/ReqParser.java
+++ b/base/common/src/com/netscape/cms/servlet/request/ReqParser.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/request/SearchReqs.java b/base/common/src/com/netscape/cms/servlet/request/SearchReqs.java
index 08d5805b6..08d5805b6 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/request/SearchReqs.java
+++ b/base/common/src/com/netscape/cms/servlet/request/SearchReqs.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/request/model/ArchivalRequestData.java b/base/common/src/com/netscape/cms/servlet/request/model/ArchivalRequestData.java
index 8a25c6684..8a25c6684 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/request/model/ArchivalRequestData.java
+++ b/base/common/src/com/netscape/cms/servlet/request/model/ArchivalRequestData.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/request/model/KeyRequestDAO.java b/base/common/src/com/netscape/cms/servlet/request/model/KeyRequestDAO.java
index d1f1a27bd..d1f1a27bd 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/request/model/KeyRequestDAO.java
+++ b/base/common/src/com/netscape/cms/servlet/request/model/KeyRequestDAO.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/request/model/KeyRequestInfo.java b/base/common/src/com/netscape/cms/servlet/request/model/KeyRequestInfo.java
index f07c302dd..f07c302dd 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/request/model/KeyRequestInfo.java
+++ b/base/common/src/com/netscape/cms/servlet/request/model/KeyRequestInfo.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/request/model/KeyRequestInfos.java b/base/common/src/com/netscape/cms/servlet/request/model/KeyRequestInfos.java
index dc1b6a5e4..dc1b6a5e4 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/request/model/KeyRequestInfos.java
+++ b/base/common/src/com/netscape/cms/servlet/request/model/KeyRequestInfos.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/request/model/RecoveryRequestData.java b/base/common/src/com/netscape/cms/servlet/request/model/RecoveryRequestData.java
index 80ec6d127..80ec6d127 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/request/model/RecoveryRequestData.java
+++ b/base/common/src/com/netscape/cms/servlet/request/model/RecoveryRequestData.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/tks/TokenServlet.java b/base/common/src/com/netscape/cms/servlet/tks/TokenServlet.java
index c96a30a85..c96a30a85 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/tks/TokenServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/tks/TokenServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/wizard/IWizardPanel.java b/base/common/src/com/netscape/cms/servlet/wizard/IWizardPanel.java
index d9d3ddec7..d9d3ddec7 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/wizard/IWizardPanel.java
+++ b/base/common/src/com/netscape/cms/servlet/wizard/IWizardPanel.java
diff --git a/pki/base/common/src/com/netscape/cms/servlet/wizard/WizardServlet.java b/base/common/src/com/netscape/cms/servlet/wizard/WizardServlet.java
index 42fa88cd9..42fa88cd9 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/wizard/WizardServlet.java
+++ b/base/common/src/com/netscape/cms/servlet/wizard/WizardServlet.java
diff --git a/pki/base/common/src/com/netscape/cms/shares/OldJoinShares.java b/base/common/src/com/netscape/cms/shares/OldJoinShares.java
index f01e1e1c3..f01e1e1c3 100644
--- a/pki/base/common/src/com/netscape/cms/shares/OldJoinShares.java
+++ b/base/common/src/com/netscape/cms/shares/OldJoinShares.java
diff --git a/pki/base/common/src/com/netscape/cms/shares/OldShare.java b/base/common/src/com/netscape/cms/shares/OldShare.java
index 4020e759e..4020e759e 100644
--- a/pki/base/common/src/com/netscape/cms/shares/OldShare.java
+++ b/base/common/src/com/netscape/cms/shares/OldShare.java
diff --git a/pki/base/common/src/com/netscape/cmscore/apps/CMSEngine.java b/base/common/src/com/netscape/cmscore/apps/CMSEngine.java
index e1981132d..e1981132d 100644
--- a/pki/base/common/src/com/netscape/cmscore/apps/CMSEngine.java
+++ b/base/common/src/com/netscape/cmscore/apps/CMSEngine.java
diff --git a/pki/base/common/src/com/netscape/cmscore/apps/CommandQueue.java b/base/common/src/com/netscape/cmscore/apps/CommandQueue.java
index 6604fea5b..6604fea5b 100644
--- a/pki/base/common/src/com/netscape/cmscore/apps/CommandQueue.java
+++ b/base/common/src/com/netscape/cmscore/apps/CommandQueue.java
diff --git a/pki/base/common/src/com/netscape/cmscore/apps/PKIServerEvent.java b/base/common/src/com/netscape/cmscore/apps/PKIServerEvent.java
index e815a9940..e815a9940 100644
--- a/pki/base/common/src/com/netscape/cmscore/apps/PKIServerEvent.java
+++ b/base/common/src/com/netscape/cmscore/apps/PKIServerEvent.java
diff --git a/pki/base/common/src/com/netscape/cmscore/apps/PKIServerListener.java b/base/common/src/com/netscape/cmscore/apps/PKIServerListener.java
index bef70ce86..bef70ce86 100644
--- a/pki/base/common/src/com/netscape/cmscore/apps/PKIServerListener.java
+++ b/base/common/src/com/netscape/cmscore/apps/PKIServerListener.java
diff --git a/pki/base/common/src/com/netscape/cmscore/apps/Setup.java b/base/common/src/com/netscape/cmscore/apps/Setup.java
index 3486ec40e..3486ec40e 100644
--- a/pki/base/common/src/com/netscape/cmscore/apps/Setup.java
+++ b/base/common/src/com/netscape/cmscore/apps/Setup.java
diff --git a/pki/base/common/src/com/netscape/cmscore/apps/Upgrade.java b/base/common/src/com/netscape/cmscore/apps/Upgrade.java
index cd5b2991f..cd5b2991f 100644
--- a/pki/base/common/src/com/netscape/cmscore/apps/Upgrade.java
+++ b/base/common/src/com/netscape/cmscore/apps/Upgrade.java
diff --git a/pki/base/common/src/com/netscape/cmscore/authentication/AuthSubsystem.java b/base/common/src/com/netscape/cmscore/authentication/AuthSubsystem.java
index 64a09173f..64a09173f 100644
--- a/pki/base/common/src/com/netscape/cmscore/authentication/AuthSubsystem.java
+++ b/base/common/src/com/netscape/cmscore/authentication/AuthSubsystem.java
diff --git a/pki/base/common/src/com/netscape/cmscore/authentication/CertUserDBAuthentication.java b/base/common/src/com/netscape/cmscore/authentication/CertUserDBAuthentication.java
index 84807430f..84807430f 100644
--- a/pki/base/common/src/com/netscape/cmscore/authentication/CertUserDBAuthentication.java
+++ b/base/common/src/com/netscape/cmscore/authentication/CertUserDBAuthentication.java
diff --git a/pki/base/common/src/com/netscape/cmscore/authentication/ChallengePhraseAuthentication.java b/base/common/src/com/netscape/cmscore/authentication/ChallengePhraseAuthentication.java
index a7d5329c0..a7d5329c0 100644
--- a/pki/base/common/src/com/netscape/cmscore/authentication/ChallengePhraseAuthentication.java
+++ b/base/common/src/com/netscape/cmscore/authentication/ChallengePhraseAuthentication.java
diff --git a/pki/base/common/src/com/netscape/cmscore/authentication/NullAuthentication.java b/base/common/src/com/netscape/cmscore/authentication/NullAuthentication.java
index e124f1407..e124f1407 100644
--- a/pki/base/common/src/com/netscape/cmscore/authentication/NullAuthentication.java
+++ b/base/common/src/com/netscape/cmscore/authentication/NullAuthentication.java
diff --git a/pki/base/common/src/com/netscape/cmscore/authentication/PasswdUserDBAuthentication.java b/base/common/src/com/netscape/cmscore/authentication/PasswdUserDBAuthentication.java
index f20bd5f07..f20bd5f07 100644
--- a/pki/base/common/src/com/netscape/cmscore/authentication/PasswdUserDBAuthentication.java
+++ b/base/common/src/com/netscape/cmscore/authentication/PasswdUserDBAuthentication.java
diff --git a/pki/base/common/src/com/netscape/cmscore/authentication/SSLClientCertAuthentication.java b/base/common/src/com/netscape/cmscore/authentication/SSLClientCertAuthentication.java
index 3f0d7a87b..3f0d7a87b 100644
--- a/pki/base/common/src/com/netscape/cmscore/authentication/SSLClientCertAuthentication.java
+++ b/base/common/src/com/netscape/cmscore/authentication/SSLClientCertAuthentication.java
diff --git a/pki/base/common/src/com/netscape/cmscore/authentication/VerifiedCert.java b/base/common/src/com/netscape/cmscore/authentication/VerifiedCert.java
index 173d69f89..173d69f89 100644
--- a/pki/base/common/src/com/netscape/cmscore/authentication/VerifiedCert.java
+++ b/base/common/src/com/netscape/cmscore/authentication/VerifiedCert.java
diff --git a/pki/base/common/src/com/netscape/cmscore/authentication/VerifiedCerts.java b/base/common/src/com/netscape/cmscore/authentication/VerifiedCerts.java
index 52ce91fdf..52ce91fdf 100644
--- a/pki/base/common/src/com/netscape/cmscore/authentication/VerifiedCerts.java
+++ b/base/common/src/com/netscape/cmscore/authentication/VerifiedCerts.java
diff --git a/pki/base/common/src/com/netscape/cmscore/authorization/AuthzSubsystem.java b/base/common/src/com/netscape/cmscore/authorization/AuthzSubsystem.java
index 16bc40e29..16bc40e29 100644
--- a/pki/base/common/src/com/netscape/cmscore/authorization/AuthzSubsystem.java
+++ b/base/common/src/com/netscape/cmscore/authorization/AuthzSubsystem.java
diff --git a/pki/base/common/src/com/netscape/cmscore/base/ArgBlock.java b/base/common/src/com/netscape/cmscore/base/ArgBlock.java
index 62b5971a4..62b5971a4 100644
--- a/pki/base/common/src/com/netscape/cmscore/base/ArgBlock.java
+++ b/base/common/src/com/netscape/cmscore/base/ArgBlock.java
diff --git a/pki/base/common/src/com/netscape/cmscore/base/FileConfigStore.java b/base/common/src/com/netscape/cmscore/base/FileConfigStore.java
index f0c52866e..f0c52866e 100644
--- a/pki/base/common/src/com/netscape/cmscore/base/FileConfigStore.java
+++ b/base/common/src/com/netscape/cmscore/base/FileConfigStore.java
diff --git a/pki/base/common/src/com/netscape/cmscore/base/JDialogPasswordCallback.java b/base/common/src/com/netscape/cmscore/base/JDialogPasswordCallback.java
index 7a7709466..7a7709466 100644
--- a/pki/base/common/src/com/netscape/cmscore/base/JDialogPasswordCallback.java
+++ b/base/common/src/com/netscape/cmscore/base/JDialogPasswordCallback.java
diff --git a/pki/base/common/src/com/netscape/cmscore/base/PropConfigStore.java b/base/common/src/com/netscape/cmscore/base/PropConfigStore.java
index 1e46d3ef3..1e46d3ef3 100644
--- a/pki/base/common/src/com/netscape/cmscore/base/PropConfigStore.java
+++ b/base/common/src/com/netscape/cmscore/base/PropConfigStore.java
diff --git a/pki/base/common/src/com/netscape/cmscore/base/SimpleProperties.java b/base/common/src/com/netscape/cmscore/base/SimpleProperties.java
index 7b1c6bae4..7b1c6bae4 100644
--- a/pki/base/common/src/com/netscape/cmscore/base/SimpleProperties.java
+++ b/base/common/src/com/netscape/cmscore/base/SimpleProperties.java
diff --git a/pki/base/common/src/com/netscape/cmscore/base/SourceConfigStore.java b/base/common/src/com/netscape/cmscore/base/SourceConfigStore.java
index 3c4ec6992..3c4ec6992 100644
--- a/pki/base/common/src/com/netscape/cmscore/base/SourceConfigStore.java
+++ b/base/common/src/com/netscape/cmscore/base/SourceConfigStore.java
diff --git a/pki/base/common/src/com/netscape/cmscore/base/SubsystemLoader.java b/base/common/src/com/netscape/cmscore/base/SubsystemLoader.java
index a9307e858..a9307e858 100644
--- a/pki/base/common/src/com/netscape/cmscore/base/SubsystemLoader.java
+++ b/base/common/src/com/netscape/cmscore/base/SubsystemLoader.java
diff --git a/pki/base/common/src/com/netscape/cmscore/base/SubsystemRegistry.java b/base/common/src/com/netscape/cmscore/base/SubsystemRegistry.java
index adae60496..adae60496 100644
--- a/pki/base/common/src/com/netscape/cmscore/base/SubsystemRegistry.java
+++ b/base/common/src/com/netscape/cmscore/base/SubsystemRegistry.java
diff --git a/pki/base/common/src/com/netscape/cmscore/cert/CertDateCompare.java b/base/common/src/com/netscape/cmscore/cert/CertDateCompare.java
index 7078c3440..7078c3440 100644
--- a/pki/base/common/src/com/netscape/cmscore/cert/CertDateCompare.java
+++ b/base/common/src/com/netscape/cmscore/cert/CertDateCompare.java
diff --git a/pki/base/common/src/com/netscape/cmscore/cert/CertPrettyPrint.java b/base/common/src/com/netscape/cmscore/cert/CertPrettyPrint.java
index 726fa5e14..726fa5e14 100644
--- a/pki/base/common/src/com/netscape/cmscore/cert/CertPrettyPrint.java
+++ b/base/common/src/com/netscape/cmscore/cert/CertPrettyPrint.java
diff --git a/pki/base/common/src/com/netscape/cmscore/cert/CertUtils.java b/base/common/src/com/netscape/cmscore/cert/CertUtils.java
index 9710d63f5..9710d63f5 100644
--- a/pki/base/common/src/com/netscape/cmscore/cert/CertUtils.java
+++ b/base/common/src/com/netscape/cmscore/cert/CertUtils.java
diff --git a/pki/base/common/src/com/netscape/cmscore/cert/CertificatePair.java b/base/common/src/com/netscape/cmscore/cert/CertificatePair.java
index b8f958be5..b8f958be5 100644
--- a/pki/base/common/src/com/netscape/cmscore/cert/CertificatePair.java
+++ b/base/common/src/com/netscape/cmscore/cert/CertificatePair.java
diff --git a/pki/base/common/src/com/netscape/cmscore/cert/CrlCachePrettyPrint.java b/base/common/src/com/netscape/cmscore/cert/CrlCachePrettyPrint.java
index 6d838b70d..6d838b70d 100644
--- a/pki/base/common/src/com/netscape/cmscore/cert/CrlCachePrettyPrint.java
+++ b/base/common/src/com/netscape/cmscore/cert/CrlCachePrettyPrint.java
diff --git a/pki/base/common/src/com/netscape/cmscore/cert/CrlPrettyPrint.java b/base/common/src/com/netscape/cmscore/cert/CrlPrettyPrint.java
index 1d6048c8d..1d6048c8d 100644
--- a/pki/base/common/src/com/netscape/cmscore/cert/CrlPrettyPrint.java
+++ b/base/common/src/com/netscape/cmscore/cert/CrlPrettyPrint.java
diff --git a/pki/base/common/src/com/netscape/cmscore/cert/CrossCertPairSubsystem.java b/base/common/src/com/netscape/cmscore/cert/CrossCertPairSubsystem.java
index 8d8a337c5..8d8a337c5 100644
--- a/pki/base/common/src/com/netscape/cmscore/cert/CrossCertPairSubsystem.java
+++ b/base/common/src/com/netscape/cmscore/cert/CrossCertPairSubsystem.java
diff --git a/pki/base/common/src/com/netscape/cmscore/cert/ExtPrettyPrint.java b/base/common/src/com/netscape/cmscore/cert/ExtPrettyPrint.java
index 5f5c66a48..5f5c66a48 100644
--- a/pki/base/common/src/com/netscape/cmscore/cert/ExtPrettyPrint.java
+++ b/base/common/src/com/netscape/cmscore/cert/ExtPrettyPrint.java
diff --git a/pki/base/common/src/com/netscape/cmscore/cert/OidLoaderSubsystem.java b/base/common/src/com/netscape/cmscore/cert/OidLoaderSubsystem.java
index dfd7dbab8..dfd7dbab8 100644
--- a/pki/base/common/src/com/netscape/cmscore/cert/OidLoaderSubsystem.java
+++ b/base/common/src/com/netscape/cmscore/cert/OidLoaderSubsystem.java
diff --git a/pki/base/common/src/com/netscape/cmscore/cert/PrettyPrintFormat.java b/base/common/src/com/netscape/cmscore/cert/PrettyPrintFormat.java
index 669200575..669200575 100644
--- a/pki/base/common/src/com/netscape/cmscore/cert/PrettyPrintFormat.java
+++ b/base/common/src/com/netscape/cmscore/cert/PrettyPrintFormat.java
diff --git a/pki/base/common/src/com/netscape/cmscore/cert/PrettyPrintResources.java b/base/common/src/com/netscape/cmscore/cert/PrettyPrintResources.java
index 361f50b47..361f50b47 100644
--- a/pki/base/common/src/com/netscape/cmscore/cert/PrettyPrintResources.java
+++ b/base/common/src/com/netscape/cmscore/cert/PrettyPrintResources.java
diff --git a/pki/base/common/src/com/netscape/cmscore/cert/PubKeyPrettyPrint.java b/base/common/src/com/netscape/cmscore/cert/PubKeyPrettyPrint.java
index 9ea581812..9ea581812 100644
--- a/pki/base/common/src/com/netscape/cmscore/cert/PubKeyPrettyPrint.java
+++ b/base/common/src/com/netscape/cmscore/cert/PubKeyPrettyPrint.java
diff --git a/pki/base/common/src/com/netscape/cmscore/cert/X500NameSubsystem.java b/base/common/src/com/netscape/cmscore/cert/X500NameSubsystem.java
index de5e233c9..de5e233c9 100644
--- a/pki/base/common/src/com/netscape/cmscore/cert/X500NameSubsystem.java
+++ b/base/common/src/com/netscape/cmscore/cert/X500NameSubsystem.java
diff --git a/pki/base/common/src/com/netscape/cmscore/connector/HttpConnFactory.java b/base/common/src/com/netscape/cmscore/connector/HttpConnFactory.java
index 01bb0f879..01bb0f879 100644
--- a/pki/base/common/src/com/netscape/cmscore/connector/HttpConnFactory.java
+++ b/base/common/src/com/netscape/cmscore/connector/HttpConnFactory.java
diff --git a/pki/base/common/src/com/netscape/cmscore/connector/HttpConnection.java b/base/common/src/com/netscape/cmscore/connector/HttpConnection.java
index 95cdbc779..95cdbc779 100644
--- a/pki/base/common/src/com/netscape/cmscore/connector/HttpConnection.java
+++ b/base/common/src/com/netscape/cmscore/connector/HttpConnection.java
diff --git a/pki/base/common/src/com/netscape/cmscore/connector/HttpConnector.java b/base/common/src/com/netscape/cmscore/connector/HttpConnector.java
index cdb315795..cdb315795 100644
--- a/pki/base/common/src/com/netscape/cmscore/connector/HttpConnector.java
+++ b/base/common/src/com/netscape/cmscore/connector/HttpConnector.java
diff --git a/pki/base/common/src/com/netscape/cmscore/connector/HttpPKIMessage.java b/base/common/src/com/netscape/cmscore/connector/HttpPKIMessage.java
index ea235391d..ea235391d 100644
--- a/pki/base/common/src/com/netscape/cmscore/connector/HttpPKIMessage.java
+++ b/base/common/src/com/netscape/cmscore/connector/HttpPKIMessage.java
diff --git a/pki/base/common/src/com/netscape/cmscore/connector/HttpRequestEncoder.java b/base/common/src/com/netscape/cmscore/connector/HttpRequestEncoder.java
index 76d39b3ed..76d39b3ed 100644
--- a/pki/base/common/src/com/netscape/cmscore/connector/HttpRequestEncoder.java
+++ b/base/common/src/com/netscape/cmscore/connector/HttpRequestEncoder.java
diff --git a/pki/base/common/src/com/netscape/cmscore/connector/LocalConnector.java b/base/common/src/com/netscape/cmscore/connector/LocalConnector.java
index 42c6636ce..42c6636ce 100644
--- a/pki/base/common/src/com/netscape/cmscore/connector/LocalConnector.java
+++ b/base/common/src/com/netscape/cmscore/connector/LocalConnector.java
diff --git a/pki/base/common/src/com/netscape/cmscore/connector/RemoteAuthority.java b/base/common/src/com/netscape/cmscore/connector/RemoteAuthority.java
index 71d01579f..71d01579f 100644
--- a/pki/base/common/src/com/netscape/cmscore/connector/RemoteAuthority.java
+++ b/base/common/src/com/netscape/cmscore/connector/RemoteAuthority.java
diff --git a/pki/base/common/src/com/netscape/cmscore/connector/RequestTransfer.java b/base/common/src/com/netscape/cmscore/connector/RequestTransfer.java
index 33a2d7d71..33a2d7d71 100644
--- a/pki/base/common/src/com/netscape/cmscore/connector/RequestTransfer.java
+++ b/base/common/src/com/netscape/cmscore/connector/RequestTransfer.java
diff --git a/pki/base/common/src/com/netscape/cmscore/connector/Resender.java b/base/common/src/com/netscape/cmscore/connector/Resender.java
index 783caa671..783caa671 100644
--- a/pki/base/common/src/com/netscape/cmscore/connector/Resender.java
+++ b/base/common/src/com/netscape/cmscore/connector/Resender.java
diff --git a/pki/base/common/src/com/netscape/cmscore/crmf/CRMFParser.java b/base/common/src/com/netscape/cmscore/crmf/CRMFParser.java
index b42bc00f9..b42bc00f9 100644
--- a/pki/base/common/src/com/netscape/cmscore/crmf/CRMFParser.java
+++ b/base/common/src/com/netscape/cmscore/crmf/CRMFParser.java
diff --git a/pki/base/common/src/com/netscape/cmscore/crmf/PKIArchiveOptionsContainer.java b/base/common/src/com/netscape/cmscore/crmf/PKIArchiveOptionsContainer.java
index 4c5478daf..4c5478daf 100644
--- a/pki/base/common/src/com/netscape/cmscore/crmf/PKIArchiveOptionsContainer.java
+++ b/base/common/src/com/netscape/cmscore/crmf/PKIArchiveOptionsContainer.java
diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/BigIntegerMapper.java b/base/common/src/com/netscape/cmscore/dbs/BigIntegerMapper.java
index 3fa613198..3fa613198 100644
--- a/pki/base/common/src/com/netscape/cmscore/dbs/BigIntegerMapper.java
+++ b/base/common/src/com/netscape/cmscore/dbs/BigIntegerMapper.java
diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/ByteArrayMapper.java b/base/common/src/com/netscape/cmscore/dbs/ByteArrayMapper.java
index 38362f341..38362f341 100644
--- a/pki/base/common/src/com/netscape/cmscore/dbs/ByteArrayMapper.java
+++ b/base/common/src/com/netscape/cmscore/dbs/ByteArrayMapper.java
diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/CRLDBSchema.java b/base/common/src/com/netscape/cmscore/dbs/CRLDBSchema.java
index 253bd81e0..253bd81e0 100644
--- a/pki/base/common/src/com/netscape/cmscore/dbs/CRLDBSchema.java
+++ b/base/common/src/com/netscape/cmscore/dbs/CRLDBSchema.java
diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/CRLIssuingPointRecord.java b/base/common/src/com/netscape/cmscore/dbs/CRLIssuingPointRecord.java
index 0a3a46f14..0a3a46f14 100644
--- a/pki/base/common/src/com/netscape/cmscore/dbs/CRLIssuingPointRecord.java
+++ b/base/common/src/com/netscape/cmscore/dbs/CRLIssuingPointRecord.java
diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/CRLRepository.java b/base/common/src/com/netscape/cmscore/dbs/CRLRepository.java
index 7eb470d55..7eb470d55 100644
--- a/pki/base/common/src/com/netscape/cmscore/dbs/CRLRepository.java
+++ b/base/common/src/com/netscape/cmscore/dbs/CRLRepository.java
diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/CertDBSchema.java b/base/common/src/com/netscape/cmscore/dbs/CertDBSchema.java
index 67b662713..67b662713 100644
--- a/pki/base/common/src/com/netscape/cmscore/dbs/CertDBSchema.java
+++ b/base/common/src/com/netscape/cmscore/dbs/CertDBSchema.java
diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/CertRecord.java b/base/common/src/com/netscape/cmscore/dbs/CertRecord.java
index 1981757cb..1981757cb 100644
--- a/pki/base/common/src/com/netscape/cmscore/dbs/CertRecord.java
+++ b/base/common/src/com/netscape/cmscore/dbs/CertRecord.java
diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/CertRecordList.java b/base/common/src/com/netscape/cmscore/dbs/CertRecordList.java
index 29792880d..29792880d 100644
--- a/pki/base/common/src/com/netscape/cmscore/dbs/CertRecordList.java
+++ b/base/common/src/com/netscape/cmscore/dbs/CertRecordList.java
diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/CertRecordMapper.java b/base/common/src/com/netscape/cmscore/dbs/CertRecordMapper.java
index f4074c213..f4074c213 100644
--- a/pki/base/common/src/com/netscape/cmscore/dbs/CertRecordMapper.java
+++ b/base/common/src/com/netscape/cmscore/dbs/CertRecordMapper.java
diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/CertificateRepository.java b/base/common/src/com/netscape/cmscore/dbs/CertificateRepository.java
index 0df563cad..0df563cad 100644
--- a/pki/base/common/src/com/netscape/cmscore/dbs/CertificateRepository.java
+++ b/base/common/src/com/netscape/cmscore/dbs/CertificateRepository.java
diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/DBRegistry.java b/base/common/src/com/netscape/cmscore/dbs/DBRegistry.java
index 20e40a8e3..20e40a8e3 100644
--- a/pki/base/common/src/com/netscape/cmscore/dbs/DBRegistry.java
+++ b/base/common/src/com/netscape/cmscore/dbs/DBRegistry.java
diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/DBSSession.java b/base/common/src/com/netscape/cmscore/dbs/DBSSession.java
index ddc9f1874..ddc9f1874 100644
--- a/pki/base/common/src/com/netscape/cmscore/dbs/DBSSession.java
+++ b/base/common/src/com/netscape/cmscore/dbs/DBSSession.java
diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/DBSUtil.java b/base/common/src/com/netscape/cmscore/dbs/DBSUtil.java
index 7c551b141..7c551b141 100644
--- a/pki/base/common/src/com/netscape/cmscore/dbs/DBSUtil.java
+++ b/base/common/src/com/netscape/cmscore/dbs/DBSUtil.java
diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/DBSearchResults.java b/base/common/src/com/netscape/cmscore/dbs/DBSearchResults.java
index 0621701b0..0621701b0 100644
--- a/pki/base/common/src/com/netscape/cmscore/dbs/DBSearchResults.java
+++ b/base/common/src/com/netscape/cmscore/dbs/DBSearchResults.java
diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/DBSubsystem.java b/base/common/src/com/netscape/cmscore/dbs/DBSubsystem.java
index 4bc5b6471..4bc5b6471 100644
--- a/pki/base/common/src/com/netscape/cmscore/dbs/DBSubsystem.java
+++ b/base/common/src/com/netscape/cmscore/dbs/DBSubsystem.java
diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/DBVirtualList.java b/base/common/src/com/netscape/cmscore/dbs/DBVirtualList.java
index 574ab41c0..574ab41c0 100644
--- a/pki/base/common/src/com/netscape/cmscore/dbs/DBVirtualList.java
+++ b/base/common/src/com/netscape/cmscore/dbs/DBVirtualList.java
diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/DateArrayMapper.java b/base/common/src/com/netscape/cmscore/dbs/DateArrayMapper.java
index 20562404b..20562404b 100644
--- a/pki/base/common/src/com/netscape/cmscore/dbs/DateArrayMapper.java
+++ b/base/common/src/com/netscape/cmscore/dbs/DateArrayMapper.java
diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/DateMapper.java b/base/common/src/com/netscape/cmscore/dbs/DateMapper.java
index a767758f6..a767758f6 100644
--- a/pki/base/common/src/com/netscape/cmscore/dbs/DateMapper.java
+++ b/base/common/src/com/netscape/cmscore/dbs/DateMapper.java
diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/IntegerMapper.java b/base/common/src/com/netscape/cmscore/dbs/IntegerMapper.java
index 8dc07e4d9..8dc07e4d9 100644
--- a/pki/base/common/src/com/netscape/cmscore/dbs/IntegerMapper.java
+++ b/base/common/src/com/netscape/cmscore/dbs/IntegerMapper.java
diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/KeyDBSchema.java b/base/common/src/com/netscape/cmscore/dbs/KeyDBSchema.java
index 50b3badc3..50b3badc3 100644
--- a/pki/base/common/src/com/netscape/cmscore/dbs/KeyDBSchema.java
+++ b/base/common/src/com/netscape/cmscore/dbs/KeyDBSchema.java
diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/KeyRecord.java b/base/common/src/com/netscape/cmscore/dbs/KeyRecord.java
index f7773e3fa..f7773e3fa 100644
--- a/pki/base/common/src/com/netscape/cmscore/dbs/KeyRecord.java
+++ b/base/common/src/com/netscape/cmscore/dbs/KeyRecord.java
diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/KeyRecordList.java b/base/common/src/com/netscape/cmscore/dbs/KeyRecordList.java
index 941b0552d..941b0552d 100644
--- a/pki/base/common/src/com/netscape/cmscore/dbs/KeyRecordList.java
+++ b/base/common/src/com/netscape/cmscore/dbs/KeyRecordList.java
diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/KeyRecordMapper.java b/base/common/src/com/netscape/cmscore/dbs/KeyRecordMapper.java
index 1a6103492..1a6103492 100644
--- a/pki/base/common/src/com/netscape/cmscore/dbs/KeyRecordMapper.java
+++ b/base/common/src/com/netscape/cmscore/dbs/KeyRecordMapper.java
diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/KeyRepository.java b/base/common/src/com/netscape/cmscore/dbs/KeyRepository.java
index 3b2186b23..3b2186b23 100644
--- a/pki/base/common/src/com/netscape/cmscore/dbs/KeyRepository.java
+++ b/base/common/src/com/netscape/cmscore/dbs/KeyRepository.java
diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/KeyStateMapper.java b/base/common/src/com/netscape/cmscore/dbs/KeyStateMapper.java
index 2622cdbc6..2622cdbc6 100644
--- a/pki/base/common/src/com/netscape/cmscore/dbs/KeyStateMapper.java
+++ b/base/common/src/com/netscape/cmscore/dbs/KeyStateMapper.java
diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/LdapFilterConverter.java b/base/common/src/com/netscape/cmscore/dbs/LdapFilterConverter.java
index ff867bf52..ff867bf52 100644
--- a/pki/base/common/src/com/netscape/cmscore/dbs/LdapFilterConverter.java
+++ b/base/common/src/com/netscape/cmscore/dbs/LdapFilterConverter.java
diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/LongMapper.java b/base/common/src/com/netscape/cmscore/dbs/LongMapper.java
index b4d6c75d6..b4d6c75d6 100644
--- a/pki/base/common/src/com/netscape/cmscore/dbs/LongMapper.java
+++ b/base/common/src/com/netscape/cmscore/dbs/LongMapper.java
diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/MetaInfoMapper.java b/base/common/src/com/netscape/cmscore/dbs/MetaInfoMapper.java
index 9b224508c..9b224508c 100644
--- a/pki/base/common/src/com/netscape/cmscore/dbs/MetaInfoMapper.java
+++ b/base/common/src/com/netscape/cmscore/dbs/MetaInfoMapper.java
diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/ObjectStreamMapper.java b/base/common/src/com/netscape/cmscore/dbs/ObjectStreamMapper.java
index f77a36ed4..f77a36ed4 100644
--- a/pki/base/common/src/com/netscape/cmscore/dbs/ObjectStreamMapper.java
+++ b/base/common/src/com/netscape/cmscore/dbs/ObjectStreamMapper.java
diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/PublicKeyMapper.java b/base/common/src/com/netscape/cmscore/dbs/PublicKeyMapper.java
index 8b66d02ca..8b66d02ca 100644
--- a/pki/base/common/src/com/netscape/cmscore/dbs/PublicKeyMapper.java
+++ b/base/common/src/com/netscape/cmscore/dbs/PublicKeyMapper.java
diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/ReplicaIDRepository.java b/base/common/src/com/netscape/cmscore/dbs/ReplicaIDRepository.java
index 46ab07385..46ab07385 100644
--- a/pki/base/common/src/com/netscape/cmscore/dbs/ReplicaIDRepository.java
+++ b/base/common/src/com/netscape/cmscore/dbs/ReplicaIDRepository.java
diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/Repository.java b/base/common/src/com/netscape/cmscore/dbs/Repository.java
index aadfb888a..aadfb888a 100644
--- a/pki/base/common/src/com/netscape/cmscore/dbs/Repository.java
+++ b/base/common/src/com/netscape/cmscore/dbs/Repository.java
diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/RepositoryRecord.java b/base/common/src/com/netscape/cmscore/dbs/RepositoryRecord.java
index 8f90723cd..8f90723cd 100644
--- a/pki/base/common/src/com/netscape/cmscore/dbs/RepositoryRecord.java
+++ b/base/common/src/com/netscape/cmscore/dbs/RepositoryRecord.java
diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/RepositorySchema.java b/base/common/src/com/netscape/cmscore/dbs/RepositorySchema.java
index 4a0cf4155..4a0cf4155 100644
--- a/pki/base/common/src/com/netscape/cmscore/dbs/RepositorySchema.java
+++ b/base/common/src/com/netscape/cmscore/dbs/RepositorySchema.java
diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/RevocationInfo.java b/base/common/src/com/netscape/cmscore/dbs/RevocationInfo.java
index 00ca0034b..00ca0034b 100644
--- a/pki/base/common/src/com/netscape/cmscore/dbs/RevocationInfo.java
+++ b/base/common/src/com/netscape/cmscore/dbs/RevocationInfo.java
diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/RevocationInfoMapper.java b/base/common/src/com/netscape/cmscore/dbs/RevocationInfoMapper.java
index 7cf39dcef..7cf39dcef 100644
--- a/pki/base/common/src/com/netscape/cmscore/dbs/RevocationInfoMapper.java
+++ b/base/common/src/com/netscape/cmscore/dbs/RevocationInfoMapper.java
diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/StringMapper.java b/base/common/src/com/netscape/cmscore/dbs/StringMapper.java
index 710a17875..710a17875 100644
--- a/pki/base/common/src/com/netscape/cmscore/dbs/StringMapper.java
+++ b/base/common/src/com/netscape/cmscore/dbs/StringMapper.java
diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/StringVectorMapper.java b/base/common/src/com/netscape/cmscore/dbs/StringVectorMapper.java
index 7a465231b..7a465231b 100644
--- a/pki/base/common/src/com/netscape/cmscore/dbs/StringVectorMapper.java
+++ b/base/common/src/com/netscape/cmscore/dbs/StringVectorMapper.java
diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/X500NameMapper.java b/base/common/src/com/netscape/cmscore/dbs/X500NameMapper.java
index 0bf3bf7da..0bf3bf7da 100644
--- a/pki/base/common/src/com/netscape/cmscore/dbs/X500NameMapper.java
+++ b/base/common/src/com/netscape/cmscore/dbs/X500NameMapper.java
diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/X509CertImplMapper.java b/base/common/src/com/netscape/cmscore/dbs/X509CertImplMapper.java
index 18f0c8e3d..18f0c8e3d 100644
--- a/pki/base/common/src/com/netscape/cmscore/dbs/X509CertImplMapper.java
+++ b/base/common/src/com/netscape/cmscore/dbs/X509CertImplMapper.java
diff --git a/pki/base/common/src/com/netscape/cmscore/extensions/CMSExtensionsMap.java b/base/common/src/com/netscape/cmscore/extensions/CMSExtensionsMap.java
index 213772882..213772882 100644
--- a/pki/base/common/src/com/netscape/cmscore/extensions/CMSExtensionsMap.java
+++ b/base/common/src/com/netscape/cmscore/extensions/CMSExtensionsMap.java
diff --git a/pki/base/common/src/com/netscape/cmscore/extensions/KeyUsage.java b/base/common/src/com/netscape/cmscore/extensions/KeyUsage.java
index dc4423357..dc4423357 100644
--- a/pki/base/common/src/com/netscape/cmscore/extensions/KeyUsage.java
+++ b/base/common/src/com/netscape/cmscore/extensions/KeyUsage.java
diff --git a/pki/base/common/src/com/netscape/cmscore/jobs/CronItem.java b/base/common/src/com/netscape/cmscore/jobs/CronItem.java
index 91574c6cc..91574c6cc 100644
--- a/pki/base/common/src/com/netscape/cmscore/jobs/CronItem.java
+++ b/base/common/src/com/netscape/cmscore/jobs/CronItem.java
diff --git a/pki/base/common/src/com/netscape/cmscore/jobs/CronRange.java b/base/common/src/com/netscape/cmscore/jobs/CronRange.java
index af5ae2a51..af5ae2a51 100644
--- a/pki/base/common/src/com/netscape/cmscore/jobs/CronRange.java
+++ b/base/common/src/com/netscape/cmscore/jobs/CronRange.java
diff --git a/pki/base/common/src/com/netscape/cmscore/jobs/JobCron.java b/base/common/src/com/netscape/cmscore/jobs/JobCron.java
index 164c1250e..164c1250e 100644
--- a/pki/base/common/src/com/netscape/cmscore/jobs/JobCron.java
+++ b/base/common/src/com/netscape/cmscore/jobs/JobCron.java
diff --git a/pki/base/common/src/com/netscape/cmscore/jobs/JobsScheduler.java b/base/common/src/com/netscape/cmscore/jobs/JobsScheduler.java
index b35f8c340..b35f8c340 100644
--- a/pki/base/common/src/com/netscape/cmscore/jobs/JobsScheduler.java
+++ b/base/common/src/com/netscape/cmscore/jobs/JobsScheduler.java
diff --git a/pki/base/common/src/com/netscape/cmscore/ldap/LdapAndExpression.java b/base/common/src/com/netscape/cmscore/ldap/LdapAndExpression.java
index 3d7e7f31d..3d7e7f31d 100644
--- a/pki/base/common/src/com/netscape/cmscore/ldap/LdapAndExpression.java
+++ b/base/common/src/com/netscape/cmscore/ldap/LdapAndExpression.java
diff --git a/pki/base/common/src/com/netscape/cmscore/ldap/LdapConnModule.java b/base/common/src/com/netscape/cmscore/ldap/LdapConnModule.java
index 7dd282140..7dd282140 100644
--- a/pki/base/common/src/com/netscape/cmscore/ldap/LdapConnModule.java
+++ b/base/common/src/com/netscape/cmscore/ldap/LdapConnModule.java
diff --git a/pki/base/common/src/com/netscape/cmscore/ldap/LdapOrExpression.java b/base/common/src/com/netscape/cmscore/ldap/LdapOrExpression.java
index 011e3e690..011e3e690 100644
--- a/pki/base/common/src/com/netscape/cmscore/ldap/LdapOrExpression.java
+++ b/base/common/src/com/netscape/cmscore/ldap/LdapOrExpression.java
diff --git a/pki/base/common/src/com/netscape/cmscore/ldap/LdapPredicateParser.java b/base/common/src/com/netscape/cmscore/ldap/LdapPredicateParser.java
index 469ba62a0..469ba62a0 100644
--- a/pki/base/common/src/com/netscape/cmscore/ldap/LdapPredicateParser.java
+++ b/base/common/src/com/netscape/cmscore/ldap/LdapPredicateParser.java
diff --git a/pki/base/common/src/com/netscape/cmscore/ldap/LdapPublishModule.java b/base/common/src/com/netscape/cmscore/ldap/LdapPublishModule.java
index bbe86e8a5..bbe86e8a5 100644
--- a/pki/base/common/src/com/netscape/cmscore/ldap/LdapPublishModule.java
+++ b/base/common/src/com/netscape/cmscore/ldap/LdapPublishModule.java
diff --git a/pki/base/common/src/com/netscape/cmscore/ldap/LdapRequestListener.java b/base/common/src/com/netscape/cmscore/ldap/LdapRequestListener.java
index cbeeed2df..cbeeed2df 100644
--- a/pki/base/common/src/com/netscape/cmscore/ldap/LdapRequestListener.java
+++ b/base/common/src/com/netscape/cmscore/ldap/LdapRequestListener.java
diff --git a/pki/base/common/src/com/netscape/cmscore/ldap/LdapRule.java b/base/common/src/com/netscape/cmscore/ldap/LdapRule.java
index 0f0c3a3b9..0f0c3a3b9 100644
--- a/pki/base/common/src/com/netscape/cmscore/ldap/LdapRule.java
+++ b/base/common/src/com/netscape/cmscore/ldap/LdapRule.java
diff --git a/pki/base/common/src/com/netscape/cmscore/ldap/LdapSimpleExpression.java b/base/common/src/com/netscape/cmscore/ldap/LdapSimpleExpression.java
index 0a1dde49f..0a1dde49f 100644
--- a/pki/base/common/src/com/netscape/cmscore/ldap/LdapSimpleExpression.java
+++ b/base/common/src/com/netscape/cmscore/ldap/LdapSimpleExpression.java
diff --git a/pki/base/common/src/com/netscape/cmscore/ldap/PublishObject.java b/base/common/src/com/netscape/cmscore/ldap/PublishObject.java
index 940330d6d..940330d6d 100644
--- a/pki/base/common/src/com/netscape/cmscore/ldap/PublishObject.java
+++ b/base/common/src/com/netscape/cmscore/ldap/PublishObject.java
diff --git a/pki/base/common/src/com/netscape/cmscore/ldap/PublisherProcessor.java b/base/common/src/com/netscape/cmscore/ldap/PublisherProcessor.java
index 453703443..453703443 100644
--- a/pki/base/common/src/com/netscape/cmscore/ldap/PublisherProcessor.java
+++ b/base/common/src/com/netscape/cmscore/ldap/PublisherProcessor.java
diff --git a/pki/base/common/src/com/netscape/cmscore/ldapconn/LdapAnonConnFactory.java b/base/common/src/com/netscape/cmscore/ldapconn/LdapAnonConnFactory.java
index dc4c86547..dc4c86547 100644
--- a/pki/base/common/src/com/netscape/cmscore/ldapconn/LdapAnonConnFactory.java
+++ b/base/common/src/com/netscape/cmscore/ldapconn/LdapAnonConnFactory.java
diff --git a/pki/base/common/src/com/netscape/cmscore/ldapconn/LdapAnonConnection.java b/base/common/src/com/netscape/cmscore/ldapconn/LdapAnonConnection.java
index 1dc9723a8..1dc9723a8 100644
--- a/pki/base/common/src/com/netscape/cmscore/ldapconn/LdapAnonConnection.java
+++ b/base/common/src/com/netscape/cmscore/ldapconn/LdapAnonConnection.java
diff --git a/pki/base/common/src/com/netscape/cmscore/ldapconn/LdapAuthInfo.java b/base/common/src/com/netscape/cmscore/ldapconn/LdapAuthInfo.java
index b1af367b9..b1af367b9 100644
--- a/pki/base/common/src/com/netscape/cmscore/ldapconn/LdapAuthInfo.java
+++ b/base/common/src/com/netscape/cmscore/ldapconn/LdapAuthInfo.java
diff --git a/pki/base/common/src/com/netscape/cmscore/ldapconn/LdapBoundConnFactory.java b/base/common/src/com/netscape/cmscore/ldapconn/LdapBoundConnFactory.java
index b4839f7d5..b4839f7d5 100644
--- a/pki/base/common/src/com/netscape/cmscore/ldapconn/LdapBoundConnFactory.java
+++ b/base/common/src/com/netscape/cmscore/ldapconn/LdapBoundConnFactory.java
diff --git a/pki/base/common/src/com/netscape/cmscore/ldapconn/LdapBoundConnection.java b/base/common/src/com/netscape/cmscore/ldapconn/LdapBoundConnection.java
index fc97ab48c..fc97ab48c 100644
--- a/pki/base/common/src/com/netscape/cmscore/ldapconn/LdapBoundConnection.java
+++ b/base/common/src/com/netscape/cmscore/ldapconn/LdapBoundConnection.java
diff --git a/pki/base/common/src/com/netscape/cmscore/ldapconn/LdapConnInfo.java b/base/common/src/com/netscape/cmscore/ldapconn/LdapConnInfo.java
index 4ef7d804c..4ef7d804c 100644
--- a/pki/base/common/src/com/netscape/cmscore/ldapconn/LdapConnInfo.java
+++ b/base/common/src/com/netscape/cmscore/ldapconn/LdapConnInfo.java
diff --git a/pki/base/common/src/com/netscape/cmscore/ldapconn/LdapJssSSLSocketFactory.java b/base/common/src/com/netscape/cmscore/ldapconn/LdapJssSSLSocketFactory.java
index 4df2fe357..4df2fe357 100644
--- a/pki/base/common/src/com/netscape/cmscore/ldapconn/LdapJssSSLSocketFactory.java
+++ b/base/common/src/com/netscape/cmscore/ldapconn/LdapJssSSLSocketFactory.java
diff --git a/pki/base/common/src/com/netscape/cmscore/listeners/ListenerPlugin.java b/base/common/src/com/netscape/cmscore/listeners/ListenerPlugin.java
index baedb98de..baedb98de 100644
--- a/pki/base/common/src/com/netscape/cmscore/listeners/ListenerPlugin.java
+++ b/base/common/src/com/netscape/cmscore/listeners/ListenerPlugin.java
diff --git a/pki/base/common/src/com/netscape/cmscore/logging/AuditEventFactory.java b/base/common/src/com/netscape/cmscore/logging/AuditEventFactory.java
index 438b3abb9..438b3abb9 100644
--- a/pki/base/common/src/com/netscape/cmscore/logging/AuditEventFactory.java
+++ b/base/common/src/com/netscape/cmscore/logging/AuditEventFactory.java
diff --git a/pki/base/common/src/com/netscape/cmscore/logging/AuditFormat.java b/base/common/src/com/netscape/cmscore/logging/AuditFormat.java
index a5ce83251..a5ce83251 100644
--- a/pki/base/common/src/com/netscape/cmscore/logging/AuditFormat.java
+++ b/base/common/src/com/netscape/cmscore/logging/AuditFormat.java
diff --git a/pki/base/common/src/com/netscape/cmscore/logging/LogQueue.java b/base/common/src/com/netscape/cmscore/logging/LogQueue.java
index 90ca05d81..90ca05d81 100644
--- a/pki/base/common/src/com/netscape/cmscore/logging/LogQueue.java
+++ b/base/common/src/com/netscape/cmscore/logging/LogQueue.java
diff --git a/pki/base/common/src/com/netscape/cmscore/logging/LogSubsystem.java b/base/common/src/com/netscape/cmscore/logging/LogSubsystem.java
index 1cfce4e65..1cfce4e65 100644
--- a/pki/base/common/src/com/netscape/cmscore/logging/LogSubsystem.java
+++ b/base/common/src/com/netscape/cmscore/logging/LogSubsystem.java
diff --git a/pki/base/common/src/com/netscape/cmscore/logging/Logger.java b/base/common/src/com/netscape/cmscore/logging/Logger.java
index 79895e263..79895e263 100644
--- a/pki/base/common/src/com/netscape/cmscore/logging/Logger.java
+++ b/base/common/src/com/netscape/cmscore/logging/Logger.java
diff --git a/pki/base/common/src/com/netscape/cmscore/logging/SignedAuditEventFactory.java b/base/common/src/com/netscape/cmscore/logging/SignedAuditEventFactory.java
index 48570cada..48570cada 100644
--- a/pki/base/common/src/com/netscape/cmscore/logging/SignedAuditEventFactory.java
+++ b/base/common/src/com/netscape/cmscore/logging/SignedAuditEventFactory.java
diff --git a/pki/base/common/src/com/netscape/cmscore/logging/SignedAuditLogger.java b/base/common/src/com/netscape/cmscore/logging/SignedAuditLogger.java
index acc2b866f..acc2b866f 100644
--- a/pki/base/common/src/com/netscape/cmscore/logging/SignedAuditLogger.java
+++ b/base/common/src/com/netscape/cmscore/logging/SignedAuditLogger.java
diff --git a/pki/base/common/src/com/netscape/cmscore/logging/SystemEventFactory.java b/base/common/src/com/netscape/cmscore/logging/SystemEventFactory.java
index dfe25f03f..dfe25f03f 100644
--- a/pki/base/common/src/com/netscape/cmscore/logging/SystemEventFactory.java
+++ b/base/common/src/com/netscape/cmscore/logging/SystemEventFactory.java
diff --git a/pki/base/common/src/com/netscape/cmscore/notification/EmailFormProcessor.java b/base/common/src/com/netscape/cmscore/notification/EmailFormProcessor.java
index a057484cf..a057484cf 100644
--- a/pki/base/common/src/com/netscape/cmscore/notification/EmailFormProcessor.java
+++ b/base/common/src/com/netscape/cmscore/notification/EmailFormProcessor.java
diff --git a/pki/base/common/src/com/netscape/cmscore/notification/EmailResolverKeys.java b/base/common/src/com/netscape/cmscore/notification/EmailResolverKeys.java
index cd63841eb..cd63841eb 100644
--- a/pki/base/common/src/com/netscape/cmscore/notification/EmailResolverKeys.java
+++ b/base/common/src/com/netscape/cmscore/notification/EmailResolverKeys.java
diff --git a/pki/base/common/src/com/netscape/cmscore/notification/EmailTemplate.java b/base/common/src/com/netscape/cmscore/notification/EmailTemplate.java
index bdc16a24e..bdc16a24e 100644
--- a/pki/base/common/src/com/netscape/cmscore/notification/EmailTemplate.java
+++ b/base/common/src/com/netscape/cmscore/notification/EmailTemplate.java
diff --git a/pki/base/common/src/com/netscape/cmscore/notification/ReqCertEmailResolver.java b/base/common/src/com/netscape/cmscore/notification/ReqCertEmailResolver.java
index 330621e7a..330621e7a 100644
--- a/pki/base/common/src/com/netscape/cmscore/notification/ReqCertEmailResolver.java
+++ b/base/common/src/com/netscape/cmscore/notification/ReqCertEmailResolver.java
diff --git a/pki/base/common/src/com/netscape/cmscore/notification/ReqCertSANameEmailResolver.java b/base/common/src/com/netscape/cmscore/notification/ReqCertSANameEmailResolver.java
index 68556dfc0..68556dfc0 100644
--- a/pki/base/common/src/com/netscape/cmscore/notification/ReqCertSANameEmailResolver.java
+++ b/base/common/src/com/netscape/cmscore/notification/ReqCertSANameEmailResolver.java
diff --git a/pki/base/common/src/com/netscape/cmscore/policy/AndExpression.java b/base/common/src/com/netscape/cmscore/policy/AndExpression.java
index 459660f1e..459660f1e 100644
--- a/pki/base/common/src/com/netscape/cmscore/policy/AndExpression.java
+++ b/base/common/src/com/netscape/cmscore/policy/AndExpression.java
diff --git a/pki/base/common/src/com/netscape/cmscore/policy/GeneralNameUtil.java b/base/common/src/com/netscape/cmscore/policy/GeneralNameUtil.java
index 7c7162d0c..7c7162d0c 100644
--- a/pki/base/common/src/com/netscape/cmscore/policy/GeneralNameUtil.java
+++ b/base/common/src/com/netscape/cmscore/policy/GeneralNameUtil.java
diff --git a/pki/base/common/src/com/netscape/cmscore/policy/GenericPolicyProcessor.java b/base/common/src/com/netscape/cmscore/policy/GenericPolicyProcessor.java
index 05f8e111a..05f8e111a 100644
--- a/pki/base/common/src/com/netscape/cmscore/policy/GenericPolicyProcessor.java
+++ b/base/common/src/com/netscape/cmscore/policy/GenericPolicyProcessor.java
diff --git a/pki/base/common/src/com/netscape/cmscore/policy/JavaScriptRequestProxy.java b/base/common/src/com/netscape/cmscore/policy/JavaScriptRequestProxy.java
index 1fbcf2738..1fbcf2738 100644
--- a/pki/base/common/src/com/netscape/cmscore/policy/JavaScriptRequestProxy.java
+++ b/base/common/src/com/netscape/cmscore/policy/JavaScriptRequestProxy.java
diff --git a/pki/base/common/src/com/netscape/cmscore/policy/OrExpression.java b/base/common/src/com/netscape/cmscore/policy/OrExpression.java
index 3b220c100..3b220c100 100644
--- a/pki/base/common/src/com/netscape/cmscore/policy/OrExpression.java
+++ b/base/common/src/com/netscape/cmscore/policy/OrExpression.java
diff --git a/pki/base/common/src/com/netscape/cmscore/policy/PolicyPredicateParser.java b/base/common/src/com/netscape/cmscore/policy/PolicyPredicateParser.java
index 568a38e6d..568a38e6d 100644
--- a/pki/base/common/src/com/netscape/cmscore/policy/PolicyPredicateParser.java
+++ b/base/common/src/com/netscape/cmscore/policy/PolicyPredicateParser.java
diff --git a/pki/base/common/src/com/netscape/cmscore/policy/PolicySet.java b/base/common/src/com/netscape/cmscore/policy/PolicySet.java
index 9e7ecdc64..9e7ecdc64 100644
--- a/pki/base/common/src/com/netscape/cmscore/policy/PolicySet.java
+++ b/base/common/src/com/netscape/cmscore/policy/PolicySet.java
diff --git a/pki/base/common/src/com/netscape/cmscore/policy/SimpleExpression.java b/base/common/src/com/netscape/cmscore/policy/SimpleExpression.java
index 892fd6451..892fd6451 100644
--- a/pki/base/common/src/com/netscape/cmscore/policy/SimpleExpression.java
+++ b/base/common/src/com/netscape/cmscore/policy/SimpleExpression.java
diff --git a/pki/base/common/src/com/netscape/cmscore/profile/ProfileSubsystem.java b/base/common/src/com/netscape/cmscore/profile/ProfileSubsystem.java
index 585af5600..585af5600 100644
--- a/pki/base/common/src/com/netscape/cmscore/profile/ProfileSubsystem.java
+++ b/base/common/src/com/netscape/cmscore/profile/ProfileSubsystem.java
diff --git a/pki/base/common/src/com/netscape/cmscore/realm/ACL.java b/base/common/src/com/netscape/cmscore/realm/ACL.java
index 4d7303f9d..4d7303f9d 100644
--- a/pki/base/common/src/com/netscape/cmscore/realm/ACL.java
+++ b/base/common/src/com/netscape/cmscore/realm/ACL.java
diff --git a/pki/base/common/src/com/netscape/cmscore/realm/ACLEntry.java b/base/common/src/com/netscape/cmscore/realm/ACLEntry.java
index 8e502b02c..8e502b02c 100644
--- a/pki/base/common/src/com/netscape/cmscore/realm/ACLEntry.java
+++ b/base/common/src/com/netscape/cmscore/realm/ACLEntry.java
diff --git a/pki/base/common/src/com/netscape/cmscore/realm/PKIJNDIRealm.java b/base/common/src/com/netscape/cmscore/realm/PKIJNDIRealm.java
index 720d9f52e..720d9f52e 100644
--- a/pki/base/common/src/com/netscape/cmscore/realm/PKIJNDIRealm.java
+++ b/base/common/src/com/netscape/cmscore/realm/PKIJNDIRealm.java
diff --git a/pki/base/common/src/com/netscape/cmscore/registry/PluginInfo.java b/base/common/src/com/netscape/cmscore/registry/PluginInfo.java
index 681861901..681861901 100644
--- a/pki/base/common/src/com/netscape/cmscore/registry/PluginInfo.java
+++ b/base/common/src/com/netscape/cmscore/registry/PluginInfo.java
diff --git a/pki/base/common/src/com/netscape/cmscore/registry/PluginRegistry.java b/base/common/src/com/netscape/cmscore/registry/PluginRegistry.java
index 42bb3e68e..42bb3e68e 100644
--- a/pki/base/common/src/com/netscape/cmscore/registry/PluginRegistry.java
+++ b/base/common/src/com/netscape/cmscore/registry/PluginRegistry.java
diff --git a/pki/base/common/src/com/netscape/cmscore/request/ARequestQueue.java b/base/common/src/com/netscape/cmscore/request/ARequestQueue.java
index 16db3985c..16db3985c 100644
--- a/pki/base/common/src/com/netscape/cmscore/request/ARequestQueue.java
+++ b/base/common/src/com/netscape/cmscore/request/ARequestQueue.java
diff --git a/pki/base/common/src/com/netscape/cmscore/request/ARequestRecord.java b/base/common/src/com/netscape/cmscore/request/ARequestRecord.java
index e23d4007c..e23d4007c 100644
--- a/pki/base/common/src/com/netscape/cmscore/request/ARequestRecord.java
+++ b/base/common/src/com/netscape/cmscore/request/ARequestRecord.java
diff --git a/pki/base/common/src/com/netscape/cmscore/request/CertRequestConstants.java b/base/common/src/com/netscape/cmscore/request/CertRequestConstants.java
index eab41fcd5..eab41fcd5 100644
--- a/pki/base/common/src/com/netscape/cmscore/request/CertRequestConstants.java
+++ b/base/common/src/com/netscape/cmscore/request/CertRequestConstants.java
diff --git a/pki/base/common/src/com/netscape/cmscore/request/ExtDataHashtable.java b/base/common/src/com/netscape/cmscore/request/ExtDataHashtable.java
index 86e6c0530..86e6c0530 100644
--- a/pki/base/common/src/com/netscape/cmscore/request/ExtDataHashtable.java
+++ b/base/common/src/com/netscape/cmscore/request/ExtDataHashtable.java
diff --git a/pki/base/common/src/com/netscape/cmscore/request/RequestAttr.java b/base/common/src/com/netscape/cmscore/request/RequestAttr.java
index 25734c91e..25734c91e 100644
--- a/pki/base/common/src/com/netscape/cmscore/request/RequestAttr.java
+++ b/base/common/src/com/netscape/cmscore/request/RequestAttr.java
diff --git a/pki/base/common/src/com/netscape/cmscore/request/RequestQueue.java b/base/common/src/com/netscape/cmscore/request/RequestQueue.java
index ef13d3c29..ef13d3c29 100644
--- a/pki/base/common/src/com/netscape/cmscore/request/RequestQueue.java
+++ b/base/common/src/com/netscape/cmscore/request/RequestQueue.java
diff --git a/pki/base/common/src/com/netscape/cmscore/request/RequestRecord.java b/base/common/src/com/netscape/cmscore/request/RequestRecord.java
index 1d066f0ad..1d066f0ad 100644
--- a/pki/base/common/src/com/netscape/cmscore/request/RequestRecord.java
+++ b/base/common/src/com/netscape/cmscore/request/RequestRecord.java
diff --git a/pki/base/common/src/com/netscape/cmscore/request/RequestRepository.java b/base/common/src/com/netscape/cmscore/request/RequestRepository.java
index 0a4a4ebf9..0a4a4ebf9 100644
--- a/pki/base/common/src/com/netscape/cmscore/request/RequestRepository.java
+++ b/base/common/src/com/netscape/cmscore/request/RequestRepository.java
diff --git a/pki/base/common/src/com/netscape/cmscore/request/RequestSubsystem.java b/base/common/src/com/netscape/cmscore/request/RequestSubsystem.java
index 862ddaa68..862ddaa68 100644
--- a/pki/base/common/src/com/netscape/cmscore/request/RequestSubsystem.java
+++ b/base/common/src/com/netscape/cmscore/request/RequestSubsystem.java
diff --git a/pki/base/common/src/com/netscape/cmscore/request/Schema.java b/base/common/src/com/netscape/cmscore/request/Schema.java
index 89a7b74b9..89a7b74b9 100644
--- a/pki/base/common/src/com/netscape/cmscore/request/Schema.java
+++ b/base/common/src/com/netscape/cmscore/request/Schema.java
diff --git a/pki/base/common/src/com/netscape/cmscore/security/CASigningCert.java b/base/common/src/com/netscape/cmscore/security/CASigningCert.java
index bba12561f..bba12561f 100644
--- a/pki/base/common/src/com/netscape/cmscore/security/CASigningCert.java
+++ b/base/common/src/com/netscape/cmscore/security/CASigningCert.java
diff --git a/pki/base/common/src/com/netscape/cmscore/security/CertificateInfo.java b/base/common/src/com/netscape/cmscore/security/CertificateInfo.java
index fc7fb9087..fc7fb9087 100644
--- a/pki/base/common/src/com/netscape/cmscore/security/CertificateInfo.java
+++ b/base/common/src/com/netscape/cmscore/security/CertificateInfo.java
diff --git a/pki/base/common/src/com/netscape/cmscore/security/JssSubsystem.java b/base/common/src/com/netscape/cmscore/security/JssSubsystem.java
index 42768060c..42768060c 100644
--- a/pki/base/common/src/com/netscape/cmscore/security/JssSubsystem.java
+++ b/base/common/src/com/netscape/cmscore/security/JssSubsystem.java
diff --git a/pki/base/common/src/com/netscape/cmscore/security/KRATransportCert.java b/base/common/src/com/netscape/cmscore/security/KRATransportCert.java
index 79988e7d6..79988e7d6 100644
--- a/pki/base/common/src/com/netscape/cmscore/security/KRATransportCert.java
+++ b/base/common/src/com/netscape/cmscore/security/KRATransportCert.java
diff --git a/pki/base/common/src/com/netscape/cmscore/security/KeyCertUtil.java b/base/common/src/com/netscape/cmscore/security/KeyCertUtil.java
index 2a9afb868..2a9afb868 100644
--- a/pki/base/common/src/com/netscape/cmscore/security/KeyCertUtil.java
+++ b/base/common/src/com/netscape/cmscore/security/KeyCertUtil.java
diff --git a/pki/base/common/src/com/netscape/cmscore/security/OCSPSigningCert.java b/base/common/src/com/netscape/cmscore/security/OCSPSigningCert.java
index 762db5e90..762db5e90 100644
--- a/pki/base/common/src/com/netscape/cmscore/security/OCSPSigningCert.java
+++ b/base/common/src/com/netscape/cmscore/security/OCSPSigningCert.java
diff --git a/pki/base/common/src/com/netscape/cmscore/security/PWCBsdr.java b/base/common/src/com/netscape/cmscore/security/PWCBsdr.java
index 32a0e90ed..32a0e90ed 100644
--- a/pki/base/common/src/com/netscape/cmscore/security/PWCBsdr.java
+++ b/base/common/src/com/netscape/cmscore/security/PWCBsdr.java
diff --git a/pki/base/common/src/com/netscape/cmscore/security/PWUtil.java b/base/common/src/com/netscape/cmscore/security/PWUtil.java
index 3938bf5d2..3938bf5d2 100644
--- a/pki/base/common/src/com/netscape/cmscore/security/PWUtil.java
+++ b/base/common/src/com/netscape/cmscore/security/PWUtil.java
diff --git a/pki/base/common/src/com/netscape/cmscore/security/PWsdrCache.java b/base/common/src/com/netscape/cmscore/security/PWsdrCache.java
index 6c834d0e0..6c834d0e0 100644
--- a/pki/base/common/src/com/netscape/cmscore/security/PWsdrCache.java
+++ b/base/common/src/com/netscape/cmscore/security/PWsdrCache.java
diff --git a/pki/base/common/src/com/netscape/cmscore/security/Provider.java b/base/common/src/com/netscape/cmscore/security/Provider.java
index 540fe2201..540fe2201 100644
--- a/pki/base/common/src/com/netscape/cmscore/security/Provider.java
+++ b/base/common/src/com/netscape/cmscore/security/Provider.java
diff --git a/pki/base/common/src/com/netscape/cmscore/security/RASigningCert.java b/base/common/src/com/netscape/cmscore/security/RASigningCert.java
index 581fc8866..581fc8866 100644
--- a/pki/base/common/src/com/netscape/cmscore/security/RASigningCert.java
+++ b/base/common/src/com/netscape/cmscore/security/RASigningCert.java
diff --git a/pki/base/common/src/com/netscape/cmscore/security/SSLCert.java b/base/common/src/com/netscape/cmscore/security/SSLCert.java
index b54f24dc7..b54f24dc7 100644
--- a/pki/base/common/src/com/netscape/cmscore/security/SSLCert.java
+++ b/base/common/src/com/netscape/cmscore/security/SSLCert.java
diff --git a/pki/base/common/src/com/netscape/cmscore/security/SSLSelfSignedCert.java b/base/common/src/com/netscape/cmscore/security/SSLSelfSignedCert.java
index 1d70e7a1d..1d70e7a1d 100644
--- a/pki/base/common/src/com/netscape/cmscore/security/SSLSelfSignedCert.java
+++ b/base/common/src/com/netscape/cmscore/security/SSLSelfSignedCert.java
diff --git a/pki/base/common/src/com/netscape/cmscore/security/SubsystemCert.java b/base/common/src/com/netscape/cmscore/security/SubsystemCert.java
index aede5e4d9..aede5e4d9 100644
--- a/pki/base/common/src/com/netscape/cmscore/security/SubsystemCert.java
+++ b/base/common/src/com/netscape/cmscore/security/SubsystemCert.java
diff --git a/pki/base/common/src/com/netscape/cmscore/selftests/SelfTestOrderedInstance.java b/base/common/src/com/netscape/cmscore/selftests/SelfTestOrderedInstance.java
index 2146b290d..2146b290d 100644
--- a/pki/base/common/src/com/netscape/cmscore/selftests/SelfTestOrderedInstance.java
+++ b/base/common/src/com/netscape/cmscore/selftests/SelfTestOrderedInstance.java
diff --git a/pki/base/common/src/com/netscape/cmscore/selftests/SelfTestSubsystem.java b/base/common/src/com/netscape/cmscore/selftests/SelfTestSubsystem.java
index 6fac3d9d7..6fac3d9d7 100644
--- a/pki/base/common/src/com/netscape/cmscore/selftests/SelfTestSubsystem.java
+++ b/base/common/src/com/netscape/cmscore/selftests/SelfTestSubsystem.java
diff --git a/pki/base/common/src/com/netscape/cmscore/time/SimpleTimeSource.java b/base/common/src/com/netscape/cmscore/time/SimpleTimeSource.java
index ab832b7cc..ab832b7cc 100644
--- a/pki/base/common/src/com/netscape/cmscore/time/SimpleTimeSource.java
+++ b/base/common/src/com/netscape/cmscore/time/SimpleTimeSource.java
diff --git a/pki/base/common/src/com/netscape/cmscore/usrgrp/CertDNCertUserLocator.java b/base/common/src/com/netscape/cmscore/usrgrp/CertDNCertUserLocator.java
index 8f4cd8841..8f4cd8841 100644
--- a/pki/base/common/src/com/netscape/cmscore/usrgrp/CertDNCertUserLocator.java
+++ b/base/common/src/com/netscape/cmscore/usrgrp/CertDNCertUserLocator.java
diff --git a/pki/base/common/src/com/netscape/cmscore/usrgrp/ExactMatchCertUserLocator.java b/base/common/src/com/netscape/cmscore/usrgrp/ExactMatchCertUserLocator.java
index 871a38435..871a38435 100644
--- a/pki/base/common/src/com/netscape/cmscore/usrgrp/ExactMatchCertUserLocator.java
+++ b/base/common/src/com/netscape/cmscore/usrgrp/ExactMatchCertUserLocator.java
diff --git a/pki/base/common/src/com/netscape/cmscore/usrgrp/Group.java b/base/common/src/com/netscape/cmscore/usrgrp/Group.java
index eee2afb43..eee2afb43 100644
--- a/pki/base/common/src/com/netscape/cmscore/usrgrp/Group.java
+++ b/base/common/src/com/netscape/cmscore/usrgrp/Group.java
diff --git a/pki/base/common/src/com/netscape/cmscore/usrgrp/UGSubsystem.java b/base/common/src/com/netscape/cmscore/usrgrp/UGSubsystem.java
index a4c4d6854..a4c4d6854 100644
--- a/pki/base/common/src/com/netscape/cmscore/usrgrp/UGSubsystem.java
+++ b/base/common/src/com/netscape/cmscore/usrgrp/UGSubsystem.java
diff --git a/pki/base/common/src/com/netscape/cmscore/usrgrp/User.java b/base/common/src/com/netscape/cmscore/usrgrp/User.java
index 89ea3e589..89ea3e589 100644
--- a/pki/base/common/src/com/netscape/cmscore/usrgrp/User.java
+++ b/base/common/src/com/netscape/cmscore/usrgrp/User.java
diff --git a/pki/base/common/src/com/netscape/cmscore/util/Assert.java b/base/common/src/com/netscape/cmscore/util/Assert.java
index 246599290..246599290 100644
--- a/pki/base/common/src/com/netscape/cmscore/util/Assert.java
+++ b/base/common/src/com/netscape/cmscore/util/Assert.java
diff --git a/pki/base/common/src/com/netscape/cmscore/util/AssertionException.java b/base/common/src/com/netscape/cmscore/util/AssertionException.java
index 46b3f32da..46b3f32da 100644
--- a/pki/base/common/src/com/netscape/cmscore/util/AssertionException.java
+++ b/base/common/src/com/netscape/cmscore/util/AssertionException.java
diff --git a/pki/base/common/src/com/netscape/cmscore/util/Debug.java b/base/common/src/com/netscape/cmscore/util/Debug.java
index 8c41d5bb5..8c41d5bb5 100644
--- a/pki/base/common/src/com/netscape/cmscore/util/Debug.java
+++ b/base/common/src/com/netscape/cmscore/util/Debug.java
diff --git a/pki/base/common/src/com/netscape/cmscore/util/ExceptionFormatter.java b/base/common/src/com/netscape/cmscore/util/ExceptionFormatter.java
index 88dd32a05..88dd32a05 100644
--- a/pki/base/common/src/com/netscape/cmscore/util/ExceptionFormatter.java
+++ b/base/common/src/com/netscape/cmscore/util/ExceptionFormatter.java
diff --git a/pki/base/common/src/com/netscape/cmscore/util/FileAsString.java b/base/common/src/com/netscape/cmscore/util/FileAsString.java
index 7853346f5..7853346f5 100644
--- a/pki/base/common/src/com/netscape/cmscore/util/FileAsString.java
+++ b/base/common/src/com/netscape/cmscore/util/FileAsString.java
diff --git a/pki/base/common/src/com/netscape/cmscore/util/FileDialogFilter.java b/base/common/src/com/netscape/cmscore/util/FileDialogFilter.java
index eb1d1097a..eb1d1097a 100644
--- a/pki/base/common/src/com/netscape/cmscore/util/FileDialogFilter.java
+++ b/base/common/src/com/netscape/cmscore/util/FileDialogFilter.java
diff --git a/pki/base/common/src/com/netscape/cmscore/util/PFXUtils.java b/base/common/src/com/netscape/cmscore/util/PFXUtils.java
index ed0e6d641..ed0e6d641 100644
--- a/pki/base/common/src/com/netscape/cmscore/util/PFXUtils.java
+++ b/base/common/src/com/netscape/cmscore/util/PFXUtils.java
diff --git a/pki/base/common/src/com/netscape/cmscore/util/ProfileSubsystem.java b/base/common/src/com/netscape/cmscore/util/ProfileSubsystem.java
index caf05c6df..caf05c6df 100644
--- a/pki/base/common/src/com/netscape/cmscore/util/ProfileSubsystem.java
+++ b/base/common/src/com/netscape/cmscore/util/ProfileSubsystem.java
diff --git a/pki/base/common/src/com/netscape/cmscore/util/StatsSubsystem.java b/base/common/src/com/netscape/cmscore/util/StatsSubsystem.java
index 222964261..222964261 100644
--- a/pki/base/common/src/com/netscape/cmscore/util/StatsSubsystem.java
+++ b/base/common/src/com/netscape/cmscore/util/StatsSubsystem.java
diff --git a/pki/base/common/src/com/netscape/cmscore/util/UtilMessage.java b/base/common/src/com/netscape/cmscore/util/UtilMessage.java
index 8002cfe1f..8002cfe1f 100644
--- a/pki/base/common/src/com/netscape/cmscore/util/UtilMessage.java
+++ b/base/common/src/com/netscape/cmscore/util/UtilMessage.java
diff --git a/pki/base/common/src/com/netscape/cmscore/util/UtilResources.java b/base/common/src/com/netscape/cmscore/util/UtilResources.java
index 6955dda50..6955dda50 100644
--- a/pki/base/common/src/com/netscape/cmscore/util/UtilResources.java
+++ b/base/common/src/com/netscape/cmscore/util/UtilResources.java
diff --git a/pki/base/common/test/CMakeLists.txt b/base/common/test/CMakeLists.txt
index 2f7b4fa4e..2f7b4fa4e 100644
--- a/pki/base/common/test/CMakeLists.txt
+++ b/base/common/test/CMakeLists.txt
diff --git a/pki/base/common/test/com/netscape/certsrv/app/CMSEngineDefaultStub.java b/base/common/test/com/netscape/certsrv/app/CMSEngineDefaultStub.java
index cddd1205a..cddd1205a 100644
--- a/pki/base/common/test/com/netscape/certsrv/app/CMSEngineDefaultStub.java
+++ b/base/common/test/com/netscape/certsrv/app/CMSEngineDefaultStub.java
diff --git a/pki/base/common/test/com/netscape/certsrv/authentication/AuthTokenTest.java b/base/common/test/com/netscape/certsrv/authentication/AuthTokenTest.java
index c60e93d99..c60e93d99 100644
--- a/pki/base/common/test/com/netscape/certsrv/authentication/AuthTokenTest.java
+++ b/base/common/test/com/netscape/certsrv/authentication/AuthTokenTest.java
diff --git a/pki/base/common/test/com/netscape/certsrv/logging/LoggerDefaultStub.java b/base/common/test/com/netscape/certsrv/logging/LoggerDefaultStub.java
index c136c7feb..c136c7feb 100644
--- a/pki/base/common/test/com/netscape/certsrv/logging/LoggerDefaultStub.java
+++ b/base/common/test/com/netscape/certsrv/logging/LoggerDefaultStub.java
diff --git a/pki/base/common/test/com/netscape/certsrv/request/AgentApprovalsTest.java b/base/common/test/com/netscape/certsrv/request/AgentApprovalsTest.java
index e7606951d..e7606951d 100644
--- a/pki/base/common/test/com/netscape/certsrv/request/AgentApprovalsTest.java
+++ b/base/common/test/com/netscape/certsrv/request/AgentApprovalsTest.java
diff --git a/pki/base/common/test/com/netscape/cmscore/dbs/CertRecordListTest.java b/base/common/test/com/netscape/cmscore/dbs/CertRecordListTest.java
index d3177f62c..d3177f62c 100644
--- a/pki/base/common/test/com/netscape/cmscore/dbs/CertRecordListTest.java
+++ b/base/common/test/com/netscape/cmscore/dbs/CertRecordListTest.java
diff --git a/pki/base/common/test/com/netscape/cmscore/dbs/DBRegistryDefaultStub.java b/base/common/test/com/netscape/cmscore/dbs/DBRegistryDefaultStub.java
index 9635129f4..9635129f4 100644
--- a/pki/base/common/test/com/netscape/cmscore/dbs/DBRegistryDefaultStub.java
+++ b/base/common/test/com/netscape/cmscore/dbs/DBRegistryDefaultStub.java
diff --git a/pki/base/common/test/com/netscape/cmscore/dbs/DBRegistryTest.java b/base/common/test/com/netscape/cmscore/dbs/DBRegistryTest.java
index c74f66ba1..c74f66ba1 100644
--- a/pki/base/common/test/com/netscape/cmscore/dbs/DBRegistryTest.java
+++ b/base/common/test/com/netscape/cmscore/dbs/DBRegistryTest.java
diff --git a/pki/base/common/test/com/netscape/cmscore/dbs/DBSSessionDefaultStub.java b/base/common/test/com/netscape/cmscore/dbs/DBSSessionDefaultStub.java
index 09a2e1498..09a2e1498 100644
--- a/pki/base/common/test/com/netscape/cmscore/dbs/DBSSessionDefaultStub.java
+++ b/base/common/test/com/netscape/cmscore/dbs/DBSSessionDefaultStub.java
diff --git a/pki/base/common/test/com/netscape/cmscore/dbs/DBSubsystemDefaultStub.java b/base/common/test/com/netscape/cmscore/dbs/DBSubsystemDefaultStub.java
index fe19159d5..fe19159d5 100644
--- a/pki/base/common/test/com/netscape/cmscore/dbs/DBSubsystemDefaultStub.java
+++ b/base/common/test/com/netscape/cmscore/dbs/DBSubsystemDefaultStub.java
diff --git a/pki/base/common/test/com/netscape/cmscore/dbs/DBVirtualListDefaultStub.java b/base/common/test/com/netscape/cmscore/dbs/DBVirtualListDefaultStub.java
index d674bd6a6..d674bd6a6 100644
--- a/pki/base/common/test/com/netscape/cmscore/dbs/DBVirtualListDefaultStub.java
+++ b/base/common/test/com/netscape/cmscore/dbs/DBVirtualListDefaultStub.java
diff --git a/pki/base/common/test/com/netscape/cmscore/dbs/RequestRecordDefaultStub.java b/base/common/test/com/netscape/cmscore/dbs/RequestRecordDefaultStub.java
index 1814c90d6..1814c90d6 100644
--- a/pki/base/common/test/com/netscape/cmscore/dbs/RequestRecordDefaultStub.java
+++ b/base/common/test/com/netscape/cmscore/dbs/RequestRecordDefaultStub.java
diff --git a/pki/base/common/test/com/netscape/cmscore/request/DBDynAttrMapperDefaultStub.java b/base/common/test/com/netscape/cmscore/request/DBDynAttrMapperDefaultStub.java
index cccbe600f..cccbe600f 100644
--- a/pki/base/common/test/com/netscape/cmscore/request/DBDynAttrMapperDefaultStub.java
+++ b/base/common/test/com/netscape/cmscore/request/DBDynAttrMapperDefaultStub.java
diff --git a/pki/base/common/test/com/netscape/cmscore/request/ExtAttrDynMapperTest.java b/base/common/test/com/netscape/cmscore/request/ExtAttrDynMapperTest.java
index a0ad0a8a3..a0ad0a8a3 100644
--- a/pki/base/common/test/com/netscape/cmscore/request/ExtAttrDynMapperTest.java
+++ b/base/common/test/com/netscape/cmscore/request/ExtAttrDynMapperTest.java
diff --git a/pki/base/common/test/com/netscape/cmscore/request/ExtDataHashtableTest.java b/base/common/test/com/netscape/cmscore/request/ExtDataHashtableTest.java
index c349b73d0..c349b73d0 100644
--- a/pki/base/common/test/com/netscape/cmscore/request/ExtDataHashtableTest.java
+++ b/base/common/test/com/netscape/cmscore/request/ExtDataHashtableTest.java
diff --git a/pki/base/common/test/com/netscape/cmscore/request/RequestDefaultStub.java b/base/common/test/com/netscape/cmscore/request/RequestDefaultStub.java
index fd53c2ea9..fd53c2ea9 100644
--- a/pki/base/common/test/com/netscape/cmscore/request/RequestDefaultStub.java
+++ b/base/common/test/com/netscape/cmscore/request/RequestDefaultStub.java
diff --git a/pki/base/common/test/com/netscape/cmscore/request/RequestModDefaultStub.java b/base/common/test/com/netscape/cmscore/request/RequestModDefaultStub.java
index 730928bdb..730928bdb 100644
--- a/pki/base/common/test/com/netscape/cmscore/request/RequestModDefaultStub.java
+++ b/base/common/test/com/netscape/cmscore/request/RequestModDefaultStub.java
diff --git a/pki/base/common/test/com/netscape/cmscore/request/RequestQueueTest.java b/base/common/test/com/netscape/cmscore/request/RequestQueueTest.java
index a66326d03..a66326d03 100644
--- a/pki/base/common/test/com/netscape/cmscore/request/RequestQueueTest.java
+++ b/base/common/test/com/netscape/cmscore/request/RequestQueueTest.java
diff --git a/pki/base/common/test/com/netscape/cmscore/request/RequestRecordTest.java b/base/common/test/com/netscape/cmscore/request/RequestRecordTest.java
index 0ebf3beab..0ebf3beab 100644
--- a/pki/base/common/test/com/netscape/cmscore/request/RequestRecordTest.java
+++ b/base/common/test/com/netscape/cmscore/request/RequestRecordTest.java
diff --git a/pki/base/common/test/com/netscape/cmscore/request/RequestTest.java b/base/common/test/com/netscape/cmscore/request/RequestTest.java
index 5832f6af5..5832f6af5 100644
--- a/pki/base/common/test/com/netscape/cmscore/request/RequestTest.java
+++ b/base/common/test/com/netscape/cmscore/request/RequestTest.java
diff --git a/pki/base/common/test/com/netscape/cmscore/test/CMSBaseTestCase.java b/base/common/test/com/netscape/cmscore/test/CMSBaseTestCase.java
index d3971afd4..d3971afd4 100644
--- a/pki/base/common/test/com/netscape/cmscore/test/CMSBaseTestCase.java
+++ b/base/common/test/com/netscape/cmscore/test/CMSBaseTestCase.java
diff --git a/pki/base/common/test/com/netscape/cmscore/test/TestHelper.java b/base/common/test/com/netscape/cmscore/test/TestHelper.java
index 55d2ac7f7..55d2ac7f7 100644
--- a/pki/base/common/test/com/netscape/cmscore/test/TestHelper.java
+++ b/base/common/test/com/netscape/cmscore/test/TestHelper.java
diff --git a/pki/base/console/CMakeLists.txt b/base/console/CMakeLists.txt
index 24adfac49..24adfac49 100644
--- a/pki/base/console/CMakeLists.txt
+++ b/base/console/CMakeLists.txt
diff --git a/pki/base/console/LICENSE b/base/console/LICENSE
index e281f4362..e281f4362 100644
--- a/pki/base/console/LICENSE
+++ b/base/console/LICENSE
diff --git a/pki/base/console/src/CMakeLists.txt b/base/console/src/CMakeLists.txt
index 175a4a1a7..175a4a1a7 100644
--- a/pki/base/console/src/CMakeLists.txt
+++ b/base/console/src/CMakeLists.txt
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/AttrCellRenderer.java b/base/console/src/com/netscape/admin/certsrv/AttrCellRenderer.java
index 863e42197..863e42197 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/AttrCellRenderer.java
+++ b/base/console/src/com/netscape/admin/certsrv/AttrCellRenderer.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/CMSAdmin.java b/base/console/src/com/netscape/admin/certsrv/CMSAdmin.java
index 6e88cc276..6e88cc276 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/CMSAdmin.java
+++ b/base/console/src/com/netscape/admin/certsrv/CMSAdmin.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/CMSAdminResources.java b/base/console/src/com/netscape/admin/certsrv/CMSAdminResources.java
index af2ba4c91..af2ba4c91 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/CMSAdminResources.java
+++ b/base/console/src/com/netscape/admin/certsrv/CMSAdminResources.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/CMSAdminUtil.java b/base/console/src/com/netscape/admin/certsrv/CMSAdminUtil.java
index 107de427b..107de427b 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/CMSAdminUtil.java
+++ b/base/console/src/com/netscape/admin/certsrv/CMSAdminUtil.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/CMSBaseMenuInfo.java b/base/console/src/com/netscape/admin/certsrv/CMSBaseMenuInfo.java
index cb1909f22..cb1909f22 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/CMSBaseMenuInfo.java
+++ b/base/console/src/com/netscape/admin/certsrv/CMSBaseMenuInfo.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/CMSBasePanel.java b/base/console/src/com/netscape/admin/certsrv/CMSBasePanel.java
index 3430a74d9..3430a74d9 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/CMSBasePanel.java
+++ b/base/console/src/com/netscape/admin/certsrv/CMSBasePanel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/CMSBaseResourceModel.java b/base/console/src/com/netscape/admin/certsrv/CMSBaseResourceModel.java
index b7ec04e3a..b7ec04e3a 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/CMSBaseResourceModel.java
+++ b/base/console/src/com/netscape/admin/certsrv/CMSBaseResourceModel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/CMSCAUILoader.java b/base/console/src/com/netscape/admin/certsrv/CMSCAUILoader.java
index f967d28e0..f967d28e0 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/CMSCAUILoader.java
+++ b/base/console/src/com/netscape/admin/certsrv/CMSCAUILoader.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/CMSCCMUILoader.java b/base/console/src/com/netscape/admin/certsrv/CMSCCMUILoader.java
index 785514ac2..785514ac2 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/CMSCCMUILoader.java
+++ b/base/console/src/com/netscape/admin/certsrv/CMSCCMUILoader.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/CMSContentTableModel.java b/base/console/src/com/netscape/admin/certsrv/CMSContentTableModel.java
index 15bc29665..15bc29665 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/CMSContentTableModel.java
+++ b/base/console/src/com/netscape/admin/certsrv/CMSContentTableModel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/CMSEAUILoader.java b/base/console/src/com/netscape/admin/certsrv/CMSEAUILoader.java
index 9c3ae6e01..9c3ae6e01 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/CMSEAUILoader.java
+++ b/base/console/src/com/netscape/admin/certsrv/CMSEAUILoader.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/CMSKernelUILoader.java b/base/console/src/com/netscape/admin/certsrv/CMSKernelUILoader.java
index cb232c527..cb232c527 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/CMSKernelUILoader.java
+++ b/base/console/src/com/netscape/admin/certsrv/CMSKernelUILoader.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/CMSMessageBox.java b/base/console/src/com/netscape/admin/certsrv/CMSMessageBox.java
index 2eef61cb2..2eef61cb2 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/CMSMessageBox.java
+++ b/base/console/src/com/netscape/admin/certsrv/CMSMessageBox.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/CMSOCSPUILoader.java b/base/console/src/com/netscape/admin/certsrv/CMSOCSPUILoader.java
index 3c8d5dba0..3c8d5dba0 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/CMSOCSPUILoader.java
+++ b/base/console/src/com/netscape/admin/certsrv/CMSOCSPUILoader.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/CMSPageFeeder.java b/base/console/src/com/netscape/admin/certsrv/CMSPageFeeder.java
index 0abd28f29..0abd28f29 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/CMSPageFeeder.java
+++ b/base/console/src/com/netscape/admin/certsrv/CMSPageFeeder.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/CMSPassword.java b/base/console/src/com/netscape/admin/certsrv/CMSPassword.java
index 4fbca9011..4fbca9011 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/CMSPassword.java
+++ b/base/console/src/com/netscape/admin/certsrv/CMSPassword.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/CMSRAUILoader.java b/base/console/src/com/netscape/admin/certsrv/CMSRAUILoader.java
index b2103a34e..b2103a34e 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/CMSRAUILoader.java
+++ b/base/console/src/com/netscape/admin/certsrv/CMSRAUILoader.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/CMSRemoteClassLoader.java b/base/console/src/com/netscape/admin/certsrv/CMSRemoteClassLoader.java
index f389aedda..f389aedda 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/CMSRemoteClassLoader.java
+++ b/base/console/src/com/netscape/admin/certsrv/CMSRemoteClassLoader.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/CMSResourceObject.java b/base/console/src/com/netscape/admin/certsrv/CMSResourceObject.java
index f0f5d38b0..f0f5d38b0 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/CMSResourceObject.java
+++ b/base/console/src/com/netscape/admin/certsrv/CMSResourceObject.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/CMSResourcePage.java b/base/console/src/com/netscape/admin/certsrv/CMSResourcePage.java
index 9ad03515d..9ad03515d 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/CMSResourcePage.java
+++ b/base/console/src/com/netscape/admin/certsrv/CMSResourcePage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/CMSServerInfo.java b/base/console/src/com/netscape/admin/certsrv/CMSServerInfo.java
index d2d64b3fc..d2d64b3fc 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/CMSServerInfo.java
+++ b/base/console/src/com/netscape/admin/certsrv/CMSServerInfo.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/CMSTableModel.java b/base/console/src/com/netscape/admin/certsrv/CMSTableModel.java
index 0afd3d0a5..0afd3d0a5 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/CMSTableModel.java
+++ b/base/console/src/com/netscape/admin/certsrv/CMSTableModel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/CMSTaskModel.java b/base/console/src/com/netscape/admin/certsrv/CMSTaskModel.java
index c3451609d..c3451609d 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/CMSTaskModel.java
+++ b/base/console/src/com/netscape/admin/certsrv/CMSTaskModel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/CMSTaskObject.java b/base/console/src/com/netscape/admin/certsrv/CMSTaskObject.java
index 5999ab833..5999ab833 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/CMSTaskObject.java
+++ b/base/console/src/com/netscape/admin/certsrv/CMSTaskObject.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/CMSUIFramework.java b/base/console/src/com/netscape/admin/certsrv/CMSUIFramework.java
index 13028b003..13028b003 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/CMSUIFramework.java
+++ b/base/console/src/com/netscape/admin/certsrv/CMSUIFramework.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/CellEditorData.java b/base/console/src/com/netscape/admin/certsrv/CellEditorData.java
index 4aeb9219a..4aeb9219a 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/CellEditorData.java
+++ b/base/console/src/com/netscape/admin/certsrv/CellEditorData.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/Console.java b/base/console/src/com/netscape/admin/certsrv/Console.java
index c9684583a..c9684583a 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/Console.java
+++ b/base/console/src/com/netscape/admin/certsrv/Console.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/CustomComboBox.java b/base/console/src/com/netscape/admin/certsrv/CustomComboBox.java
index c76c36006..c76c36006 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/CustomComboBox.java
+++ b/base/console/src/com/netscape/admin/certsrv/CustomComboBox.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/CustomComboBoxModel.java b/base/console/src/com/netscape/admin/certsrv/CustomComboBoxModel.java
index c97beeb5b..c97beeb5b 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/CustomComboBoxModel.java
+++ b/base/console/src/com/netscape/admin/certsrv/CustomComboBoxModel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/DefaultTableCellEditor.java b/base/console/src/com/netscape/admin/certsrv/DefaultTableCellEditor.java
index 638494326..638494326 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/DefaultTableCellEditor.java
+++ b/base/console/src/com/netscape/admin/certsrv/DefaultTableCellEditor.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/EAdminException.java b/base/console/src/com/netscape/admin/certsrv/EAdminException.java
index acb5ab6ce..acb5ab6ce 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/EAdminException.java
+++ b/base/console/src/com/netscape/admin/certsrv/EAdminException.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/GenericCellEditor.java b/base/console/src/com/netscape/admin/certsrv/GenericCellEditor.java
index b26b9f9f9..b26b9f9f9 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/GenericCellEditor.java
+++ b/base/console/src/com/netscape/admin/certsrv/GenericCellEditor.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/GenericCellRenderer.java b/base/console/src/com/netscape/admin/certsrv/GenericCellRenderer.java
index 34d69e37e..34d69e37e 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/GenericCellRenderer.java
+++ b/base/console/src/com/netscape/admin/certsrv/GenericCellRenderer.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/HourGlass.java b/base/console/src/com/netscape/admin/certsrv/HourGlass.java
index a0c582761..a0c582761 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/HourGlass.java
+++ b/base/console/src/com/netscape/admin/certsrv/HourGlass.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/IAttributeContent.java b/base/console/src/com/netscape/admin/certsrv/IAttributeContent.java
index f467b38a1..f467b38a1 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/IAttributeContent.java
+++ b/base/console/src/com/netscape/admin/certsrv/IAttributeContent.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/IConnectionListener.java b/base/console/src/com/netscape/admin/certsrv/IConnectionListener.java
index c6275b403..c6275b403 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/IConnectionListener.java
+++ b/base/console/src/com/netscape/admin/certsrv/IConnectionListener.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/IDataProcessor.java b/base/console/src/com/netscape/admin/certsrv/IDataProcessor.java
index 1aa4b9049..1aa4b9049 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/IDataProcessor.java
+++ b/base/console/src/com/netscape/admin/certsrv/IDataProcessor.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/IDisplayPanel.java b/base/console/src/com/netscape/admin/certsrv/IDisplayPanel.java
index 1a855ef22..1a855ef22 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/IDisplayPanel.java
+++ b/base/console/src/com/netscape/admin/certsrv/IDisplayPanel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/IEditorPanel.java b/base/console/src/com/netscape/admin/certsrv/IEditorPanel.java
index c04f66549..c04f66549 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/IEditorPanel.java
+++ b/base/console/src/com/netscape/admin/certsrv/IEditorPanel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/IFilterPanel.java b/base/console/src/com/netscape/admin/certsrv/IFilterPanel.java
index 2758e7152..2758e7152 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/IFilterPanel.java
+++ b/base/console/src/com/netscape/admin/certsrv/IFilterPanel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/IMenuAction.java b/base/console/src/com/netscape/admin/certsrv/IMenuAction.java
index 59ff0562a..59ff0562a 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/IMenuAction.java
+++ b/base/console/src/com/netscape/admin/certsrv/IMenuAction.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/IRefreshTab.java b/base/console/src/com/netscape/admin/certsrv/IRefreshTab.java
index c69bedc4c..c69bedc4c 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/IRefreshTab.java
+++ b/base/console/src/com/netscape/admin/certsrv/IRefreshTab.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/IRefreshTabPanel.java b/base/console/src/com/netscape/admin/certsrv/IRefreshTabPanel.java
index bc657b0db..bc657b0db 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/IRefreshTabPanel.java
+++ b/base/console/src/com/netscape/admin/certsrv/IRefreshTabPanel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/IResourceSelectionListener.java b/base/console/src/com/netscape/admin/certsrv/IResourceSelectionListener.java
index 1f1c3deee..1f1c3deee 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/IResourceSelectionListener.java
+++ b/base/console/src/com/netscape/admin/certsrv/IResourceSelectionListener.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/ISubSystemUILoader.java b/base/console/src/com/netscape/admin/certsrv/ISubSystemUILoader.java
index 1bf05dfd6..1bf05dfd6 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/ISubSystemUILoader.java
+++ b/base/console/src/com/netscape/admin/certsrv/ISubSystemUILoader.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/IUIMapper.java b/base/console/src/com/netscape/admin/certsrv/IUIMapper.java
index e24e38664..e24e38664 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/IUIMapper.java
+++ b/base/console/src/com/netscape/admin/certsrv/IUIMapper.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/LabelCellRenderer.java b/base/console/src/com/netscape/admin/certsrv/LabelCellRenderer.java
index ea41f6b45..ea41f6b45 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/LabelCellRenderer.java
+++ b/base/console/src/com/netscape/admin/certsrv/LabelCellRenderer.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/MultilineLabelUI.java b/base/console/src/com/netscape/admin/certsrv/MultilineLabelUI.java
index 931732675..931732675 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/MultilineLabelUI.java
+++ b/base/console/src/com/netscape/admin/certsrv/MultilineLabelUI.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/PasswordCellRenderer.java b/base/console/src/com/netscape/admin/certsrv/PasswordCellRenderer.java
index 172f0499e..172f0499e 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/PasswordCellRenderer.java
+++ b/base/console/src/com/netscape/admin/certsrv/PasswordCellRenderer.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/StatusItemContinuousProgress.java b/base/console/src/com/netscape/admin/certsrv/StatusItemContinuousProgress.java
index 6945456f1..6945456f1 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/StatusItemContinuousProgress.java
+++ b/base/console/src/com/netscape/admin/certsrv/StatusItemContinuousProgress.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/UIMapperRegistry.java b/base/console/src/com/netscape/admin/certsrv/UIMapperRegistry.java
index 531a0b5fc..531a0b5fc 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/UIMapperRegistry.java
+++ b/base/console/src/com/netscape/admin/certsrv/UIMapperRegistry.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/certsrv-help.properties b/base/console/src/com/netscape/admin/certsrv/certsrv-help.properties
index 1faf8ef68..1faf8ef68 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/certsrv-help.properties
+++ b/base/console/src/com/netscape/admin/certsrv/certsrv-help.properties
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/ACIDialog.java b/base/console/src/com/netscape/admin/certsrv/config/ACIDialog.java
index e6085f820..e6085f820 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/ACIDialog.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/ACIDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/ACLDataModel.java b/base/console/src/com/netscape/admin/certsrv/config/ACLDataModel.java
index 4adf6c4d3..4adf6c4d3 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/ACLDataModel.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/ACLDataModel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/ACLEditDialog.java b/base/console/src/com/netscape/admin/certsrv/config/ACLEditDialog.java
index b3bcb72e1..b3bcb72e1 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/ACLEditDialog.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/ACLEditDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/ACLImplDataModel.java b/base/console/src/com/netscape/admin/certsrv/config/ACLImplDataModel.java
index 79033030d..79033030d 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/ACLImplDataModel.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/ACLImplDataModel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/ACLImplTab.java b/base/console/src/com/netscape/admin/certsrv/config/ACLImplTab.java
index 4693224b1..4693224b1 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/ACLImplTab.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/ACLImplTab.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/ACLPanel.java b/base/console/src/com/netscape/admin/certsrv/config/ACLPanel.java
index 2593e0c0b..2593e0c0b 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/ACLPanel.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/ACLPanel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/AutoRecoveryModel.java b/base/console/src/com/netscape/admin/certsrv/config/AutoRecoveryModel.java
index 90b617cbd..90b617cbd 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/AutoRecoveryModel.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/AutoRecoveryModel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CACertsTab.java b/base/console/src/com/netscape/admin/certsrv/config/CACertsTab.java
index 18590747a..18590747a 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/CACertsTab.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/CACertsTab.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSAccessLogPanel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSAccessLogPanel.java
index 8f1fc1f20..8f1fc1f20 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSAccessLogPanel.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/CMSAccessLogPanel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSAuditLogPanel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSAuditLogPanel.java
index 067b954e8..067b954e8 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSAuditLogPanel.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/CMSAuditLogPanel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSAutoRecovery.java b/base/console/src/com/netscape/admin/certsrv/config/CMSAutoRecovery.java
index ef55470c6..ef55470c6 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSAutoRecovery.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/CMSAutoRecovery.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSBaseConfigDialog.java b/base/console/src/com/netscape/admin/certsrv/config/CMSBaseConfigDialog.java
index 87562829b..87562829b 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSBaseConfigDialog.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/CMSBaseConfigDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSBaseConfigPanel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSBaseConfigPanel.java
index 89dce60c7..89dce60c7 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSBaseConfigPanel.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/CMSBaseConfigPanel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSBaseLDAPPanel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSBaseLDAPPanel.java
index dbba4a763..dbba4a763 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSBaseLDAPPanel.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/CMSBaseLDAPPanel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSBaseLogPanel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSBaseLogPanel.java
index c0437cbc4..c0437cbc4 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSBaseLogPanel.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/CMSBaseLogPanel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSBaseTab.java b/base/console/src/com/netscape/admin/certsrv/config/CMSBaseTab.java
index c3c707f68..c3c707f68 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSBaseTab.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/CMSBaseTab.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSBlankPanel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSBlankPanel.java
index b3f357564..b3f357564 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSBlankPanel.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/CMSBlankPanel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSCACertSettingPanel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSCACertSettingPanel.java
index 76aa59511..76aa59511 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSCACertSettingPanel.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/CMSCACertSettingPanel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSCAConnectorPanel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSCAConnectorPanel.java
index 1af02a881..1af02a881 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSCAConnectorPanel.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/CMSCAConnectorPanel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSCAGeneralPanel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSCAGeneralPanel.java
index 6f809316a..6f809316a 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSCAGeneralPanel.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/CMSCAGeneralPanel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSCALDAPPanel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSCALDAPPanel.java
index 735818834..735818834 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSCALDAPPanel.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/CMSCALDAPPanel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSCRLCachePanel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSCRLCachePanel.java
index 51da9c58c..51da9c58c 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSCRLCachePanel.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/CMSCRLCachePanel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSCRLFormatPanel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSCRLFormatPanel.java
index 3257b90a0..3257b90a0 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSCRLFormatPanel.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/CMSCRLFormatPanel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSCRLIPPanel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSCRLIPPanel.java
index 553211eb8..553211eb8 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSCRLIPPanel.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/CMSCRLIPPanel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSCRLSettingPanel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSCRLSettingPanel.java
index d420686e3..d420686e3 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSCRLSettingPanel.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/CMSCRLSettingPanel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSCertSettingPanel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSCertSettingPanel.java
index 975ba97da..975ba97da 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSCertSettingPanel.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/CMSCertSettingPanel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSCipherPreferenceDialog.java b/base/console/src/com/netscape/admin/certsrv/config/CMSCipherPreferenceDialog.java
index 69e208be5..69e208be5 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSCipherPreferenceDialog.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/CMSCipherPreferenceDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSCipherPreferencePane.java b/base/console/src/com/netscape/admin/certsrv/config/CMSCipherPreferencePane.java
index 88faf2a71..88faf2a71 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSCipherPreferencePane.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/CMSCipherPreferencePane.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSEAGeneralPanel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSEAGeneralPanel.java
index 2d35133df..2d35133df 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSEAGeneralPanel.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/CMSEAGeneralPanel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSEncryptionPanel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSEncryptionPanel.java
index 913974eaf..913974eaf 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSEncryptionPanel.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/CMSEncryptionPanel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSErrorLogPanel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSErrorLogPanel.java
index 23b4ececa..23b4ececa 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSErrorLogPanel.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/CMSErrorLogPanel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSKRAAutoPanel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSKRAAutoPanel.java
index f408e7297..f408e7297 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSKRAAutoPanel.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/CMSKRAAutoPanel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSKRAPasswdPanel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSKRAPasswdPanel.java
index 7c70dca7f..7c70dca7f 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSKRAPasswdPanel.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/CMSKRAPasswdPanel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSKRASchemePanel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSKRASchemePanel.java
index 34950b371..34950b371 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSKRASchemePanel.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/CMSKRASchemePanel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSLDAPSettingPanel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSLDAPSettingPanel.java
index 641a6641e..641a6641e 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSLDAPSettingPanel.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/CMSLDAPSettingPanel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSNetworkPanel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSNetworkPanel.java
index 03458d2b1..03458d2b1 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSNetworkPanel.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/CMSNetworkPanel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSOCSPGeneralPanel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSOCSPGeneralPanel.java
index 37dfbef44..37dfbef44 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSOCSPGeneralPanel.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/CMSOCSPGeneralPanel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSPasswordDialog.java b/base/console/src/com/netscape/admin/certsrv/config/CMSPasswordDialog.java
index 47cb6c865..47cb6c865 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSPasswordDialog.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/CMSPasswordDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSPluginInstanceTab.java b/base/console/src/com/netscape/admin/certsrv/config/CMSPluginInstanceTab.java
index d4fb62340..d4fb62340 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSPluginInstanceTab.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/CMSPluginInstanceTab.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSRACLMPanel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSRACLMPanel.java
index 734425b41..734425b41 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSRACLMPanel.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/CMSRACLMPanel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSRAConnectorPanel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSRAConnectorPanel.java
index 7733a43d7..7733a43d7 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSRAConnectorPanel.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/CMSRAConnectorPanel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSRAGeneralPanel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSRAGeneralPanel.java
index 6605385b0..6605385b0 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSRAGeneralPanel.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/CMSRAGeneralPanel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSRALDAPPanel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSRALDAPPanel.java
index 3fbe6a72a..3fbe6a72a 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSRALDAPPanel.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/CMSRALDAPPanel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSRuleDataModel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSRuleDataModel.java
index 2c12183c7..2c12183c7 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSRuleDataModel.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/CMSRuleDataModel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSSMTPPanel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSSMTPPanel.java
index 0275e3cb0..0275e3cb0 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSSMTPPanel.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/CMSSMTPPanel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSSNMPPanel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSSNMPPanel.java
index b5b589eb0..b5b589eb0 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSSNMPPanel.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/CMSSNMPPanel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSSSL2CipherPreference.java b/base/console/src/com/netscape/admin/certsrv/config/CMSSSL2CipherPreference.java
index 4e95d25db..4e95d25db 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSSSL2CipherPreference.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/CMSSSL2CipherPreference.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSSSL2CipherSet.java b/base/console/src/com/netscape/admin/certsrv/config/CMSSSL2CipherSet.java
index fa18107cb..fa18107cb 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSSSL2CipherSet.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/CMSSSL2CipherSet.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSSSL3CipherPreference.java b/base/console/src/com/netscape/admin/certsrv/config/CMSSSL3CipherPreference.java
index 63444fc75..63444fc75 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSSSL3CipherPreference.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/CMSSSL3CipherPreference.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSSSL3CipherSet.java b/base/console/src/com/netscape/admin/certsrv/config/CMSSSL3CipherSet.java
index 0286f3820..0286f3820 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSSSL3CipherSet.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/CMSSSL3CipherSet.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSSelfTestsPanel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSSelfTestsPanel.java
index ab957a69c..ab957a69c 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSSelfTestsPanel.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/CMSSelfTestsPanel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSTabPanel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSTabPanel.java
index 63899892f..63899892f 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSTabPanel.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/CMSTabPanel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSUserCertSettingPanel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSUserCertSettingPanel.java
index ca424c3a0..ca424c3a0 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSUserCertSettingPanel.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/CMSUserCertSettingPanel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMStoAdminEncryptionPane.java b/base/console/src/com/netscape/admin/certsrv/config/CMStoAdminEncryptionPane.java
index ea448b4e0..ea448b4e0 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/CMStoAdminEncryptionPane.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/CMStoAdminEncryptionPane.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CRLExtensionsConfigDialog.java b/base/console/src/com/netscape/admin/certsrv/config/CRLExtensionsConfigDialog.java
index 9a4f5ae17..9a4f5ae17 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/CRLExtensionsConfigDialog.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/CRLExtensionsConfigDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CRLExtensionsInstanceTab.java b/base/console/src/com/netscape/admin/certsrv/config/CRLExtensionsInstanceTab.java
index 5c687ea90..5c687ea90 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/CRLExtensionsInstanceTab.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/CRLExtensionsInstanceTab.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CRLExtensionsPluginSelectionDialog.java b/base/console/src/com/netscape/admin/certsrv/config/CRLExtensionsPluginSelectionDialog.java
index aa169235d..aa169235d 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/CRLExtensionsPluginSelectionDialog.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/CRLExtensionsPluginSelectionDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CRLExtensionsRuleDataModel.java b/base/console/src/com/netscape/admin/certsrv/config/CRLExtensionsRuleDataModel.java
index e5ae9352a..e5ae9352a 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/CRLExtensionsRuleDataModel.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/CRLExtensionsRuleDataModel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CRLIPEditor.java b/base/console/src/com/netscape/admin/certsrv/config/CRLIPEditor.java
index 040b21b83..040b21b83 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/CRLIPEditor.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/CRLIPEditor.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/ConfigTableModel.java b/base/console/src/com/netscape/admin/certsrv/config/ConfigTableModel.java
index 8608e943a..8608e943a 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/ConfigTableModel.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/ConfigTableModel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/ConnectorEditor.java b/base/console/src/com/netscape/admin/certsrv/config/ConnectorEditor.java
index 6f711eca9..6f711eca9 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/ConnectorEditor.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/ConnectorEditor.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/EvaluatorRegisterDialog.java b/base/console/src/com/netscape/admin/certsrv/config/EvaluatorRegisterDialog.java
index d4dff2e25..d4dff2e25 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/EvaluatorRegisterDialog.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/EvaluatorRegisterDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/GeneralLogPanel.java b/base/console/src/com/netscape/admin/certsrv/config/GeneralLogPanel.java
index 66e9b4397..66e9b4397 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/GeneralLogPanel.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/GeneralLogPanel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/JobsConfigDialog.java b/base/console/src/com/netscape/admin/certsrv/config/JobsConfigDialog.java
index 307ddbbc4..307ddbbc4 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/JobsConfigDialog.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/JobsConfigDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/JobsImplDataModel.java b/base/console/src/com/netscape/admin/certsrv/config/JobsImplDataModel.java
index d3a605433..d3a605433 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/JobsImplDataModel.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/JobsImplDataModel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/JobsImplTab.java b/base/console/src/com/netscape/admin/certsrv/config/JobsImplTab.java
index 57848c649..57848c649 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/JobsImplTab.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/JobsImplTab.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/JobsInstanceTab.java b/base/console/src/com/netscape/admin/certsrv/config/JobsInstanceTab.java
index 059a741ce..059a741ce 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/JobsInstanceTab.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/JobsInstanceTab.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/JobsPluginSelectionDialog.java b/base/console/src/com/netscape/admin/certsrv/config/JobsPluginSelectionDialog.java
index d07e5ed32..d07e5ed32 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/JobsPluginSelectionDialog.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/JobsPluginSelectionDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/JobsRegisterDialog.java b/base/console/src/com/netscape/admin/certsrv/config/JobsRegisterDialog.java
index bdb448eeb..bdb448eeb 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/JobsRegisterDialog.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/JobsRegisterDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/JobsRuleDataModel.java b/base/console/src/com/netscape/admin/certsrv/config/JobsRuleDataModel.java
index 76fbd9a38..76fbd9a38 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/JobsRuleDataModel.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/JobsRuleDataModel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/JobsSettingPanel.java b/base/console/src/com/netscape/admin/certsrv/config/JobsSettingPanel.java
index b6a93d191..b6a93d191 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/JobsSettingPanel.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/JobsSettingPanel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/KeyCreateDialog.java b/base/console/src/com/netscape/admin/certsrv/config/KeyCreateDialog.java
index 5821127d4..5821127d4 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/KeyCreateDialog.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/KeyCreateDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/ListCertsModel.java b/base/console/src/com/netscape/admin/certsrv/config/ListCertsModel.java
index b239edfb9..b239edfb9 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/ListCertsModel.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/ListCertsModel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/ListKeysModel.java b/base/console/src/com/netscape/admin/certsrv/config/ListKeysModel.java
index 78f033be5..78f033be5 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/ListKeysModel.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/ListKeysModel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/LogConfigDialog.java b/base/console/src/com/netscape/admin/certsrv/config/LogConfigDialog.java
index 7f3833034..7f3833034 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/LogConfigDialog.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/LogConfigDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/LogImplDataModel.java b/base/console/src/com/netscape/admin/certsrv/config/LogImplDataModel.java
index a5af0b1dc..a5af0b1dc 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/LogImplDataModel.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/LogImplDataModel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/LogImplTab.java b/base/console/src/com/netscape/admin/certsrv/config/LogImplTab.java
index 1b654fead..1b654fead 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/LogImplTab.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/LogImplTab.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/LogInstanceTab.java b/base/console/src/com/netscape/admin/certsrv/config/LogInstanceTab.java
index 99b86e5eb..99b86e5eb 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/LogInstanceTab.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/LogInstanceTab.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/LogPluginSelectionDialog.java b/base/console/src/com/netscape/admin/certsrv/config/LogPluginSelectionDialog.java
index 83c8ab2e8..83c8ab2e8 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/LogPluginSelectionDialog.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/LogPluginSelectionDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/LogRegisterDialog.java b/base/console/src/com/netscape/admin/certsrv/config/LogRegisterDialog.java
index 2360c860a..2360c860a 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/LogRegisterDialog.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/LogRegisterDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/LogRuleDataModel.java b/base/console/src/com/netscape/admin/certsrv/config/LogRuleDataModel.java
index 1a64226f0..1a64226f0 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/LogRuleDataModel.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/LogRuleDataModel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/MNSchemeWizard.java b/base/console/src/com/netscape/admin/certsrv/config/MNSchemeWizard.java
index cd10c5575..cd10c5575 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/MNSchemeWizard.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/MNSchemeWizard.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/MNSchemeWizardInfo.java b/base/console/src/com/netscape/admin/certsrv/config/MNSchemeWizardInfo.java
index 8d90914b3..8d90914b3 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/MNSchemeWizardInfo.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/MNSchemeWizardInfo.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/MapperConfigDialog.java b/base/console/src/com/netscape/admin/certsrv/config/MapperConfigDialog.java
index 119823d58..119823d58 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/MapperConfigDialog.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/MapperConfigDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/MapperImplDataModel.java b/base/console/src/com/netscape/admin/certsrv/config/MapperImplDataModel.java
index 23d6ee0b4..23d6ee0b4 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/MapperImplDataModel.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/MapperImplDataModel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/MapperImplTab.java b/base/console/src/com/netscape/admin/certsrv/config/MapperImplTab.java
index 2ad54da60..2ad54da60 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/MapperImplTab.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/MapperImplTab.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/MapperInstanceTab.java b/base/console/src/com/netscape/admin/certsrv/config/MapperInstanceTab.java
index a531ecf30..a531ecf30 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/MapperInstanceTab.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/MapperInstanceTab.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/MapperPluginSelectionDialog.java b/base/console/src/com/netscape/admin/certsrv/config/MapperPluginSelectionDialog.java
index ce0e10e9a..ce0e10e9a 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/MapperPluginSelectionDialog.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/MapperPluginSelectionDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/MapperRegisterDialog.java b/base/console/src/com/netscape/admin/certsrv/config/MapperRegisterDialog.java
index 3f6be3234..3f6be3234 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/MapperRegisterDialog.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/MapperRegisterDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/MapperRuleDataModel.java b/base/console/src/com/netscape/admin/certsrv/config/MapperRuleDataModel.java
index a72b59f7c..a72b59f7c 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/MapperRuleDataModel.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/MapperRuleDataModel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/OCSPStoresConfigDialog.java b/base/console/src/com/netscape/admin/certsrv/config/OCSPStoresConfigDialog.java
index 87097ddc0..87097ddc0 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/OCSPStoresConfigDialog.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/OCSPStoresConfigDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/OCSPStoresInstanceTab.java b/base/console/src/com/netscape/admin/certsrv/config/OCSPStoresInstanceTab.java
index ff234c7fd..ff234c7fd 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/OCSPStoresInstanceTab.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/OCSPStoresInstanceTab.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/OCSPStoresPluginSelectionDialog.java b/base/console/src/com/netscape/admin/certsrv/config/OCSPStoresPluginSelectionDialog.java
index 32365c27c..32365c27c 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/OCSPStoresPluginSelectionDialog.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/OCSPStoresPluginSelectionDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/OCSPStoresRuleDataModel.java b/base/console/src/com/netscape/admin/certsrv/config/OCSPStoresRuleDataModel.java
index 5cd67e276..5cd67e276 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/OCSPStoresRuleDataModel.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/OCSPStoresRuleDataModel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/PanelMapperConfigDialog.java b/base/console/src/com/netscape/admin/certsrv/config/PanelMapperConfigDialog.java
index 5de06c7f9..5de06c7f9 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/PanelMapperConfigDialog.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/PanelMapperConfigDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/PluginSelectionDialog.java b/base/console/src/com/netscape/admin/certsrv/config/PluginSelectionDialog.java
index 437881186..437881186 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/PluginSelectionDialog.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/PluginSelectionDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/PolicyConfigDialog.java b/base/console/src/com/netscape/admin/certsrv/config/PolicyConfigDialog.java
index 8dec3cabf..8dec3cabf 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/PolicyConfigDialog.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/PolicyConfigDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/PolicyImplDataModel.java b/base/console/src/com/netscape/admin/certsrv/config/PolicyImplDataModel.java
index 59ea36ec8..59ea36ec8 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/PolicyImplDataModel.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/PolicyImplDataModel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/PolicyImplTab.java b/base/console/src/com/netscape/admin/certsrv/config/PolicyImplTab.java
index f4fab7260..f4fab7260 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/PolicyImplTab.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/PolicyImplTab.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/PolicyInstanceTab.java b/base/console/src/com/netscape/admin/certsrv/config/PolicyInstanceTab.java
index 9bf8fb54b..9bf8fb54b 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/PolicyInstanceTab.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/PolicyInstanceTab.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/PolicyPluginSelectionDialog.java b/base/console/src/com/netscape/admin/certsrv/config/PolicyPluginSelectionDialog.java
index 6ef26b767..6ef26b767 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/PolicyPluginSelectionDialog.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/PolicyPluginSelectionDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/PolicyRegisterDialog.java b/base/console/src/com/netscape/admin/certsrv/config/PolicyRegisterDialog.java
index cbc961c5b..cbc961c5b 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/PolicyRegisterDialog.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/PolicyRegisterDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/PolicyRuleDataModel.java b/base/console/src/com/netscape/admin/certsrv/config/PolicyRuleDataModel.java
index 9bbeda334..9bbeda334 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/PolicyRuleDataModel.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/PolicyRuleDataModel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/PolicyRuleOrderDialog.java b/base/console/src/com/netscape/admin/certsrv/config/PolicyRuleOrderDialog.java
index 1c99d999f..1c99d999f 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/PolicyRuleOrderDialog.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/PolicyRuleOrderDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/ProfileComponentCellEditor.java b/base/console/src/com/netscape/admin/certsrv/config/ProfileComponentCellEditor.java
index b1e2769db..b1e2769db 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/ProfileComponentCellEditor.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/ProfileComponentCellEditor.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/ProfileConfigDataModel.java b/base/console/src/com/netscape/admin/certsrv/config/ProfileConfigDataModel.java
index af20b4e99..af20b4e99 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/ProfileConfigDataModel.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/ProfileConfigDataModel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/ProfileConfigDialog.java b/base/console/src/com/netscape/admin/certsrv/config/ProfileConfigDialog.java
index a8d312d2a..a8d312d2a 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/ProfileConfigDialog.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/ProfileConfigDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/ProfileDataTable.java b/base/console/src/com/netscape/admin/certsrv/config/ProfileDataTable.java
index 94d3b65f2..94d3b65f2 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/ProfileDataTable.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/ProfileDataTable.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/ProfileEditDataModel.java b/base/console/src/com/netscape/admin/certsrv/config/ProfileEditDataModel.java
index 096a4075c..096a4075c 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/ProfileEditDataModel.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/ProfileEditDataModel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/ProfileEditDialog.java b/base/console/src/com/netscape/admin/certsrv/config/ProfileEditDialog.java
index d10e19215..d10e19215 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/ProfileEditDialog.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/ProfileEditDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/ProfileImplDataModel.java b/base/console/src/com/netscape/admin/certsrv/config/ProfileImplDataModel.java
index eee2531cf..eee2531cf 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/ProfileImplDataModel.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/ProfileImplDataModel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/ProfileImplTab.java b/base/console/src/com/netscape/admin/certsrv/config/ProfileImplTab.java
index c7d28dd07..c7d28dd07 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/ProfileImplTab.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/ProfileImplTab.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/ProfileInstanceTab.java b/base/console/src/com/netscape/admin/certsrv/config/ProfileInstanceTab.java
index 6dbc1dceb..6dbc1dceb 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/ProfileInstanceTab.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/ProfileInstanceTab.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/ProfileListDataModel.java b/base/console/src/com/netscape/admin/certsrv/config/ProfileListDataModel.java
index 2e4633046..2e4633046 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/ProfileListDataModel.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/ProfileListDataModel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/ProfileNonPolicyNewDialog.java b/base/console/src/com/netscape/admin/certsrv/config/ProfileNonPolicyNewDialog.java
index e597b242b..e597b242b 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/ProfileNonPolicyNewDialog.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/ProfileNonPolicyNewDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/ProfileNonPolicySelDialog.java b/base/console/src/com/netscape/admin/certsrv/config/ProfileNonPolicySelDialog.java
index 8d97ffd13..8d97ffd13 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/ProfileNonPolicySelDialog.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/ProfileNonPolicySelDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/ProfilePluginSelectionDialog.java b/base/console/src/com/netscape/admin/certsrv/config/ProfilePluginSelectionDialog.java
index ec3bb4c7c..ec3bb4c7c 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/ProfilePluginSelectionDialog.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/ProfilePluginSelectionDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/ProfilePolicyEditDataModel.java b/base/console/src/com/netscape/admin/certsrv/config/ProfilePolicyEditDataModel.java
index 7b306d1da..7b306d1da 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/ProfilePolicyEditDataModel.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/ProfilePolicyEditDataModel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/ProfilePolicyEditDialog.java b/base/console/src/com/netscape/admin/certsrv/config/ProfilePolicyEditDialog.java
index 34b95c0f1..34b95c0f1 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/ProfilePolicyEditDialog.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/ProfilePolicyEditDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/ProfilePolicyNewDialog.java b/base/console/src/com/netscape/admin/certsrv/config/ProfilePolicyNewDialog.java
index 941917808..941917808 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/ProfilePolicyNewDialog.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/ProfilePolicyNewDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/ProfilePolicySelectionDialog.java b/base/console/src/com/netscape/admin/certsrv/config/ProfilePolicySelectionDialog.java
index 44fe9886b..44fe9886b 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/ProfilePolicySelectionDialog.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/ProfilePolicySelectionDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/ProfileRegisterDialog.java b/base/console/src/com/netscape/admin/certsrv/config/ProfileRegisterDialog.java
index c576adbe6..c576adbe6 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/ProfileRegisterDialog.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/ProfileRegisterDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/ProfileRuleDataModel.java b/base/console/src/com/netscape/admin/certsrv/config/ProfileRuleDataModel.java
index 7a3ba2827..7a3ba2827 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/ProfileRuleDataModel.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/ProfileRuleDataModel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/PublisherConfigDialog.java b/base/console/src/com/netscape/admin/certsrv/config/PublisherConfigDialog.java
index 90d67ba9e..90d67ba9e 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/PublisherConfigDialog.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/PublisherConfigDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/PublisherImplDataModel.java b/base/console/src/com/netscape/admin/certsrv/config/PublisherImplDataModel.java
index aefa4b1cc..aefa4b1cc 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/PublisherImplDataModel.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/PublisherImplDataModel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/PublisherImplTab.java b/base/console/src/com/netscape/admin/certsrv/config/PublisherImplTab.java
index 79fedfe5e..79fedfe5e 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/PublisherImplTab.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/PublisherImplTab.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/PublisherInstanceTab.java b/base/console/src/com/netscape/admin/certsrv/config/PublisherInstanceTab.java
index e9d3bdbb0..e9d3bdbb0 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/PublisherInstanceTab.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/PublisherInstanceTab.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/PublisherPluginSelectionDialog.java b/base/console/src/com/netscape/admin/certsrv/config/PublisherPluginSelectionDialog.java
index 536d9096f..536d9096f 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/PublisherPluginSelectionDialog.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/PublisherPluginSelectionDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/PublisherRegisterDialog.java b/base/console/src/com/netscape/admin/certsrv/config/PublisherRegisterDialog.java
index 23e1a5913..23e1a5913 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/PublisherRegisterDialog.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/PublisherRegisterDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/PublisherRuleDataModel.java b/base/console/src/com/netscape/admin/certsrv/config/PublisherRuleDataModel.java
index 03faeac21..03faeac21 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/PublisherRuleDataModel.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/PublisherRuleDataModel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/RegisterDialog.java b/base/console/src/com/netscape/admin/certsrv/config/RegisterDialog.java
index fe48419c7..fe48419c7 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/RegisterDialog.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/RegisterDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/RuleConfigDialog.java b/base/console/src/com/netscape/admin/certsrv/config/RuleConfigDialog.java
index 7f7cff092..7f7cff092 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/RuleConfigDialog.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/RuleConfigDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/RuleImplDataModel.java b/base/console/src/com/netscape/admin/certsrv/config/RuleImplDataModel.java
index 86a4fa6d4..86a4fa6d4 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/RuleImplDataModel.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/RuleImplDataModel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/RuleImplTab.java b/base/console/src/com/netscape/admin/certsrv/config/RuleImplTab.java
index 098cbcbd1..098cbcbd1 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/RuleImplTab.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/RuleImplTab.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/RuleInstanceTab.java b/base/console/src/com/netscape/admin/certsrv/config/RuleInstanceTab.java
index 04a649ed0..04a649ed0 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/RuleInstanceTab.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/RuleInstanceTab.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/RulePluginSelectionDialog.java b/base/console/src/com/netscape/admin/certsrv/config/RulePluginSelectionDialog.java
index f1021bc6c..f1021bc6c 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/RulePluginSelectionDialog.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/RulePluginSelectionDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/RuleRegisterDialog.java b/base/console/src/com/netscape/admin/certsrv/config/RuleRegisterDialog.java
index 34d1757e6..34d1757e6 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/RuleRegisterDialog.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/RuleRegisterDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/RuleRuleDataModel.java b/base/console/src/com/netscape/admin/certsrv/config/RuleRuleDataModel.java
index cee7727a1..cee7727a1 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/RuleRuleDataModel.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/RuleRuleDataModel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/TKSKeysTab.java b/base/console/src/com/netscape/admin/certsrv/config/TKSKeysTab.java
index ac8b5e610..ac8b5e610 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/TKSKeysTab.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/TKSKeysTab.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/UserCertsTab.java b/base/console/src/com/netscape/admin/certsrv/config/UserCertsTab.java
index de0a075a1..de0a075a1 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/UserCertsTab.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/UserCertsTab.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/ViewDialog.java b/base/console/src/com/netscape/admin/certsrv/config/ViewDialog.java
index 277b3d2be..277b3d2be 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/ViewDialog.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/ViewDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/ViewSelfTestsDialog.java b/base/console/src/com/netscape/admin/certsrv/config/ViewSelfTestsDialog.java
index 09d7892ef..09d7892ef 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/ViewSelfTestsDialog.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/ViewSelfTestsDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/ViewTableModel.java b/base/console/src/com/netscape/admin/certsrv/config/ViewTableModel.java
index f634a182c..f634a182c 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/ViewTableModel.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/ViewTableModel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/WBaseCertExtensionPage.java b/base/console/src/com/netscape/admin/certsrv/config/WBaseCertExtensionPage.java
index 6c92ed61e..6c92ed61e 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/WBaseCertExtensionPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/WBaseCertExtensionPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/WBaseCertRequestPage.java b/base/console/src/com/netscape/admin/certsrv/config/WBaseCertRequestPage.java
index 6b9a1667b..6b9a1667b 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/WBaseCertRequestPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/WBaseCertRequestPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/WBaseDNPage.java b/base/console/src/com/netscape/admin/certsrv/config/WBaseDNPage.java
index 97774727b..97774727b 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/WBaseDNPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/WBaseDNPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/WBaseDNValidityPage.java b/base/console/src/com/netscape/admin/certsrv/config/WBaseDNValidityPage.java
index 3a5837624..3a5837624 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/WBaseDNValidityPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/WBaseDNValidityPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/WBaseKeyPage.java b/base/console/src/com/netscape/admin/certsrv/config/WBaseKeyPage.java
index 1266099b1..1266099b1 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/WBaseKeyPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/WBaseKeyPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/WBaseManualCertRequestPage.java b/base/console/src/com/netscape/admin/certsrv/config/WBaseManualCertRequestPage.java
index 195979f9c..195979f9c 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/WBaseManualCertRequestPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/WBaseManualCertRequestPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/WBaseValidityPage.java b/base/console/src/com/netscape/admin/certsrv/config/WBaseValidityPage.java
index 61d9506e6..61d9506e6 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/WBaseValidityPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/WBaseValidityPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/WMNNewAgent.java b/base/console/src/com/netscape/admin/certsrv/config/WMNNewAgent.java
index 425eddaaa..425eddaaa 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/WMNNewAgent.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/WMNNewAgent.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/WMNOldAgent.java b/base/console/src/com/netscape/admin/certsrv/config/WMNOldAgent.java
index 07973f6c9..07973f6c9 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/WMNOldAgent.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/WMNOldAgent.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/WMNResultPage.java b/base/console/src/com/netscape/admin/certsrv/config/WMNResultPage.java
index 55b1d1ccf..55b1d1ccf 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/WMNResultPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/WMNResultPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/WMNSelection.java b/base/console/src/com/netscape/admin/certsrv/config/WMNSelection.java
index db7753b1d..db7753b1d 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/WMNSelection.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/WMNSelection.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/WMessageDigestPage.java b/base/console/src/com/netscape/admin/certsrv/config/WMessageDigestPage.java
index ce0ced102..ce0ced102 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/WMessageDigestPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/WMessageDigestPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/WarningDialog.java b/base/console/src/com/netscape/admin/certsrv/config/WarningDialog.java
index bedf0b67f..bedf0b67f 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/WarningDialog.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/WarningDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/ComponentCellRenderer.java b/base/console/src/com/netscape/admin/certsrv/config/install/ComponentCellRenderer.java
index f6dcff392..f6dcff392 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/ComponentCellRenderer.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/ComponentCellRenderer.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/InstallWizard.java b/base/console/src/com/netscape/admin/certsrv/config/install/InstallWizard.java
index 557dc2739..557dc2739 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/InstallWizard.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/InstallWizard.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/InstallWizardInfo.java b/base/console/src/com/netscape/admin/certsrv/config/install/InstallWizardInfo.java
index a88101cc4..a88101cc4 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/InstallWizardInfo.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/InstallWizardInfo.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIAdminPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIAdminPage.java
index 467632102..467632102 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIAdminPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIAdminPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIAllCertsInstalledPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIAllCertsInstalledPage.java
index b84460814..b84460814 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIAllCertsInstalledPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIAllCertsInstalledPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WICACert1CustomPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WICACert1CustomPage.java
index 6f8c26032..6f8c26032 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WICACert1CustomPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WICACert1CustomPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WICACert1Page.java b/base/console/src/com/netscape/admin/certsrv/config/install/WICACert1Page.java
index c3ca75420..c3ca75420 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WICACert1Page.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WICACert1Page.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WICACert2Page.java b/base/console/src/com/netscape/admin/certsrv/config/install/WICACert2Page.java
index 79fc00b02..79fc00b02 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WICACert2Page.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WICACert2Page.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WICACertDNPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WICACertDNPage.java
index 531de6be5..531de6be5 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WICACertDNPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WICACertDNPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WICACertExtensionPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WICACertExtensionPage.java
index 1a1a1a8b9..1a1a1a8b9 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WICACertExtensionPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WICACertExtensionPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WICACertPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WICACertPage.java
index b962c6ca1..b962c6ca1 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WICACertPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WICACertPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WICACertSubmitPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WICACertSubmitPage.java
index efa2d8b0c..efa2d8b0c 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WICACertSubmitPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WICACertSubmitPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WICACertValidityPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WICACertValidityPage.java
index cb8fa550d..cb8fa550d 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WICACertValidityPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WICACertValidityPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WICAKeyPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WICAKeyPage.java
index accc866b2..accc866b2 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WICAKeyPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WICAKeyPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WICAMessageDigestPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WICAMessageDigestPage.java
index e19fc6586..e19fc6586 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WICAMessageDigestPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WICAMessageDigestPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WICAOCSPServicePage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WICAOCSPServicePage.java
index 9245b14bf..9245b14bf 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WICAOCSPServicePage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WICAOCSPServicePage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WICARequestResultPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WICARequestResultPage.java
index f40898821..f40898821 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WICARequestResultPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WICARequestResultPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WICASerialNumberPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WICASerialNumberPage.java
index 3b1653d7f..3b1653d7f 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WICASerialNumberPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WICASerialNumberPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WICATokenLogonPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WICATokenLogonPage.java
index f7068b3d3..f7068b3d3 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WICATokenLogonPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WICATokenLogonPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WICertDNPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WICertDNPage.java
index cf7e623ad..cf7e623ad 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WICertDNPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WICertDNPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WICertExtensionPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WICertExtensionPage.java
index 8c989685a..8c989685a 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WICertExtensionPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WICertExtensionPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WICertRequestPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WICertRequestPage.java
index d4926e1e9..d4926e1e9 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WICertRequestPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WICertRequestPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WICertSetupStatusPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WICertSetupStatusPage.java
index ff9ca97a6..ff9ca97a6 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WICertSetupStatusPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WICertSetupStatusPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WICertSubmitPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WICertSubmitPage.java
index 18beac219..18beac219 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WICertSubmitPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WICertSubmitPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WICertValidityPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WICertValidityPage.java
index 8f2acd493..8f2acd493 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WICertValidityPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WICertValidityPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WICloneCAKeyCertPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WICloneCAKeyCertPage.java
index d5722df32..d5722df32 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WICloneCAKeyCertPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WICloneCAKeyCertPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WICloneKRAKeyCertPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WICloneKRAKeyCertPage.java
index bea79b2e0..bea79b2e0 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WICloneKRAKeyCertPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WICloneKRAKeyCertPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WICloneMasterPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WICloneMasterPage.java
index c8498f306..c8498f306 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WICloneMasterPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WICloneMasterPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WICloneOCSPKeyCertPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WICloneOCSPKeyCertPage.java
index 9061b5f7a..9061b5f7a 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WICloneOCSPKeyCertPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WICloneOCSPKeyCertPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIClonePage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIClonePage.java
index cdfa23199..cdfa23199 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIClonePage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIClonePage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WICloneRAKeyCertPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WICloneRAKeyCertPage.java
index 7194ee3cc..7194ee3cc 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WICloneRAKeyCertPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WICloneRAKeyCertPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WICloneTKSKeyCertPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WICloneTKSKeyCertPage.java
index baeaaec8d..baeaaec8d 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WICloneTKSKeyCertPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WICloneTKSKeyCertPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIConfigWebServerPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIConfigWebServerPage.java
index ad9e8b4d6..ad9e8b4d6 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIConfigWebServerPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIConfigWebServerPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WICreateInternalDBPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WICreateInternalDBPage.java
index 4aee62e27..4aee62e27 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WICreateInternalDBPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WICreateInternalDBPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIDBEnrollPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIDBEnrollPage.java
index d63a07129..d63a07129 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIDBEnrollPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIDBEnrollPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIDisplayCACertPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIDisplayCACertPage.java
index 442fa2b29..442fa2b29 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIDisplayCACertPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIDisplayCACertPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIDisplayCertPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIDisplayCertPage.java
index 30e0bac13..30e0bac13 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIDisplayCertPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIDisplayCertPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIDisplayKRACertPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIDisplayKRACertPage.java
index cae06e6cf..cae06e6cf 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIDisplayKRACertPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIDisplayKRACertPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIDisplayOCSPCertPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIDisplayOCSPCertPage.java
index e9db0e436..e9db0e436 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIDisplayOCSPCertPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIDisplayOCSPCertPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIDisplayRACertPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIDisplayRACertPage.java
index 891e68038..891e68038 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIDisplayRACertPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIDisplayRACertPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIDisplaySSLCertPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIDisplaySSLCertPage.java
index 3a791b4ed..3a791b4ed 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIDisplaySSLCertPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIDisplaySSLCertPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIExistingDBPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIExistingDBPage.java
index 93bbde830..93bbde830 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIExistingDBPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIExistingDBPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIGenCAKeyCertPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIGenCAKeyCertPage.java
index 2bbb2f570..2bbb2f570 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIGenCAKeyCertPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIGenCAKeyCertPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIGenCAKeyCertReqPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIGenCAKeyCertReqPage.java
index c1f3c11ea..c1f3c11ea 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIGenCAKeyCertReqPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIGenCAKeyCertReqPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIGenKRAKeyCertPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIGenKRAKeyCertPage.java
index 98ef24812..98ef24812 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIGenKRAKeyCertPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIGenKRAKeyCertPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIGenKRAKeyCertReqPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIGenKRAKeyCertReqPage.java
index f6e5df9fe..f6e5df9fe 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIGenKRAKeyCertReqPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIGenKRAKeyCertReqPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIGenKeyCertPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIGenKeyCertPage.java
index 8272d44df..8272d44df 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIGenKeyCertPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIGenKeyCertPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIGenKeyCertReqPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIGenKeyCertReqPage.java
index b5c0378c3..b5c0378c3 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIGenKeyCertReqPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIGenKeyCertReqPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIGenOCSPKeyCertPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIGenOCSPKeyCertPage.java
index 2e2fbdbed..2e2fbdbed 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIGenOCSPKeyCertPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIGenOCSPKeyCertPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIGenOCSPKeyCertReqPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIGenOCSPKeyCertReqPage.java
index 7c27f673d..7c27f673d 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIGenOCSPKeyCertReqPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIGenOCSPKeyCertReqPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIGenRAKeyCertPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIGenRAKeyCertPage.java
index 05859e54c..05859e54c 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIGenRAKeyCertPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIGenRAKeyCertPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIGenRAKeyCertReqPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIGenRAKeyCertReqPage.java
index 89aa21f14..89aa21f14 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIGenRAKeyCertReqPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIGenRAKeyCertReqPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIGenSSLKeyCertReqPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIGenSSLKeyCertReqPage.java
index 58a85f790..58a85f790 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIGenSSLKeyCertReqPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIGenSSLKeyCertReqPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIGenServerKeyCertPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIGenServerKeyCertPage.java
index e93c378f6..e93c378f6 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIGenServerKeyCertPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIGenServerKeyCertPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallCACertStatusPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallCACertStatusPage.java
index d26b79ab0..d26b79ab0 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallCACertStatusPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallCACertStatusPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallCAIntroPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallCAIntroPage.java
index 033897c79..033897c79 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallCAIntroPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallCAIntroPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallCert1Page.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallCert1Page.java
index 240134536..240134536 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallCert1Page.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallCert1Page.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallCert2Page.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallCert2Page.java
index fc9eaacb0..fc9eaacb0 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallCert2Page.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallCert2Page.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallCertStatusPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallCertStatusPage.java
index 860e5b60e..860e5b60e 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallCertStatusPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallCertStatusPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallIntroPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallIntroPage.java
index 29ddd0a46..29ddd0a46 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallIntroPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallIntroPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallKRACertStatusPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallKRACertStatusPage.java
index d33601151..d33601151 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallKRACertStatusPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallKRACertStatusPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallKRAIntroPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallKRAIntroPage.java
index cba792c1c..cba792c1c 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallKRAIntroPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallKRAIntroPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallOCSPCertStatusPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallOCSPCertStatusPage.java
index c98b7b045..c98b7b045 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallOCSPCertStatusPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallOCSPCertStatusPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallOCSPIntroPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallOCSPIntroPage.java
index 96c843e57..96c843e57 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallOCSPIntroPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallOCSPIntroPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallRACertStatusPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallRACertStatusPage.java
index 326f5067a..326f5067a 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallRACertStatusPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallRACertStatusPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallRAIntroPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallRAIntroPage.java
index d3d48492c..d3d48492c 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallRAIntroPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallRAIntroPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallSSLCertStatusPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallSSLCertStatusPage.java
index 27ca1755f..27ca1755f 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallSSLCertStatusPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallSSLCertStatusPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallSSLIntroPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallSSLIntroPage.java
index 7115f96bf..7115f96bf 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallSSLIntroPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallSSLIntroPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIInternalDBInfoPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIInternalDBInfoPage.java
index 5338e820d..5338e820d 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIInternalDBInfoPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIInternalDBInfoPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIInternalDBPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIInternalDBPage.java
index 936d252d8..936d252d8 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIInternalDBPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIInternalDBPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIInternalTokenLogonPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIInternalTokenLogonPage.java
index 3bc9bd2f3..3bc9bd2f3 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIInternalTokenLogonPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIInternalTokenLogonPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIIntroMigrationPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIIntroMigrationPage.java
index 616911252..616911252 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIIntroMigrationPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIIntroMigrationPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIIntroPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIIntroPage.java
index 208a92cb8..208a92cb8 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIIntroPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIIntroPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIIntroSingleSignonPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIIntroSingleSignonPage.java
index 659dd6969..659dd6969 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIIntroSingleSignonPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIIntroSingleSignonPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIKRACertDNPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIKRACertDNPage.java
index 2dca713b5..2dca713b5 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIKRACertDNPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIKRACertDNPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIKRACertExtensionPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIKRACertExtensionPage.java
index 2b1f0dc99..2b1f0dc99 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIKRACertExtensionPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIKRACertExtensionPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIKRACertSubmitPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIKRACertSubmitPage.java
index 992bd7f14..992bd7f14 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIKRACertSubmitPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIKRACertSubmitPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIKRACertValidityPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIKRACertValidityPage.java
index feaa29983..feaa29983 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIKRACertValidityPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIKRACertValidityPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIKRAKeyPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIKRAKeyPage.java
index 00b12d43c..00b12d43c 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIKRAKeyPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIKRAKeyPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIKRAMessageDigestPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIKRAMessageDigestPage.java
index 38941ec7b..38941ec7b 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIKRAMessageDigestPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIKRAMessageDigestPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIKRANumberPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIKRANumberPage.java
index 000b3eb9f..000b3eb9f 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIKRANumberPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIKRANumberPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIKRARequestResultPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIKRARequestResultPage.java
index 1580b7101..1580b7101 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIKRARequestResultPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIKRARequestResultPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIKRAScheme1Page.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIKRAScheme1Page.java
index d6171e651..d6171e651 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIKRAScheme1Page.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIKRAScheme1Page.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIKRAScheme2Page.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIKRAScheme2Page.java
index f8c9c9f8e..f8c9c9f8e 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIKRAScheme2Page.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIKRAScheme2Page.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIKRAStorageKeyPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIKRAStorageKeyPage.java
index 6cce19d95..6cce19d95 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIKRAStorageKeyPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIKRAStorageKeyPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIKRATokenLogonPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIKRATokenLogonPage.java
index 82857a154..82857a154 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIKRATokenLogonPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIKRATokenLogonPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIKeyPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIKeyPage.java
index d67d0e339..d67d0e339 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIKeyPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIKeyPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WILDAPPublishingPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WILDAPPublishingPage.java
index 5cb6b3db3..5cb6b3db3 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WILDAPPublishingPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WILDAPPublishingPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WILoggingPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WILoggingPage.java
index a28a4795d..a28a4795d 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WILoggingPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WILoggingPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WILogonAllTokensPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WILogonAllTokensPage.java
index 9a8060b30..9a8060b30 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WILogonAllTokensPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WILogonAllTokensPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIManualCACertRequestPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIManualCACertRequestPage.java
index cb1e092de..cb1e092de 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIManualCACertRequestPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIManualCACertRequestPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIManualCertRequestPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIManualCertRequestPage.java
index 37adddb98..37adddb98 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIManualCertRequestPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIManualCertRequestPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIManualKRACertRequestPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIManualKRACertRequestPage.java
index c1355b3d5..c1355b3d5 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIManualKRACertRequestPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIManualKRACertRequestPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIManualOCSPCertRequestPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIManualOCSPCertRequestPage.java
index 268c6c395..268c6c395 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIManualOCSPCertRequestPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIManualOCSPCertRequestPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIManualRACertRequestPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIManualRACertRequestPage.java
index 7439ed7b5..7439ed7b5 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIManualRACertRequestPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIManualRACertRequestPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIManualSSLCertRequestPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIManualSSLCertRequestPage.java
index f96ea5208..f96ea5208 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIManualSSLCertRequestPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIManualSSLCertRequestPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIMasterOrClone.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIMasterOrClone.java
index 96c764381..96c764381 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIMasterOrClone.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIMasterOrClone.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIMigrationPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIMigrationPage.java
index ab9bcebb9..ab9bcebb9 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIMigrationPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIMigrationPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WINetworkPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WINetworkPage.java
index 823980d56..823980d56 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WINetworkPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WINetworkPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIOCSPCertDNPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIOCSPCertDNPage.java
index d13124de6..d13124de6 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIOCSPCertDNPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIOCSPCertDNPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIOCSPCertSubmitPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIOCSPCertSubmitPage.java
index dd58b5f1a..dd58b5f1a 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIOCSPCertSubmitPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIOCSPCertSubmitPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIOCSPKeyPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIOCSPKeyPage.java
index a49b428a7..a49b428a7 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIOCSPKeyPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIOCSPKeyPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIOCSPMessageDigestPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIOCSPMessageDigestPage.java
index ec250dcd1..ec250dcd1 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIOCSPMessageDigestPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIOCSPMessageDigestPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIOCSPRequestResultPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIOCSPRequestResultPage.java
index a94fbf6e3..a94fbf6e3 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIOCSPRequestResultPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIOCSPRequestResultPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIOCSPTokenLogonPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIOCSPTokenLogonPage.java
index aa4be933a..aa4be933a 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIOCSPTokenLogonPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIOCSPTokenLogonPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIPasteCACertPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIPasteCACertPage.java
index 816554588..816554588 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIPasteCACertPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIPasteCACertPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIPasteCertPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIPasteCertPage.java
index 063382f32..063382f32 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIPasteCertPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIPasteCertPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIPasteKRACertPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIPasteKRACertPage.java
index 7166d64bf..7166d64bf 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIPasteKRACertPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIPasteKRACertPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIPasteOCSPCertPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIPasteOCSPCertPage.java
index 783d87da7..783d87da7 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIPasteOCSPCertPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIPasteOCSPCertPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIPasteRACertPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIPasteRACertPage.java
index 584c375d4..584c375d4 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIPasteRACertPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIPasteRACertPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIPasteSSLCertPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIPasteSSLCertPage.java
index bf133bc15..bf133bc15 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIPasteSSLCertPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIPasteSSLCertPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIRACertDNPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIRACertDNPage.java
index 788fab869..788fab869 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIRACertDNPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIRACertDNPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIRACertExtensionPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIRACertExtensionPage.java
index 85553c5c7..85553c5c7 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIRACertExtensionPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIRACertExtensionPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIRACertSubmitPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIRACertSubmitPage.java
index 771aa51b3..771aa51b3 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIRACertSubmitPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIRACertSubmitPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIRACertValidityPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIRACertValidityPage.java
index fec7619df..fec7619df 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIRACertValidityPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIRACertValidityPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIRAKeyPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIRAKeyPage.java
index 9abb9e0ac..9abb9e0ac 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIRAKeyPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIRAKeyPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIRAMessageDigestPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIRAMessageDigestPage.java
index ef843ba37..ef843ba37 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIRAMessageDigestPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIRAMessageDigestPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIRARequestResultPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIRARequestResultPage.java
index 36c81b7d9..36c81b7d9 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIRARequestResultPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIRARequestResultPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIRATokenLogonPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIRATokenLogonPage.java
index d6f9dbafe..d6f9dbafe 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIRATokenLogonPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIRATokenLogonPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIRecreateDBPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIRecreateDBPage.java
index f07de3134..f07de3134 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIRecreateDBPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIRecreateDBPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIRemoteCASubsystem.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIRemoteCASubsystem.java
index 890c8ce4b..890c8ce4b 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIRemoteCASubsystem.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIRemoteCASubsystem.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIRemoteKRASubsystem.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIRemoteKRASubsystem.java
index 29beb04af..29beb04af 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIRemoteKRASubsystem.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIRemoteKRASubsystem.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIReplAgreementPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIReplAgreementPage.java
index df9bb1ab0..df9bb1ab0 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIReplAgreementPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIReplAgreementPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIRequestResultPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIRequestResultPage.java
index e3f9c53f3..e3f9c53f3 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIRequestResultPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIRequestResultPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WISMTPPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WISMTPPage.java
index 3b7ba9d00..3b7ba9d00 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WISMTPPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WISMTPPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WISSLMessageDigestPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WISSLMessageDigestPage.java
index 820c17646..820c17646 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WISSLMessageDigestPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WISSLMessageDigestPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WISSLRequestResultPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WISSLRequestResultPage.java
index 119221105..119221105 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WISSLRequestResultPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WISSLRequestResultPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WISSLTokenLogonPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WISSLTokenLogonPage.java
index ff1ed7826..ff1ed7826 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WISSLTokenLogonPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WISSLTokenLogonPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIServerCertDNPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIServerCertDNPage.java
index b6ee85acc..b6ee85acc 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIServerCertDNPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIServerCertDNPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIServerCertExtensionPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIServerCertExtensionPage.java
index f958c88a1..f958c88a1 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIServerCertExtensionPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIServerCertExtensionPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIServerCertSubmitPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIServerCertSubmitPage.java
index 417e706a5..417e706a5 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIServerCertSubmitPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIServerCertSubmitPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIServerCertValidityPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIServerCertValidityPage.java
index 047b9d7e8..047b9d7e8 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIServerCertValidityPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIServerCertValidityPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIServerKeyPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIServerKeyPage.java
index c14d0d2b3..c14d0d2b3 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIServerKeyPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIServerKeyPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIServicesPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIServicesPage.java
index fb524e62f..fb524e62f 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIServicesPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIServicesPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WISingleSignonPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WISingleSignonPage.java
index 49e06ac1e..49e06ac1e 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WISingleSignonPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WISingleSignonPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WITokenLogonPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WITokenLogonPage.java
index b3ecdbf5a..b3ecdbf5a 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WITokenLogonPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WITokenLogonPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WITrustDBPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WITrustDBPage.java
index cd19963ff..cd19963ff 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WITrustDBPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/install/WITrustDBPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/connection/AdminConnection.java b/base/console/src/com/netscape/admin/certsrv/connection/AdminConnection.java
index acb023132..acb023132 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/connection/AdminConnection.java
+++ b/base/console/src/com/netscape/admin/certsrv/connection/AdminConnection.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/connection/BasicAuthenticator.java b/base/console/src/com/netscape/admin/certsrv/connection/BasicAuthenticator.java
index 1d3796968..1d3796968 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/connection/BasicAuthenticator.java
+++ b/base/console/src/com/netscape/admin/certsrv/connection/BasicAuthenticator.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/connection/IAuthenticator.java b/base/console/src/com/netscape/admin/certsrv/connection/IAuthenticator.java
index c91b7d8bc..c91b7d8bc 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/connection/IAuthenticator.java
+++ b/base/console/src/com/netscape/admin/certsrv/connection/IAuthenticator.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/connection/IConnection.java b/base/console/src/com/netscape/admin/certsrv/connection/IConnection.java
index 0643e50eb..0643e50eb 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/connection/IConnection.java
+++ b/base/console/src/com/netscape/admin/certsrv/connection/IConnection.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/connection/IConnectionFactory.java b/base/console/src/com/netscape/admin/certsrv/connection/IConnectionFactory.java
index 4c8573f23..4c8573f23 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/connection/IConnectionFactory.java
+++ b/base/console/src/com/netscape/admin/certsrv/connection/IConnectionFactory.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/connection/JSSConnection.java b/base/console/src/com/netscape/admin/certsrv/connection/JSSConnection.java
index 27292b3d9..27292b3d9 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/connection/JSSConnection.java
+++ b/base/console/src/com/netscape/admin/certsrv/connection/JSSConnection.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/connection/PromptForTrustDialog.java b/base/console/src/com/netscape/admin/certsrv/connection/PromptForTrustDialog.java
index 868eccc1b..868eccc1b 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/connection/PromptForTrustDialog.java
+++ b/base/console/src/com/netscape/admin/certsrv/connection/PromptForTrustDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/connection/Request.java b/base/console/src/com/netscape/admin/certsrv/connection/Request.java
index 8ed61e998..8ed61e998 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/connection/Request.java
+++ b/base/console/src/com/netscape/admin/certsrv/connection/Request.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/connection/Response.java b/base/console/src/com/netscape/admin/certsrv/connection/Response.java
index bbb511443..bbb511443 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/connection/Response.java
+++ b/base/console/src/com/netscape/admin/certsrv/connection/Response.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/connection/SSLConnectionFactory.java b/base/console/src/com/netscape/admin/certsrv/connection/SSLConnectionFactory.java
index 7c74a239d..7c74a239d 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/connection/SSLConnectionFactory.java
+++ b/base/console/src/com/netscape/admin/certsrv/connection/SSLConnectionFactory.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/images/CertificateServer.gif b/base/console/src/com/netscape/admin/certsrv/images/CertificateServer.gif
index ed84e0540..ed84e0540 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/images/CertificateServer.gif
+++ b/base/console/src/com/netscape/admin/certsrv/images/CertificateServer.gif
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/images/CertificateServerL.gif b/base/console/src/com/netscape/admin/certsrv/images/CertificateServerL.gif
index 99e27663a..99e27663a 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/images/CertificateServerL.gif
+++ b/base/console/src/com/netscape/admin/certsrv/images/CertificateServerL.gif
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/images/LOGobjs.gif b/base/console/src/com/netscape/admin/certsrv/images/LOGobjs.gif
index 05fab2ad7..05fab2ad7 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/images/LOGobjs.gif
+++ b/base/console/src/com/netscape/admin/certsrv/images/LOGobjs.gif
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/images/UGobjs.gif b/base/console/src/com/netscape/admin/certsrv/images/UGobjs.gif
index 7f5ff1ee2..7f5ff1ee2 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/images/UGobjs.gif
+++ b/base/console/src/com/netscape/admin/certsrv/images/UGobjs.gif
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/images/acl.gif b/base/console/src/com/netscape/admin/certsrv/images/acl.gif
index 8c706b81c..8c706b81c 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/images/acl.gif
+++ b/base/console/src/com/netscape/admin/certsrv/images/acl.gif
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/images/aclobj.gif b/base/console/src/com/netscape/admin/certsrv/images/aclobj.gif
index 95eb0e93b..95eb0e93b 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/images/aclobj.gif
+++ b/base/console/src/com/netscape/admin/certsrv/images/aclobj.gif
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/images/aclplugin.gif b/base/console/src/com/netscape/admin/certsrv/images/aclplugin.gif
index 61b75df0e..61b75df0e 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/images/aclplugin.gif
+++ b/base/console/src/com/netscape/admin/certsrv/images/aclplugin.gif
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/images/alertl.gif b/base/console/src/com/netscape/admin/certsrv/images/alertl.gif
index 453d1b2bd..453d1b2bd 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/images/alertl.gif
+++ b/base/console/src/com/netscape/admin/certsrv/images/alertl.gif
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/images/allfolder16n.gif b/base/console/src/com/netscape/admin/certsrv/images/allfolder16n.gif
index 50bb5c4d0..50bb5c4d0 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/images/allfolder16n.gif
+++ b/base/console/src/com/netscape/admin/certsrv/images/allfolder16n.gif
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/images/allgroup16n.gif b/base/console/src/com/netscape/admin/certsrv/images/allgroup16n.gif
index 45a69a7be..45a69a7be 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/images/allgroup16n.gif
+++ b/base/console/src/com/netscape/admin/certsrv/images/allgroup16n.gif
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/images/alllogdoc16n.gif b/base/console/src/com/netscape/admin/certsrv/images/alllogdoc16n.gif
index e517db51c..e517db51c 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/images/alllogdoc16n.gif
+++ b/base/console/src/com/netscape/admin/certsrv/images/alllogdoc16n.gif
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/images/alllogfolder16n.gif b/base/console/src/com/netscape/admin/certsrv/images/alllogfolder16n.gif
index 14453609e..14453609e 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/images/alllogfolder16n.gif
+++ b/base/console/src/com/netscape/admin/certsrv/images/alllogfolder16n.gif
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/images/alluser16n.gif b/base/console/src/com/netscape/admin/certsrv/images/alluser16n.gif
index d37b766f5..d37b766f5 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/images/alluser16n.gif
+++ b/base/console/src/com/netscape/admin/certsrv/images/alluser16n.gif
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/images/alluserwithcert16n.gif b/base/console/src/com/netscape/admin/certsrv/images/alluserwithcert16n.gif
index 69b0da381..69b0da381 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/images/alluserwithcert16n.gif
+++ b/base/console/src/com/netscape/admin/certsrv/images/alluserwithcert16n.gif
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/images/auth.gif b/base/console/src/com/netscape/admin/certsrv/images/auth.gif
index 6ede96ae2..6ede96ae2 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/images/auth.gif
+++ b/base/console/src/com/netscape/admin/certsrv/images/auth.gif
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/images/authobj.gif b/base/console/src/com/netscape/admin/certsrv/images/authobj.gif
index 26f58c19c..26f58c19c 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/images/authobj.gif
+++ b/base/console/src/com/netscape/admin/certsrv/images/authobj.gif
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/images/authplugin.gif b/base/console/src/com/netscape/admin/certsrv/images/authplugin.gif
index b1015ad97..b1015ad97 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/images/authplugin.gif
+++ b/base/console/src/com/netscape/admin/certsrv/images/authplugin.gif
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/images/cert24.gif b/base/console/src/com/netscape/admin/certsrv/images/cert24.gif
index 99e27663a..99e27663a 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/images/cert24.gif
+++ b/base/console/src/com/netscape/admin/certsrv/images/cert24.gif
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/images/cert41.gif b/base/console/src/com/netscape/admin/certsrv/images/cert41.gif
index c33d7cfa0..c33d7cfa0 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/images/cert41.gif
+++ b/base/console/src/com/netscape/admin/certsrv/images/cert41.gif
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/images/cert42.gif b/base/console/src/com/netscape/admin/certsrv/images/cert42.gif
index 23f38b9d5..23f38b9d5 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/images/cert42.gif
+++ b/base/console/src/com/netscape/admin/certsrv/images/cert42.gif
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/images/cms-branding.gif b/base/console/src/com/netscape/admin/certsrv/images/cms-branding.gif
index b696929e5..b696929e5 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/images/cms-branding.gif
+++ b/base/console/src/com/netscape/admin/certsrv/images/cms-branding.gif
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/images/error.gif b/base/console/src/com/netscape/admin/certsrv/images/error.gif
index ba9c07e17..ba9c07e17 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/images/error.gif
+++ b/base/console/src/com/netscape/admin/certsrv/images/error.gif
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/images/genobject.gif b/base/console/src/com/netscape/admin/certsrv/images/genobject.gif
index 93f9ab123..93f9ab123 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/images/genobject.gif
+++ b/base/console/src/com/netscape/admin/certsrv/images/genobject.gif
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/images/jobobj.gif b/base/console/src/com/netscape/admin/certsrv/images/jobobj.gif
index 95eb0e93b..95eb0e93b 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/images/jobobj.gif
+++ b/base/console/src/com/netscape/admin/certsrv/images/jobobj.gif
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/images/jobplugin.gif b/base/console/src/com/netscape/admin/certsrv/images/jobplugin.gif
index 61b75df0e..61b75df0e 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/images/jobplugin.gif
+++ b/base/console/src/com/netscape/admin/certsrv/images/jobplugin.gif
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/images/jobs.gif b/base/console/src/com/netscape/admin/certsrv/images/jobs.gif
index 8c706b81c..8c706b81c 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/images/jobs.gif
+++ b/base/console/src/com/netscape/admin/certsrv/images/jobs.gif
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/images/ldapub.gif b/base/console/src/com/netscape/admin/certsrv/images/ldapub.gif
index c709d2b62..c709d2b62 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/images/ldapub.gif
+++ b/base/console/src/com/netscape/admin/certsrv/images/ldapub.gif
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/images/messagel.gif b/base/console/src/com/netscape/admin/certsrv/images/messagel.gif
index e46c67a09..e46c67a09 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/images/messagel.gif
+++ b/base/console/src/com/netscape/admin/certsrv/images/messagel.gif
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/images/notsecure.gif b/base/console/src/com/netscape/admin/certsrv/images/notsecure.gif
index 4c52ba9d9..4c52ba9d9 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/images/notsecure.gif
+++ b/base/console/src/com/netscape/admin/certsrv/images/notsecure.gif
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/images/plug.gif b/base/console/src/com/netscape/admin/certsrv/images/plug.gif
index 83a230d4d..83a230d4d 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/images/plug.gif
+++ b/base/console/src/com/netscape/admin/certsrv/images/plug.gif
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/images/plugin.gif b/base/console/src/com/netscape/admin/certsrv/images/plugin.gif
index a12b2cd0e..a12b2cd0e 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/images/plugin.gif
+++ b/base/console/src/com/netscape/admin/certsrv/images/plugin.gif
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/images/pluginfolder.gif b/base/console/src/com/netscape/admin/certsrv/images/pluginfolder.gif
index 3499e9077..3499e9077 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/images/pluginfolder.gif
+++ b/base/console/src/com/netscape/admin/certsrv/images/pluginfolder.gif
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/images/red-ball-small.gif b/base/console/src/com/netscape/admin/certsrv/images/red-ball-small.gif
index f6b3c372c..f6b3c372c 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/images/red-ball-small.gif
+++ b/base/console/src/com/netscape/admin/certsrv/images/red-ball-small.gif
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/images/rule-16.gif b/base/console/src/com/netscape/admin/certsrv/images/rule-16.gif
index bbaa218f5..bbaa218f5 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/images/rule-16.gif
+++ b/base/console/src/com/netscape/admin/certsrv/images/rule-16.gif
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/images/ruleDisable-16.gif b/base/console/src/com/netscape/admin/certsrv/images/ruleDisable-16.gif
index c54f5e6bb..c54f5e6bb 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/images/ruleDisable-16.gif
+++ b/base/console/src/com/netscape/admin/certsrv/images/ruleDisable-16.gif
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/images/ruleplugin-16.gif b/base/console/src/com/netscape/admin/certsrv/images/ruleplugin-16.gif
index aa3ba590b..aa3ba590b 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/images/ruleplugin-16.gif
+++ b/base/console/src/com/netscape/admin/certsrv/images/ruleplugin-16.gif
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/images/rulesobj.gif b/base/console/src/com/netscape/admin/certsrv/images/rulesobj.gif
index bdbf3b80c..bdbf3b80c 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/images/rulesobj.gif
+++ b/base/console/src/com/netscape/admin/certsrv/images/rulesobj.gif
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/images/secure.gif b/base/console/src/com/netscape/admin/certsrv/images/secure.gif
index 352ad2f82..352ad2f82 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/images/secure.gif
+++ b/base/console/src/com/netscape/admin/certsrv/images/secure.gif
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/images/servlet-16.gif b/base/console/src/com/netscape/admin/certsrv/images/servlet-16.gif
index 6274a8006..6274a8006 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/images/servlet-16.gif
+++ b/base/console/src/com/netscape/admin/certsrv/images/servlet-16.gif
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/images/servlet-plugin-16.gif b/base/console/src/com/netscape/admin/certsrv/images/servlet-plugin-16.gif
index 8ebbdad58..8ebbdad58 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/images/servlet-plugin-16.gif
+++ b/base/console/src/com/netscape/admin/certsrv/images/servlet-plugin-16.gif
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/images/servletobj.gif b/base/console/src/com/netscape/admin/certsrv/images/servletobj.gif
index 9b83ac34d..9b83ac34d 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/images/servletobj.gif
+++ b/base/console/src/com/netscape/admin/certsrv/images/servletobj.gif
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/keycert/CertSetupWizard.java b/base/console/src/com/netscape/admin/certsrv/keycert/CertSetupWizard.java
index f7650decb..f7650decb 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/keycert/CertSetupWizard.java
+++ b/base/console/src/com/netscape/admin/certsrv/keycert/CertSetupWizard.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/keycert/CertSetupWizardInfo.java b/base/console/src/com/netscape/admin/certsrv/keycert/CertSetupWizardInfo.java
index 81ffc2d0e..81ffc2d0e 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/keycert/CertSetupWizardInfo.java
+++ b/base/console/src/com/netscape/admin/certsrv/keycert/CertSetupWizardInfo.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/keycert/WCACertRequest1Page.java b/base/console/src/com/netscape/admin/certsrv/keycert/WCACertRequest1Page.java
index fe5ebd2d7..fe5ebd2d7 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/keycert/WCACertRequest1Page.java
+++ b/base/console/src/com/netscape/admin/certsrv/keycert/WCACertRequest1Page.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/keycert/WCAKeyPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WCAKeyPage.java
index fe06a6313..fe06a6313 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/keycert/WCAKeyPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/keycert/WCAKeyPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/keycert/WCertDNPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WCertDNPage.java
index 1c2268bb2..1c2268bb2 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/keycert/WCertDNPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/keycert/WCertDNPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/keycert/WCertDNValidityPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WCertDNValidityPage.java
index d6359cf6c..d6359cf6c 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/keycert/WCertDNValidityPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/keycert/WCertDNValidityPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/keycert/WCertExtensionPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WCertExtensionPage.java
index f7505be2e..f7505be2e 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/keycert/WCertExtensionPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/keycert/WCertExtensionPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/keycert/WCertMessageDigestPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WCertMessageDigestPage.java
index a378e91d3..a378e91d3 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/keycert/WCertMessageDigestPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/keycert/WCertMessageDigestPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/keycert/WCertRequestPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WCertRequestPage.java
index 8fa126148..8fa126148 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/keycert/WCertRequestPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/keycert/WCertRequestPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/keycert/WCertTypePage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WCertTypePage.java
index 88350fc32..88350fc32 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/keycert/WCertTypePage.java
+++ b/base/console/src/com/netscape/admin/certsrv/keycert/WCertTypePage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/keycert/WCertValidityPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WCertValidityPage.java
index 8567703d4..8567703d4 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/keycert/WCertValidityPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/keycert/WCertValidityPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/keycert/WDisplayCertPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WDisplayCertPage.java
index a7fe56352..a7fe56352 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/keycert/WDisplayCertPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/keycert/WDisplayCertPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/keycert/WExecute1Page.java b/base/console/src/com/netscape/admin/certsrv/keycert/WExecute1Page.java
index d13bca6e4..d13bca6e4 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/keycert/WExecute1Page.java
+++ b/base/console/src/com/netscape/admin/certsrv/keycert/WExecute1Page.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/keycert/WExecutePage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WExecutePage.java
index a3ce14257..a3ce14257 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/keycert/WExecutePage.java
+++ b/base/console/src/com/netscape/admin/certsrv/keycert/WExecutePage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/keycert/WGenerateReqPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WGenerateReqPage.java
index b2a0005b6..b2a0005b6 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/keycert/WGenerateReqPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/keycert/WGenerateReqPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/keycert/WInstallCertChainPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WInstallCertChainPage.java
index 0ea476b6a..0ea476b6a 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/keycert/WInstallCertChainPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/keycert/WInstallCertChainPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/keycert/WInstallOpPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WInstallOpPage.java
index 5b4d2d340..5b4d2d340 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/keycert/WInstallOpPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/keycert/WInstallOpPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/keycert/WInstallStatusPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WInstallStatusPage.java
index 25022bbb9..25022bbb9 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/keycert/WInstallStatusPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/keycert/WInstallStatusPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/keycert/WIntroInstallCertPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WIntroInstallCertPage.java
index 18c6ef068..18c6ef068 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/keycert/WIntroInstallCertPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/keycert/WIntroInstallCertPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/keycert/WIntroPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WIntroPage.java
index abcec63f3..abcec63f3 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/keycert/WIntroPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/keycert/WIntroPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/keycert/WIssueImportStatusPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WIssueImportStatusPage.java
index 65e02ddd7..65e02ddd7 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/keycert/WIssueImportStatusPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/keycert/WIssueImportStatusPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/keycert/WKeyPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WKeyPage.java
index 40d601c1d..40d601c1d 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/keycert/WKeyPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/keycert/WKeyPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/keycert/WManualCertRequestPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WManualCertRequestPage.java
index 4ad069133..4ad069133 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/keycert/WManualCertRequestPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/keycert/WManualCertRequestPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/keycert/WOperationSelectionPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WOperationSelectionPage.java
index f2cdeff3d..f2cdeff3d 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/keycert/WOperationSelectionPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/keycert/WOperationSelectionPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/keycert/WOtherCertRequest1Page.java b/base/console/src/com/netscape/admin/certsrv/keycert/WOtherCertRequest1Page.java
index 1dbd614d1..1dbd614d1 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/keycert/WOtherCertRequest1Page.java
+++ b/base/console/src/com/netscape/admin/certsrv/keycert/WOtherCertRequest1Page.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/keycert/WPasteCertPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WPasteCertPage.java
index 50e14a50e..50e14a50e 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/keycert/WPasteCertPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/keycert/WPasteCertPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/keycert/WRAKeyPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WRAKeyPage.java
index 616deb74f..616deb74f 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/keycert/WRAKeyPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/keycert/WRAKeyPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/keycert/WRequestStatusPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WRequestStatusPage.java
index a52def44a..a52def44a 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/keycert/WRequestStatusPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/keycert/WRequestStatusPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/keycert/WSSLKeyPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WSSLKeyPage.java
index 7065f68b6..7065f68b6 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/keycert/WSSLKeyPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/keycert/WSSLKeyPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/keycert/WTokenLogonPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WTokenLogonPage.java
index 53a623d0a..53a623d0a 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/keycert/WTokenLogonPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/keycert/WTokenLogonPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/keycert/WTokenSelectionPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WTokenSelectionPage.java
index b595e1ffd..b595e1ffd 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/keycert/WTokenSelectionPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/keycert/WTokenSelectionPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/keycert/WWarningExecute1Page.java b/base/console/src/com/netscape/admin/certsrv/keycert/WWarningExecute1Page.java
index be844576c..be844576c 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/keycert/WWarningExecute1Page.java
+++ b/base/console/src/com/netscape/admin/certsrv/keycert/WWarningExecute1Page.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/keycert/WWarningExecutePage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WWarningExecutePage.java
index a64f67188..a64f67188 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/keycert/WWarningExecutePage.java
+++ b/base/console/src/com/netscape/admin/certsrv/keycert/WWarningExecutePage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/keycert/WWarningPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WWarningPage.java
index 7a4eabe57..7a4eabe57 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/keycert/WWarningPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/keycert/WWarningPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/managecert/CertificateInfoDialog.java b/base/console/src/com/netscape/admin/certsrv/managecert/CertificateInfoDialog.java
index 3a5c43705..3a5c43705 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/managecert/CertificateInfoDialog.java
+++ b/base/console/src/com/netscape/admin/certsrv/managecert/CertificateInfoDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/managecert/ManageCertDialog.java b/base/console/src/com/netscape/admin/certsrv/managecert/ManageCertDialog.java
index 4fd902584..4fd902584 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/managecert/ManageCertDialog.java
+++ b/base/console/src/com/netscape/admin/certsrv/managecert/ManageCertDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/managecert/ManageCertModel.java b/base/console/src/com/netscape/admin/certsrv/managecert/ManageCertModel.java
index 2cae90759..2cae90759 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/managecert/ManageCertModel.java
+++ b/base/console/src/com/netscape/admin/certsrv/managecert/ManageCertModel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/menu/CertManagementAction.java b/base/console/src/com/netscape/admin/certsrv/menu/CertManagementAction.java
index a7300e973..a7300e973 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/menu/CertManagementAction.java
+++ b/base/console/src/com/netscape/admin/certsrv/menu/CertManagementAction.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/menu/KeyCertAction.java b/base/console/src/com/netscape/admin/certsrv/menu/KeyCertAction.java
index e10f92c78..e10f92c78 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/menu/KeyCertAction.java
+++ b/base/console/src/com/netscape/admin/certsrv/menu/KeyCertAction.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/menu/PKCS11ManagementAction.java b/base/console/src/com/netscape/admin/certsrv/menu/PKCS11ManagementAction.java
index 57dde4e66..57dde4e66 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/menu/PKCS11ManagementAction.java
+++ b/base/console/src/com/netscape/admin/certsrv/menu/PKCS11ManagementAction.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/menu/RefreshTabPane.java b/base/console/src/com/netscape/admin/certsrv/menu/RefreshTabPane.java
index f52a7f1a6..f52a7f1a6 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/menu/RefreshTabPane.java
+++ b/base/console/src/com/netscape/admin/certsrv/menu/RefreshTabPane.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/misc/MessageFormatter.java b/base/console/src/com/netscape/admin/certsrv/misc/MessageFormatter.java
index 1ec1e72ba..1ec1e72ba 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/misc/MessageFormatter.java
+++ b/base/console/src/com/netscape/admin/certsrv/misc/MessageFormatter.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/notification/RequestCompletePanel.java b/base/console/src/com/netscape/admin/certsrv/notification/RequestCompletePanel.java
index c01407193..c01407193 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/notification/RequestCompletePanel.java
+++ b/base/console/src/com/netscape/admin/certsrv/notification/RequestCompletePanel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/notification/RequestInQPanel.java b/base/console/src/com/netscape/admin/certsrv/notification/RequestInQPanel.java
index aa37ed149..aa37ed149 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/notification/RequestInQPanel.java
+++ b/base/console/src/com/netscape/admin/certsrv/notification/RequestInQPanel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/notification/RequestRevokedPanel.java b/base/console/src/com/netscape/admin/certsrv/notification/RequestRevokedPanel.java
index 60b0e2949..60b0e2949 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/notification/RequestRevokedPanel.java
+++ b/base/console/src/com/netscape/admin/certsrv/notification/RequestRevokedPanel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/security/AbstractCipher.java b/base/console/src/com/netscape/admin/certsrv/security/AbstractCipher.java
index ec330fc0c..ec330fc0c 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/security/AbstractCipher.java
+++ b/base/console/src/com/netscape/admin/certsrv/security/AbstractCipher.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/security/AbstractCipherPreference.java b/base/console/src/com/netscape/admin/certsrv/security/AbstractCipherPreference.java
index c9e92561f..c9e92561f 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/security/AbstractCipherPreference.java
+++ b/base/console/src/com/netscape/admin/certsrv/security/AbstractCipherPreference.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/security/CRLAddCertDialog.java b/base/console/src/com/netscape/admin/certsrv/security/CRLAddCertDialog.java
index 7982d310d..7982d310d 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/security/CRLAddCertDialog.java
+++ b/base/console/src/com/netscape/admin/certsrv/security/CRLAddCertDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/security/CRLCertInfoPane.java b/base/console/src/com/netscape/admin/certsrv/security/CRLCertInfoPane.java
index 8e1b99b22..8e1b99b22 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/security/CRLCertInfoPane.java
+++ b/base/console/src/com/netscape/admin/certsrv/security/CRLCertInfoPane.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/security/CRLDeleteCertDialog.java b/base/console/src/com/netscape/admin/certsrv/security/CRLDeleteCertDialog.java
index 6b1132ced..6b1132ced 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/security/CRLDeleteCertDialog.java
+++ b/base/console/src/com/netscape/admin/certsrv/security/CRLDeleteCertDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/security/CRLManagementDialog.java b/base/console/src/com/netscape/admin/certsrv/security/CRLManagementDialog.java
index f284fbb9c..f284fbb9c 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/security/CRLManagementDialog.java
+++ b/base/console/src/com/netscape/admin/certsrv/security/CRLManagementDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/security/CRLTable.java b/base/console/src/com/netscape/admin/certsrv/security/CRLTable.java
index b56a3c585..b56a3c585 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/security/CRLTable.java
+++ b/base/console/src/com/netscape/admin/certsrv/security/CRLTable.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/security/CRLTableModel.java b/base/console/src/com/netscape/admin/certsrv/security/CRLTableModel.java
index 4fe7ded08..4fe7ded08 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/security/CRLTableModel.java
+++ b/base/console/src/com/netscape/admin/certsrv/security/CRLTableModel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/security/CertBasicInfo.java b/base/console/src/com/netscape/admin/certsrv/security/CertBasicInfo.java
index 0d746324d..0d746324d 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/security/CertBasicInfo.java
+++ b/base/console/src/com/netscape/admin/certsrv/security/CertBasicInfo.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/security/CertDetailInfoDialog.java b/base/console/src/com/netscape/admin/certsrv/security/CertDetailInfoDialog.java
index 3c1e39821..3c1e39821 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/security/CertDetailInfoDialog.java
+++ b/base/console/src/com/netscape/admin/certsrv/security/CertDetailInfoDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/security/CertInfo.java b/base/console/src/com/netscape/admin/certsrv/security/CertInfo.java
index 40cd071d4..40cd071d4 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/security/CertInfo.java
+++ b/base/console/src/com/netscape/admin/certsrv/security/CertInfo.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/security/CertInfoDialog.java b/base/console/src/com/netscape/admin/certsrv/security/CertInfoDialog.java
index 910d38a9c..910d38a9c 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/security/CertInfoDialog.java
+++ b/base/console/src/com/netscape/admin/certsrv/security/CertInfoDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/security/CertInstallCertInfoPane.java b/base/console/src/com/netscape/admin/certsrv/security/CertInstallCertInfoPane.java
index 2f43e9f32..2f43e9f32 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/security/CertInstallCertInfoPane.java
+++ b/base/console/src/com/netscape/admin/certsrv/security/CertInstallCertInfoPane.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/security/CertInstallCertPane.java b/base/console/src/com/netscape/admin/certsrv/security/CertInstallCertPane.java
index 210cfc9bf..210cfc9bf 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/security/CertInstallCertPane.java
+++ b/base/console/src/com/netscape/admin/certsrv/security/CertInstallCertPane.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/security/CertInstallTypePane.java b/base/console/src/com/netscape/admin/certsrv/security/CertInstallTypePane.java
index a55fce2ec..a55fce2ec 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/security/CertInstallTypePane.java
+++ b/base/console/src/com/netscape/admin/certsrv/security/CertInstallTypePane.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/security/CertListTable.java b/base/console/src/com/netscape/admin/certsrv/security/CertListTable.java
index 62f58d9c2..62f58d9c2 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/security/CertListTable.java
+++ b/base/console/src/com/netscape/admin/certsrv/security/CertListTable.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/security/CertListTableModel.java b/base/console/src/com/netscape/admin/certsrv/security/CertListTableModel.java
index fb9423093..fb9423093 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/security/CertListTableModel.java
+++ b/base/console/src/com/netscape/admin/certsrv/security/CertListTableModel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/security/CertManagementDialog.java b/base/console/src/com/netscape/admin/certsrv/security/CertManagementDialog.java
index f780314cd..f780314cd 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/security/CertManagementDialog.java
+++ b/base/console/src/com/netscape/admin/certsrv/security/CertManagementDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/security/CertRequestCertPane.java b/base/console/src/com/netscape/admin/certsrv/security/CertRequestCertPane.java
index 46ae3852f..46ae3852f 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/security/CertRequestCertPane.java
+++ b/base/console/src/com/netscape/admin/certsrv/security/CertRequestCertPane.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/security/CertRequestEnterPasswordPane.java b/base/console/src/com/netscape/admin/certsrv/security/CertRequestEnterPasswordPane.java
index d051ee167..d051ee167 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/security/CertRequestEnterPasswordPane.java
+++ b/base/console/src/com/netscape/admin/certsrv/security/CertRequestEnterPasswordPane.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/security/CertRequestInfoPane.java b/base/console/src/com/netscape/admin/certsrv/security/CertRequestInfoPane.java
index 0bc25ea1a..0bc25ea1a 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/security/CertRequestInfoPane.java
+++ b/base/console/src/com/netscape/admin/certsrv/security/CertRequestInfoPane.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/security/CertRequestSelectTokenPane.java b/base/console/src/com/netscape/admin/certsrv/security/CertRequestSelectTokenPane.java
index cab38e8d3..cab38e8d3 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/security/CertRequestSelectTokenPane.java
+++ b/base/console/src/com/netscape/admin/certsrv/security/CertRequestSelectTokenPane.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/security/CertRequestTypePane.java b/base/console/src/com/netscape/admin/certsrv/security/CertRequestTypePane.java
index cc36771a6..cc36771a6 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/security/CertRequestTypePane.java
+++ b/base/console/src/com/netscape/admin/certsrv/security/CertRequestTypePane.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/security/ChangeKeyPasswordDialog.java b/base/console/src/com/netscape/admin/certsrv/security/ChangeKeyPasswordDialog.java
index f939dfc89..f939dfc89 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/security/ChangeKeyPasswordDialog.java
+++ b/base/console/src/com/netscape/admin/certsrv/security/ChangeKeyPasswordDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/security/CipherEntry.java b/base/console/src/com/netscape/admin/certsrv/security/CipherEntry.java
index 52f23ad4b..52f23ad4b 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/security/CipherEntry.java
+++ b/base/console/src/com/netscape/admin/certsrv/security/CipherEntry.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/security/CipherPreferenceDialog.java b/base/console/src/com/netscape/admin/certsrv/security/CipherPreferenceDialog.java
index 8a3564de0..8a3564de0 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/security/CipherPreferenceDialog.java
+++ b/base/console/src/com/netscape/admin/certsrv/security/CipherPreferenceDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/security/CipherResourceSet.java b/base/console/src/com/netscape/admin/certsrv/security/CipherResourceSet.java
index 3adf50548..3adf50548 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/security/CipherResourceSet.java
+++ b/base/console/src/com/netscape/admin/certsrv/security/CipherResourceSet.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/security/Comm.java b/base/console/src/com/netscape/admin/certsrv/security/Comm.java
index 1bbd022bf..1bbd022bf 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/security/Comm.java
+++ b/base/console/src/com/netscape/admin/certsrv/security/Comm.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/security/CreateTrustPane.java b/base/console/src/com/netscape/admin/certsrv/security/CreateTrustPane.java
index 03b5c32d6..03b5c32d6 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/security/CreateTrustPane.java
+++ b/base/console/src/com/netscape/admin/certsrv/security/CreateTrustPane.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/security/EncryptionPane.java b/base/console/src/com/netscape/admin/certsrv/security/EncryptionPane.java
index 1a472ca76..1a472ca76 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/security/EncryptionPane.java
+++ b/base/console/src/com/netscape/admin/certsrv/security/EncryptionPane.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/security/GuideCertInstallPane.java b/base/console/src/com/netscape/admin/certsrv/security/GuideCertInstallPane.java
index 76580ecf0..76580ecf0 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/security/GuideCertInstallPane.java
+++ b/base/console/src/com/netscape/admin/certsrv/security/GuideCertInstallPane.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/security/GuideCertRequestPane.java b/base/console/src/com/netscape/admin/certsrv/security/GuideCertRequestPane.java
index 51ae0959e..51ae0959e 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/security/GuideCertRequestPane.java
+++ b/base/console/src/com/netscape/admin/certsrv/security/GuideCertRequestPane.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/security/GuideCreateTrustPane.java b/base/console/src/com/netscape/admin/certsrv/security/GuideCreateTrustPane.java
index 9eaf3607f..9eaf3607f 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/security/GuideCreateTrustPane.java
+++ b/base/console/src/com/netscape/admin/certsrv/security/GuideCreateTrustPane.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/security/GuideIntroPane.java b/base/console/src/com/netscape/admin/certsrv/security/GuideIntroPane.java
index 30bc92200..30bc92200 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/security/GuideIntroPane.java
+++ b/base/console/src/com/netscape/admin/certsrv/security/GuideIntroPane.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/security/IAbstractCipherSet.java b/base/console/src/com/netscape/admin/certsrv/security/IAbstractCipherSet.java
index 77ff5072b..77ff5072b 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/security/IAbstractCipherSet.java
+++ b/base/console/src/com/netscape/admin/certsrv/security/IAbstractCipherSet.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/security/ICipherConstants.java b/base/console/src/com/netscape/admin/certsrv/security/ICipherConstants.java
index 42a43c7d5..42a43c7d5 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/security/ICipherConstants.java
+++ b/base/console/src/com/netscape/admin/certsrv/security/ICipherConstants.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/security/IEncryptionPaneListener.java b/base/console/src/com/netscape/admin/certsrv/security/IEncryptionPaneListener.java
index 96d1b4077..96d1b4077 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/security/IEncryptionPaneListener.java
+++ b/base/console/src/com/netscape/admin/certsrv/security/IEncryptionPaneListener.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/security/IKeyCertPage.java b/base/console/src/com/netscape/admin/certsrv/security/IKeyCertPage.java
index 02ec98d9d..02ec98d9d 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/security/IKeyCertPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/security/IKeyCertPage.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/security/KeyCertTaskInfo.java b/base/console/src/com/netscape/admin/certsrv/security/KeyCertTaskInfo.java
index 9ffe7b2b5..9ffe7b2b5 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/security/KeyCertTaskInfo.java
+++ b/base/console/src/com/netscape/admin/certsrv/security/KeyCertTaskInfo.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/security/KeyCertUtility.java b/base/console/src/com/netscape/admin/certsrv/security/KeyCertUtility.java
index 26032fc0f..26032fc0f 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/security/KeyCertUtility.java
+++ b/base/console/src/com/netscape/admin/certsrv/security/KeyCertUtility.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/security/KeyCertWizard.java b/base/console/src/com/netscape/admin/certsrv/security/KeyCertWizard.java
index 017647488..017647488 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/security/KeyCertWizard.java
+++ b/base/console/src/com/netscape/admin/certsrv/security/KeyCertWizard.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/security/Message.java b/base/console/src/com/netscape/admin/certsrv/security/Message.java
index 96f6bc9f7..96f6bc9f7 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/security/Message.java
+++ b/base/console/src/com/netscape/admin/certsrv/security/Message.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/security/MessageDialog.java b/base/console/src/com/netscape/admin/certsrv/security/MessageDialog.java
index d303de839..d303de839 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/security/MessageDialog.java
+++ b/base/console/src/com/netscape/admin/certsrv/security/MessageDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/security/PKCS11AddModuleDialog.java b/base/console/src/com/netscape/admin/certsrv/security/PKCS11AddModuleDialog.java
index 7b5fe12a6..7b5fe12a6 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/security/PKCS11AddModuleDialog.java
+++ b/base/console/src/com/netscape/admin/certsrv/security/PKCS11AddModuleDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/security/PKCS11ManagementDialog.java b/base/console/src/com/netscape/admin/certsrv/security/PKCS11ManagementDialog.java
index 277605fc8..277605fc8 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/security/PKCS11ManagementDialog.java
+++ b/base/console/src/com/netscape/admin/certsrv/security/PKCS11ManagementDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/security/Response.java b/base/console/src/com/netscape/admin/certsrv/security/Response.java
index 5d311d33b..5d311d33b 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/security/Response.java
+++ b/base/console/src/com/netscape/admin/certsrv/security/Response.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/security/SSL2CipherPreference.java b/base/console/src/com/netscape/admin/certsrv/security/SSL2CipherPreference.java
index 4625a11d5..4625a11d5 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/security/SSL2CipherPreference.java
+++ b/base/console/src/com/netscape/admin/certsrv/security/SSL2CipherPreference.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/security/SSL2CipherSet.java b/base/console/src/com/netscape/admin/certsrv/security/SSL2CipherSet.java
index 0bdf7684f..0bdf7684f 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/security/SSL2CipherSet.java
+++ b/base/console/src/com/netscape/admin/certsrv/security/SSL2CipherSet.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/security/SSL3CipherPreference.java b/base/console/src/com/netscape/admin/certsrv/security/SSL3CipherPreference.java
index e6773a27e..e6773a27e 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/security/SSL3CipherPreference.java
+++ b/base/console/src/com/netscape/admin/certsrv/security/SSL3CipherPreference.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/security/SSL3CipherSet.java b/base/console/src/com/netscape/admin/certsrv/security/SSL3CipherSet.java
index 417ce5d49..417ce5d49 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/security/SSL3CipherSet.java
+++ b/base/console/src/com/netscape/admin/certsrv/security/SSL3CipherSet.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/security/StatusPane.java b/base/console/src/com/netscape/admin/certsrv/security/StatusPane.java
index 9eb5b1ba2..9eb5b1ba2 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/security/StatusPane.java
+++ b/base/console/src/com/netscape/admin/certsrv/security/StatusPane.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/security/ToggleCipherPreferencePane.java b/base/console/src/com/netscape/admin/certsrv/security/ToggleCipherPreferencePane.java
index eca1e0b02..eca1e0b02 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/security/ToggleCipherPreferencePane.java
+++ b/base/console/src/com/netscape/admin/certsrv/security/ToggleCipherPreferencePane.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/security/WizardObservable.java b/base/console/src/com/netscape/admin/certsrv/security/WizardObservable.java
index ca36816af..ca36816af 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/security/WizardObservable.java
+++ b/base/console/src/com/netscape/admin/certsrv/security/WizardObservable.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/status/AccessLogDataModel.java b/base/console/src/com/netscape/admin/certsrv/status/AccessLogDataModel.java
index c0edc5270..c0edc5270 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/status/AccessLogDataModel.java
+++ b/base/console/src/com/netscape/admin/certsrv/status/AccessLogDataModel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/status/AuditLogDataModel.java b/base/console/src/com/netscape/admin/certsrv/status/AuditLogDataModel.java
index 39bdffc0e..39bdffc0e 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/status/AuditLogDataModel.java
+++ b/base/console/src/com/netscape/admin/certsrv/status/AuditLogDataModel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/status/CMSLogPanel.java b/base/console/src/com/netscape/admin/certsrv/status/CMSLogPanel.java
index 5329b1148..5329b1148 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/status/CMSLogPanel.java
+++ b/base/console/src/com/netscape/admin/certsrv/status/CMSLogPanel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/status/DefaultLogParser.java b/base/console/src/com/netscape/admin/certsrv/status/DefaultLogParser.java
index b69eac3a6..b69eac3a6 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/status/DefaultLogParser.java
+++ b/base/console/src/com/netscape/admin/certsrv/status/DefaultLogParser.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/status/ErrorLogDataModel.java b/base/console/src/com/netscape/admin/certsrv/status/ErrorLogDataModel.java
index df97978b5..df97978b5 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/status/ErrorLogDataModel.java
+++ b/base/console/src/com/netscape/admin/certsrv/status/ErrorLogDataModel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/status/ILogParser.java b/base/console/src/com/netscape/admin/certsrv/status/ILogParser.java
index c0defd681..c0defd681 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/status/ILogParser.java
+++ b/base/console/src/com/netscape/admin/certsrv/status/ILogParser.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/status/LogDataModel.java b/base/console/src/com/netscape/admin/certsrv/status/LogDataModel.java
index 61d127524..61d127524 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/status/LogDataModel.java
+++ b/base/console/src/com/netscape/admin/certsrv/status/LogDataModel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/status/LogEntryViewDialog.java b/base/console/src/com/netscape/admin/certsrv/status/LogEntryViewDialog.java
index c86ff02ff..c86ff02ff 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/status/LogEntryViewDialog.java
+++ b/base/console/src/com/netscape/admin/certsrv/status/LogEntryViewDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/status/LogInstancePanel.java b/base/console/src/com/netscape/admin/certsrv/status/LogInstancePanel.java
index dc6a8da27..dc6a8da27 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/status/LogInstancePanel.java
+++ b/base/console/src/com/netscape/admin/certsrv/status/LogInstancePanel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/status/StatusPanel.java b/base/console/src/com/netscape/admin/certsrv/status/StatusPanel.java
index 431d0d61f..431d0d61f 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/status/StatusPanel.java
+++ b/base/console/src/com/netscape/admin/certsrv/status/StatusPanel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/task/AuthDialog.java b/base/console/src/com/netscape/admin/certsrv/task/AuthDialog.java
index f4d305096..f4d305096 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/task/AuthDialog.java
+++ b/base/console/src/com/netscape/admin/certsrv/task/AuthDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/task/CGITask.java b/base/console/src/com/netscape/admin/certsrv/task/CGITask.java
index 8406e1005..8406e1005 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/task/CGITask.java
+++ b/base/console/src/com/netscape/admin/certsrv/task/CGITask.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/task/CMSCertRequest.java b/base/console/src/com/netscape/admin/certsrv/task/CMSCertRequest.java
index bf391c4e4..bf391c4e4 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/task/CMSCertRequest.java
+++ b/base/console/src/com/netscape/admin/certsrv/task/CMSCertRequest.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/task/CMSConfigCert.java b/base/console/src/com/netscape/admin/certsrv/task/CMSConfigCert.java
index 7d85d161f..7d85d161f 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/task/CMSConfigCert.java
+++ b/base/console/src/com/netscape/admin/certsrv/task/CMSConfigCert.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/task/CMSImportCert.java b/base/console/src/com/netscape/admin/certsrv/task/CMSImportCert.java
index b285b2284..b285b2284 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/task/CMSImportCert.java
+++ b/base/console/src/com/netscape/admin/certsrv/task/CMSImportCert.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/task/CMSMigrateCreate.java b/base/console/src/com/netscape/admin/certsrv/task/CMSMigrateCreate.java
index c7ff02c36..c7ff02c36 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/task/CMSMigrateCreate.java
+++ b/base/console/src/com/netscape/admin/certsrv/task/CMSMigrateCreate.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/task/CMSRemove.java b/base/console/src/com/netscape/admin/certsrv/task/CMSRemove.java
index 57473c5e0..57473c5e0 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/task/CMSRemove.java
+++ b/base/console/src/com/netscape/admin/certsrv/task/CMSRemove.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/task/CMSRequestCert.java b/base/console/src/com/netscape/admin/certsrv/task/CMSRequestCert.java
index 8b3cfef6b..8b3cfef6b 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/task/CMSRequestCert.java
+++ b/base/console/src/com/netscape/admin/certsrv/task/CMSRequestCert.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/task/CMSRestart.java b/base/console/src/com/netscape/admin/certsrv/task/CMSRestart.java
index fa9d59ddd..fa9d59ddd 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/task/CMSRestart.java
+++ b/base/console/src/com/netscape/admin/certsrv/task/CMSRestart.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/task/CMSStart.java b/base/console/src/com/netscape/admin/certsrv/task/CMSStart.java
index 2122145c3..2122145c3 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/task/CMSStart.java
+++ b/base/console/src/com/netscape/admin/certsrv/task/CMSStart.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/task/CMSStartDaemon.java b/base/console/src/com/netscape/admin/certsrv/task/CMSStartDaemon.java
index 510bf0661..510bf0661 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/task/CMSStartDaemon.java
+++ b/base/console/src/com/netscape/admin/certsrv/task/CMSStartDaemon.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/task/CMSStatus.java b/base/console/src/com/netscape/admin/certsrv/task/CMSStatus.java
index edd80b5b2..edd80b5b2 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/task/CMSStatus.java
+++ b/base/console/src/com/netscape/admin/certsrv/task/CMSStatus.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/task/CMSStop.java b/base/console/src/com/netscape/admin/certsrv/task/CMSStop.java
index b2a909633..b2a909633 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/task/CMSStop.java
+++ b/base/console/src/com/netscape/admin/certsrv/task/CMSStop.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/task/CreateInstanceDialog.java b/base/console/src/com/netscape/admin/certsrv/task/CreateInstanceDialog.java
index 3092bf16d..3092bf16d 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/task/CreateInstanceDialog.java
+++ b/base/console/src/com/netscape/admin/certsrv/task/CreateInstanceDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/task/KeyCert.java b/base/console/src/com/netscape/admin/certsrv/task/KeyCert.java
index 589983f61..589983f61 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/task/KeyCert.java
+++ b/base/console/src/com/netscape/admin/certsrv/task/KeyCert.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/task/StatusDialog.java b/base/console/src/com/netscape/admin/certsrv/task/StatusDialog.java
index 0cd11beb5..0cd11beb5 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/task/StatusDialog.java
+++ b/base/console/src/com/netscape/admin/certsrv/task/StatusDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/ug/AuthBaseDialog.java b/base/console/src/com/netscape/admin/certsrv/ug/AuthBaseDialog.java
index 6656b3abb..6656b3abb 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/ug/AuthBaseDialog.java
+++ b/base/console/src/com/netscape/admin/certsrv/ug/AuthBaseDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/ug/AuthConfigDialog.java b/base/console/src/com/netscape/admin/certsrv/ug/AuthConfigDialog.java
index aa756b388..aa756b388 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/ug/AuthConfigDialog.java
+++ b/base/console/src/com/netscape/admin/certsrv/ug/AuthConfigDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/ug/AuthImplDataModel.java b/base/console/src/com/netscape/admin/certsrv/ug/AuthImplDataModel.java
index 98214871e..98214871e 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/ug/AuthImplDataModel.java
+++ b/base/console/src/com/netscape/admin/certsrv/ug/AuthImplDataModel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/ug/AuthImplTab.java b/base/console/src/com/netscape/admin/certsrv/ug/AuthImplTab.java
index 0cc964c60..0cc964c60 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/ug/AuthImplTab.java
+++ b/base/console/src/com/netscape/admin/certsrv/ug/AuthImplTab.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/ug/AuthInstanceTab.java b/base/console/src/com/netscape/admin/certsrv/ug/AuthInstanceTab.java
index 929f99aef..929f99aef 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/ug/AuthInstanceTab.java
+++ b/base/console/src/com/netscape/admin/certsrv/ug/AuthInstanceTab.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/ug/AuthPluginSelectionDialog.java b/base/console/src/com/netscape/admin/certsrv/ug/AuthPluginSelectionDialog.java
index 8721363d1..8721363d1 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/ug/AuthPluginSelectionDialog.java
+++ b/base/console/src/com/netscape/admin/certsrv/ug/AuthPluginSelectionDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/ug/AuthRegisterDialog.java b/base/console/src/com/netscape/admin/certsrv/ug/AuthRegisterDialog.java
index f97a11388..f97a11388 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/ug/AuthRegisterDialog.java
+++ b/base/console/src/com/netscape/admin/certsrv/ug/AuthRegisterDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/ug/AuthRuleDataModel.java b/base/console/src/com/netscape/admin/certsrv/ug/AuthRuleDataModel.java
index 35e08d0eb..35e08d0eb 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/ug/AuthRuleDataModel.java
+++ b/base/console/src/com/netscape/admin/certsrv/ug/AuthRuleDataModel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/ug/AuthViewDialog.java b/base/console/src/com/netscape/admin/certsrv/ug/AuthViewDialog.java
index 6f3ed575a..6f3ed575a 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/ug/AuthViewDialog.java
+++ b/base/console/src/com/netscape/admin/certsrv/ug/AuthViewDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/ug/CMSBaseUGTab.java b/base/console/src/com/netscape/admin/certsrv/ug/CMSBaseUGTab.java
index 8e7fb34dd..8e7fb34dd 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/ug/CMSBaseUGTab.java
+++ b/base/console/src/com/netscape/admin/certsrv/ug/CMSBaseUGTab.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/ug/CMSUGTabPanel.java b/base/console/src/com/netscape/admin/certsrv/ug/CMSUGTabPanel.java
index b2f2b1c37..b2f2b1c37 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/ug/CMSUGTabPanel.java
+++ b/base/console/src/com/netscape/admin/certsrv/ug/CMSUGTabPanel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/ug/CertDataModel.java b/base/console/src/com/netscape/admin/certsrv/ug/CertDataModel.java
index de6a588f6..de6a588f6 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/ug/CertDataModel.java
+++ b/base/console/src/com/netscape/admin/certsrv/ug/CertDataModel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/ug/CertImportDialog.java b/base/console/src/com/netscape/admin/certsrv/ug/CertImportDialog.java
index 758dda109..758dda109 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/ug/CertImportDialog.java
+++ b/base/console/src/com/netscape/admin/certsrv/ug/CertImportDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/ug/CertManagementDialog.java b/base/console/src/com/netscape/admin/certsrv/ug/CertManagementDialog.java
index 82083649e..82083649e 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/ug/CertManagementDialog.java
+++ b/base/console/src/com/netscape/admin/certsrv/ug/CertManagementDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/ug/CertViewDialog.java b/base/console/src/com/netscape/admin/certsrv/ug/CertViewDialog.java
index ae4cfd113..ae4cfd113 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/ug/CertViewDialog.java
+++ b/base/console/src/com/netscape/admin/certsrv/ug/CertViewDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/ug/GroupDataModel.java b/base/console/src/com/netscape/admin/certsrv/ug/GroupDataModel.java
index 779e9903e..779e9903e 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/ug/GroupDataModel.java
+++ b/base/console/src/com/netscape/admin/certsrv/ug/GroupDataModel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/ug/GroupEditor.java b/base/console/src/com/netscape/admin/certsrv/ug/GroupEditor.java
index e9693b15d..e9693b15d 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/ug/GroupEditor.java
+++ b/base/console/src/com/netscape/admin/certsrv/ug/GroupEditor.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/ug/GroupListDataModel.java b/base/console/src/com/netscape/admin/certsrv/ug/GroupListDataModel.java
index 7893d9cb0..7893d9cb0 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/ug/GroupListDataModel.java
+++ b/base/console/src/com/netscape/admin/certsrv/ug/GroupListDataModel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/ug/GroupListDialog.java b/base/console/src/com/netscape/admin/certsrv/ug/GroupListDialog.java
index d5931a6f8..d5931a6f8 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/ug/GroupListDialog.java
+++ b/base/console/src/com/netscape/admin/certsrv/ug/GroupListDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/ug/GroupTab.java b/base/console/src/com/netscape/admin/certsrv/ug/GroupTab.java
index e80cc7047..e80cc7047 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/ug/GroupTab.java
+++ b/base/console/src/com/netscape/admin/certsrv/ug/GroupTab.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/ug/MemberDataModel.java b/base/console/src/com/netscape/admin/certsrv/ug/MemberDataModel.java
index 6b1fbfeec..6b1fbfeec 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/ug/MemberDataModel.java
+++ b/base/console/src/com/netscape/admin/certsrv/ug/MemberDataModel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/ug/UserDataModel.java b/base/console/src/com/netscape/admin/certsrv/ug/UserDataModel.java
index c3b74ce35..c3b74ce35 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/ug/UserDataModel.java
+++ b/base/console/src/com/netscape/admin/certsrv/ug/UserDataModel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/ug/UserEditor.java b/base/console/src/com/netscape/admin/certsrv/ug/UserEditor.java
index 75908fe6a..75908fe6a 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/ug/UserEditor.java
+++ b/base/console/src/com/netscape/admin/certsrv/ug/UserEditor.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/ug/UserListDataModel.java b/base/console/src/com/netscape/admin/certsrv/ug/UserListDataModel.java
index e66c14d94..e66c14d94 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/ug/UserListDataModel.java
+++ b/base/console/src/com/netscape/admin/certsrv/ug/UserListDataModel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/ug/UserListDialog.java b/base/console/src/com/netscape/admin/certsrv/ug/UserListDialog.java
index 6f0c6215b..6f0c6215b 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/ug/UserListDialog.java
+++ b/base/console/src/com/netscape/admin/certsrv/ug/UserListDialog.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/ug/UserTab.java b/base/console/src/com/netscape/admin/certsrv/ug/UserTab.java
index 78b7e5252..78b7e5252 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/ug/UserTab.java
+++ b/base/console/src/com/netscape/admin/certsrv/ug/UserTab.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/wizard/ConfigServlet.java b/base/console/src/com/netscape/admin/certsrv/wizard/ConfigServlet.java
index 5ed3195b9..5ed3195b9 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/wizard/ConfigServlet.java
+++ b/base/console/src/com/netscape/admin/certsrv/wizard/ConfigServlet.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/wizard/IWizardDone.java b/base/console/src/com/netscape/admin/certsrv/wizard/IWizardDone.java
index 5576278c4..5576278c4 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/wizard/IWizardDone.java
+++ b/base/console/src/com/netscape/admin/certsrv/wizard/IWizardDone.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/wizard/IWizardPanel.java b/base/console/src/com/netscape/admin/certsrv/wizard/IWizardPanel.java
index 1b729b70f..1b729b70f 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/wizard/IWizardPanel.java
+++ b/base/console/src/com/netscape/admin/certsrv/wizard/IWizardPanel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/wizard/WizardBasePanel.java b/base/console/src/com/netscape/admin/certsrv/wizard/WizardBasePanel.java
index c31767d99..c31767d99 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/wizard/WizardBasePanel.java
+++ b/base/console/src/com/netscape/admin/certsrv/wizard/WizardBasePanel.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/wizard/WizardInfo.java b/base/console/src/com/netscape/admin/certsrv/wizard/WizardInfo.java
index 5085d43b4..5085d43b4 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/wizard/WizardInfo.java
+++ b/base/console/src/com/netscape/admin/certsrv/wizard/WizardInfo.java
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/wizard/WizardWidget.java b/base/console/src/com/netscape/admin/certsrv/wizard/WizardWidget.java
index c98d37b51..c98d37b51 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/wizard/WizardWidget.java
+++ b/base/console/src/com/netscape/admin/certsrv/wizard/WizardWidget.java
diff --git a/pki/base/console/src/com/netscape/certsrv/common/ConfigConstants.java b/base/console/src/com/netscape/certsrv/common/ConfigConstants.java
index 437974f13..437974f13 100644
--- a/pki/base/console/src/com/netscape/certsrv/common/ConfigConstants.java
+++ b/base/console/src/com/netscape/certsrv/common/ConfigConstants.java
diff --git a/pki/base/console/src/com/netscape/certsrv/common/Constants.java b/base/console/src/com/netscape/certsrv/common/Constants.java
index 6f3e3acdf..6f3e3acdf 100644
--- a/pki/base/console/src/com/netscape/certsrv/common/Constants.java
+++ b/base/console/src/com/netscape/certsrv/common/Constants.java
diff --git a/pki/base/console/src/com/netscape/certsrv/common/DestDef.java b/base/console/src/com/netscape/certsrv/common/DestDef.java
index 313ed9d22..313ed9d22 100644
--- a/pki/base/console/src/com/netscape/certsrv/common/DestDef.java
+++ b/base/console/src/com/netscape/certsrv/common/DestDef.java
diff --git a/pki/base/console/src/com/netscape/certsrv/common/NameValuePairs.java b/base/console/src/com/netscape/certsrv/common/NameValuePairs.java
index 5e7d79cde..5e7d79cde 100644
--- a/pki/base/console/src/com/netscape/certsrv/common/NameValuePairs.java
+++ b/base/console/src/com/netscape/certsrv/common/NameValuePairs.java
diff --git a/pki/base/console/src/com/netscape/certsrv/common/OpDef.java b/base/console/src/com/netscape/certsrv/common/OpDef.java
index 734cd75d3..734cd75d3 100644
--- a/pki/base/console/src/com/netscape/certsrv/common/OpDef.java
+++ b/base/console/src/com/netscape/certsrv/common/OpDef.java
diff --git a/pki/base/console/src/com/netscape/certsrv/common/PrefixDef.java b/base/console/src/com/netscape/certsrv/common/PrefixDef.java
index b4476a9d9..b4476a9d9 100644
--- a/pki/base/console/src/com/netscape/certsrv/common/PrefixDef.java
+++ b/base/console/src/com/netscape/certsrv/common/PrefixDef.java
diff --git a/pki/base/console/src/com/netscape/certsrv/common/ScopeDef.java b/base/console/src/com/netscape/certsrv/common/ScopeDef.java
index b3e4a79a6..b3e4a79a6 100644
--- a/pki/base/console/src/com/netscape/certsrv/common/ScopeDef.java
+++ b/base/console/src/com/netscape/certsrv/common/ScopeDef.java
diff --git a/pki/base/console/src/com/netscape/certsrv/common/TaskId.java b/base/console/src/com/netscape/certsrv/common/TaskId.java
index 6e093d5eb..6e093d5eb 100644
--- a/pki/base/console/src/com/netscape/certsrv/common/TaskId.java
+++ b/base/console/src/com/netscape/certsrv/common/TaskId.java
diff --git a/pki/base/console/templates/CMakeLists.txt b/base/console/templates/CMakeLists.txt
index 7978c7491..7978c7491 100644
--- a/pki/base/console/templates/CMakeLists.txt
+++ b/base/console/templates/CMakeLists.txt
diff --git a/pki/base/console/templates/pki_console_wrapper b/base/console/templates/pki_console_wrapper
index eec4725b6..eec4725b6 100755
--- a/pki/base/console/templates/pki_console_wrapper
+++ b/base/console/templates/pki_console_wrapper
diff --git a/pki/base/deploy/CMakeLists.txt b/base/deploy/CMakeLists.txt
index 11d70c55d..11d70c55d 100644
--- a/pki/base/deploy/CMakeLists.txt
+++ b/base/deploy/CMakeLists.txt
diff --git a/pki/base/deploy/LICENSE b/base/deploy/LICENSE
index e281f4362..e281f4362 100644
--- a/pki/base/deploy/LICENSE
+++ b/base/deploy/LICENSE
diff --git a/pki/base/deploy/config/pkideployment.cfg b/base/deploy/config/pkideployment.cfg
index db9ce54dd..db9ce54dd 100644
--- a/pki/base/deploy/config/pkideployment.cfg
+++ b/base/deploy/config/pkideployment.cfg
diff --git a/pki/base/deploy/src/pkidestroy b/base/deploy/src/pkidestroy
index a762e143a..a762e143a 100755
--- a/pki/base/deploy/src/pkidestroy
+++ b/base/deploy/src/pkidestroy
diff --git a/pki/base/deploy/src/pkispawn b/base/deploy/src/pkispawn
index a48a4753c..a48a4753c 100755
--- a/pki/base/deploy/src/pkispawn
+++ b/base/deploy/src/pkispawn
diff --git a/pki/base/deploy/src/scriptlets/instance.py b/base/deploy/src/scriptlets/instance.py
index a7ca35c69..a7ca35c69 100644
--- a/pki/base/deploy/src/scriptlets/instance.py
+++ b/base/deploy/src/scriptlets/instance.py
diff --git a/pki/base/deploy/src/scriptlets/pkiconfig.py b/base/deploy/src/scriptlets/pkiconfig.py
index 7d676c00d..7d676c00d 100644
--- a/pki/base/deploy/src/scriptlets/pkiconfig.py
+++ b/base/deploy/src/scriptlets/pkiconfig.py
diff --git a/pki/base/deploy/src/scriptlets/pkihelper.py b/base/deploy/src/scriptlets/pkihelper.py
index ee2bdd249..ee2bdd249 100644
--- a/pki/base/deploy/src/scriptlets/pkihelper.py
+++ b/base/deploy/src/scriptlets/pkihelper.py
diff --git a/pki/base/deploy/src/scriptlets/pkilogging.py b/base/deploy/src/scriptlets/pkilogging.py
index 776677cfd..776677cfd 100644
--- a/pki/base/deploy/src/scriptlets/pkilogging.py
+++ b/base/deploy/src/scriptlets/pkilogging.py
diff --git a/pki/base/deploy/src/scriptlets/pkimessages.py b/base/deploy/src/scriptlets/pkimessages.py
index e6a9f95aa..e6a9f95aa 100644
--- a/pki/base/deploy/src/scriptlets/pkimessages.py
+++ b/base/deploy/src/scriptlets/pkimessages.py
diff --git a/pki/base/deploy/src/scriptlets/pkiscriptlet.py b/base/deploy/src/scriptlets/pkiscriptlet.py
index 5befd993a..5befd993a 100644
--- a/pki/base/deploy/src/scriptlets/pkiscriptlet.py
+++ b/base/deploy/src/scriptlets/pkiscriptlet.py
diff --git a/pki/base/deploy/src/scriptlets/security_databases.py b/base/deploy/src/scriptlets/security_databases.py
index af47cbd5d..af47cbd5d 100644
--- a/pki/base/deploy/src/scriptlets/security_databases.py
+++ b/base/deploy/src/scriptlets/security_databases.py
diff --git a/pki/base/java-tools/CMakeLists.txt b/base/java-tools/CMakeLists.txt
index 427ded555..427ded555 100644
--- a/pki/base/java-tools/CMakeLists.txt
+++ b/base/java-tools/CMakeLists.txt
diff --git a/pki/base/java-tools/LICENSE b/base/java-tools/LICENSE
index e281f4362..e281f4362 100644
--- a/pki/base/java-tools/LICENSE
+++ b/base/java-tools/LICENSE
diff --git a/pki/base/java-tools/doc/README b/base/java-tools/doc/README
index fa0af7d4b..fa0af7d4b 100644
--- a/pki/base/java-tools/doc/README
+++ b/base/java-tools/doc/README
diff --git a/pki/base/java-tools/src/CMakeLists.txt b/base/java-tools/src/CMakeLists.txt
index 0411a54c7..0411a54c7 100644
--- a/pki/base/java-tools/src/CMakeLists.txt
+++ b/base/java-tools/src/CMakeLists.txt
diff --git a/pki/base/java-tools/src/com/netscape/cmstools/AtoB.java b/base/java-tools/src/com/netscape/cmstools/AtoB.java
index 48301e492..48301e492 100644
--- a/pki/base/java-tools/src/com/netscape/cmstools/AtoB.java
+++ b/base/java-tools/src/com/netscape/cmstools/AtoB.java
diff --git a/pki/base/java-tools/src/com/netscape/cmstools/AuditVerify.java b/base/java-tools/src/com/netscape/cmstools/AuditVerify.java
index fb23e89fd..fb23e89fd 100644
--- a/pki/base/java-tools/src/com/netscape/cmstools/AuditVerify.java
+++ b/base/java-tools/src/com/netscape/cmstools/AuditVerify.java
diff --git a/pki/base/java-tools/src/com/netscape/cmstools/BtoA.java b/base/java-tools/src/com/netscape/cmstools/BtoA.java
index 4c2e5c22a..4c2e5c22a 100644
--- a/pki/base/java-tools/src/com/netscape/cmstools/BtoA.java
+++ b/base/java-tools/src/com/netscape/cmstools/BtoA.java
diff --git a/pki/base/java-tools/src/com/netscape/cmstools/CMCEnroll.java b/base/java-tools/src/com/netscape/cmstools/CMCEnroll.java
index e2e51a29d..e2e51a29d 100644
--- a/pki/base/java-tools/src/com/netscape/cmstools/CMCEnroll.java
+++ b/base/java-tools/src/com/netscape/cmstools/CMCEnroll.java
diff --git a/pki/base/java-tools/src/com/netscape/cmstools/CMCRequest.java b/base/java-tools/src/com/netscape/cmstools/CMCRequest.java
index 591361149..591361149 100644
--- a/pki/base/java-tools/src/com/netscape/cmstools/CMCRequest.java
+++ b/base/java-tools/src/com/netscape/cmstools/CMCRequest.java
diff --git a/pki/base/java-tools/src/com/netscape/cmstools/CMCResponse.java b/base/java-tools/src/com/netscape/cmstools/CMCResponse.java
index 4d68dd151..4d68dd151 100644
--- a/pki/base/java-tools/src/com/netscape/cmstools/CMCResponse.java
+++ b/base/java-tools/src/com/netscape/cmstools/CMCResponse.java
diff --git a/pki/base/java-tools/src/com/netscape/cmstools/CMCRevoke.java b/base/java-tools/src/com/netscape/cmstools/CMCRevoke.java
index f29984713..f29984713 100644
--- a/pki/base/java-tools/src/com/netscape/cmstools/CMCRevoke.java
+++ b/base/java-tools/src/com/netscape/cmstools/CMCRevoke.java
diff --git a/pki/base/java-tools/src/com/netscape/cmstools/CRMFPopClient.java b/base/java-tools/src/com/netscape/cmstools/CRMFPopClient.java
index c1d463cdb..c1d463cdb 100644
--- a/pki/base/java-tools/src/com/netscape/cmstools/CRMFPopClient.java
+++ b/base/java-tools/src/com/netscape/cmstools/CRMFPopClient.java
diff --git a/pki/base/java-tools/src/com/netscape/cmstools/DRMTool.cfg b/base/java-tools/src/com/netscape/cmstools/DRMTool.cfg
index b43441e19..b43441e19 100644
--- a/pki/base/java-tools/src/com/netscape/cmstools/DRMTool.cfg
+++ b/base/java-tools/src/com/netscape/cmstools/DRMTool.cfg
diff --git a/pki/base/java-tools/src/com/netscape/cmstools/DRMTool.java b/base/java-tools/src/com/netscape/cmstools/DRMTool.java
index e2fd2c538..e2fd2c538 100644
--- a/pki/base/java-tools/src/com/netscape/cmstools/DRMTool.java
+++ b/base/java-tools/src/com/netscape/cmstools/DRMTool.java
diff --git a/pki/base/java-tools/src/com/netscape/cmstools/ExtJoiner.java b/base/java-tools/src/com/netscape/cmstools/ExtJoiner.java
index 48f180add..48f180add 100644
--- a/pki/base/java-tools/src/com/netscape/cmstools/ExtJoiner.java
+++ b/base/java-tools/src/com/netscape/cmstools/ExtJoiner.java
diff --git a/pki/base/java-tools/src/com/netscape/cmstools/GenExtKeyUsage.java b/base/java-tools/src/com/netscape/cmstools/GenExtKeyUsage.java
index 35072aae3..35072aae3 100644
--- a/pki/base/java-tools/src/com/netscape/cmstools/GenExtKeyUsage.java
+++ b/base/java-tools/src/com/netscape/cmstools/GenExtKeyUsage.java
diff --git a/pki/base/java-tools/src/com/netscape/cmstools/GenIssuerAltNameExt.java b/base/java-tools/src/com/netscape/cmstools/GenIssuerAltNameExt.java
index 5c905278f..5c905278f 100644
--- a/pki/base/java-tools/src/com/netscape/cmstools/GenIssuerAltNameExt.java
+++ b/base/java-tools/src/com/netscape/cmstools/GenIssuerAltNameExt.java
diff --git a/pki/base/java-tools/src/com/netscape/cmstools/GenSubjectAltNameExt.java b/base/java-tools/src/com/netscape/cmstools/GenSubjectAltNameExt.java
index 35e07f772..35e07f772 100644
--- a/pki/base/java-tools/src/com/netscape/cmstools/GenSubjectAltNameExt.java
+++ b/base/java-tools/src/com/netscape/cmstools/GenSubjectAltNameExt.java
diff --git a/pki/base/java-tools/src/com/netscape/cmstools/HttpClient.java b/base/java-tools/src/com/netscape/cmstools/HttpClient.java
index c8817b52f..c8817b52f 100644
--- a/pki/base/java-tools/src/com/netscape/cmstools/HttpClient.java
+++ b/base/java-tools/src/com/netscape/cmstools/HttpClient.java
diff --git a/pki/base/java-tools/src/com/netscape/cmstools/OCSPClient.java b/base/java-tools/src/com/netscape/cmstools/OCSPClient.java
index 5b9abe495..5b9abe495 100644
--- a/pki/base/java-tools/src/com/netscape/cmstools/OCSPClient.java
+++ b/base/java-tools/src/com/netscape/cmstools/OCSPClient.java
diff --git a/pki/base/java-tools/src/com/netscape/cmstools/PKCS10Client.java b/base/java-tools/src/com/netscape/cmstools/PKCS10Client.java
index 7cd50a37a..7cd50a37a 100644
--- a/pki/base/java-tools/src/com/netscape/cmstools/PKCS10Client.java
+++ b/base/java-tools/src/com/netscape/cmstools/PKCS10Client.java
diff --git a/pki/base/java-tools/src/com/netscape/cmstools/PKCS12Export.java b/base/java-tools/src/com/netscape/cmstools/PKCS12Export.java
index 8d8e858f2..8d8e858f2 100644
--- a/pki/base/java-tools/src/com/netscape/cmstools/PKCS12Export.java
+++ b/base/java-tools/src/com/netscape/cmstools/PKCS12Export.java
diff --git a/pki/base/java-tools/src/com/netscape/cmstools/PasswordCache.java b/base/java-tools/src/com/netscape/cmstools/PasswordCache.java
index ba7fb72a4..ba7fb72a4 100644
--- a/pki/base/java-tools/src/com/netscape/cmstools/PasswordCache.java
+++ b/base/java-tools/src/com/netscape/cmstools/PasswordCache.java
diff --git a/pki/base/java-tools/src/com/netscape/cmstools/PrettyPrintCert.java b/base/java-tools/src/com/netscape/cmstools/PrettyPrintCert.java
index 382c4e312..382c4e312 100644
--- a/pki/base/java-tools/src/com/netscape/cmstools/PrettyPrintCert.java
+++ b/base/java-tools/src/com/netscape/cmstools/PrettyPrintCert.java
diff --git a/pki/base/java-tools/src/com/netscape/cmstools/PrettyPrintCrl.java b/base/java-tools/src/com/netscape/cmstools/PrettyPrintCrl.java
index 8801b2423..8801b2423 100644
--- a/pki/base/java-tools/src/com/netscape/cmstools/PrettyPrintCrl.java
+++ b/base/java-tools/src/com/netscape/cmstools/PrettyPrintCrl.java
diff --git a/pki/base/java-tools/src/com/netscape/cmstools/TestCRLSigning.java b/base/java-tools/src/com/netscape/cmstools/TestCRLSigning.java
index 369010abf..369010abf 100644
--- a/pki/base/java-tools/src/com/netscape/cmstools/TestCRLSigning.java
+++ b/base/java-tools/src/com/netscape/cmstools/TestCRLSigning.java
diff --git a/pki/base/java-tools/src/com/netscape/cmstools/TokenInfo.java b/base/java-tools/src/com/netscape/cmstools/TokenInfo.java
index fc3d13b42..fc3d13b42 100644
--- a/pki/base/java-tools/src/com/netscape/cmstools/TokenInfo.java
+++ b/base/java-tools/src/com/netscape/cmstools/TokenInfo.java
diff --git a/pki/base/java-tools/templates/CMakeLists.txt b/base/java-tools/templates/CMakeLists.txt
index b7c6e891c..b7c6e891c 100644
--- a/pki/base/java-tools/templates/CMakeLists.txt
+++ b/base/java-tools/templates/CMakeLists.txt
diff --git a/pki/base/java-tools/templates/pki_java_command_wrapper.in b/base/java-tools/templates/pki_java_command_wrapper.in
index b0d406161..b0d406161 100644
--- a/pki/base/java-tools/templates/pki_java_command_wrapper.in
+++ b/base/java-tools/templates/pki_java_command_wrapper.in
diff --git a/pki/base/java-tools/templates/pretty_print_cert_command_wrapper.in b/base/java-tools/templates/pretty_print_cert_command_wrapper.in
index 7f3331357..7f3331357 100644
--- a/pki/base/java-tools/templates/pretty_print_cert_command_wrapper.in
+++ b/base/java-tools/templates/pretty_print_cert_command_wrapper.in
diff --git a/pki/base/java-tools/templates/pretty_print_crl_command_wrapper.in b/base/java-tools/templates/pretty_print_crl_command_wrapper.in
index 95a559503..95a559503 100644
--- a/pki/base/java-tools/templates/pretty_print_crl_command_wrapper.in
+++ b/base/java-tools/templates/pretty_print_crl_command_wrapper.in
diff --git a/pki/base/kra/CMakeLists.txt b/base/kra/CMakeLists.txt
index 0e15b2d52..0e15b2d52 100644
--- a/pki/base/kra/CMakeLists.txt
+++ b/base/kra/CMakeLists.txt
diff --git a/pki/base/kra/LICENSE b/base/kra/LICENSE
index e281f4362..e281f4362 100644
--- a/pki/base/kra/LICENSE
+++ b/base/kra/LICENSE
diff --git a/pki/base/kra/functional/drmclient.py b/base/kra/functional/drmclient.py
index e9b0ccb49..e9b0ccb49 100644
--- a/pki/base/kra/functional/drmclient.py
+++ b/base/kra/functional/drmclient.py
diff --git a/pki/base/kra/functional/drmclient.readme.txt b/base/kra/functional/drmclient.readme.txt
index 833c5ce3c..833c5ce3c 100644
--- a/pki/base/kra/functional/drmclient.readme.txt
+++ b/base/kra/functional/drmclient.readme.txt
diff --git a/pki/base/kra/functional/src/com/netscape/cms/servlet/test/DRMRestClient.java b/base/kra/functional/src/com/netscape/cms/servlet/test/DRMRestClient.java
index 651873b20..651873b20 100644
--- a/pki/base/kra/functional/src/com/netscape/cms/servlet/test/DRMRestClient.java
+++ b/base/kra/functional/src/com/netscape/cms/servlet/test/DRMRestClient.java
diff --git a/pki/base/kra/functional/src/com/netscape/cms/servlet/test/DRMTest.java b/base/kra/functional/src/com/netscape/cms/servlet/test/DRMTest.java
index 8d83247b8..8d83247b8 100644
--- a/pki/base/kra/functional/src/com/netscape/cms/servlet/test/DRMTest.java
+++ b/base/kra/functional/src/com/netscape/cms/servlet/test/DRMTest.java
diff --git a/pki/base/kra/functional/src/com/netscape/cms/servlet/test/GeneratePKIArchiveOptions.java b/base/kra/functional/src/com/netscape/cms/servlet/test/GeneratePKIArchiveOptions.java
index 604430b57..604430b57 100644
--- a/pki/base/kra/functional/src/com/netscape/cms/servlet/test/GeneratePKIArchiveOptions.java
+++ b/base/kra/functional/src/com/netscape/cms/servlet/test/GeneratePKIArchiveOptions.java
diff --git a/pki/base/kra/setup/CMakeLists.txt b/base/kra/setup/CMakeLists.txt
index f5f069cdb..f5f069cdb 100644
--- a/pki/base/kra/setup/CMakeLists.txt
+++ b/base/kra/setup/CMakeLists.txt
diff --git a/pki/base/kra/setup/registry_instance b/base/kra/setup/registry_instance
index 3210b9131..3210b9131 100644
--- a/pki/base/kra/setup/registry_instance
+++ b/base/kra/setup/registry_instance
diff --git a/pki/base/kra/shared/conf/CMakeLists.txt b/base/kra/shared/conf/CMakeLists.txt
index e3cef5915..e3cef5915 100644
--- a/pki/base/kra/shared/conf/CMakeLists.txt
+++ b/base/kra/shared/conf/CMakeLists.txt
diff --git a/pki/base/kra/shared/conf/CS.cfg.in b/base/kra/shared/conf/CS.cfg.in
index a6d49ceb5..a6d49ceb5 100644
--- a/pki/base/kra/shared/conf/CS.cfg.in
+++ b/base/kra/shared/conf/CS.cfg.in
diff --git a/pki/base/kra/shared/conf/acl.ldif b/base/kra/shared/conf/acl.ldif
index 38a9a088c..38a9a088c 100644
--- a/pki/base/kra/shared/conf/acl.ldif
+++ b/base/kra/shared/conf/acl.ldif
diff --git a/pki/base/kra/shared/conf/catalina.policy b/base/kra/shared/conf/catalina.policy
index cf8302cd0..cf8302cd0 100644
--- a/pki/base/kra/shared/conf/catalina.policy
+++ b/base/kra/shared/conf/catalina.policy
diff --git a/pki/base/kra/shared/conf/catalina.properties b/base/kra/shared/conf/catalina.properties
index 70cb7c05e..70cb7c05e 100644
--- a/pki/base/kra/shared/conf/catalina.properties
+++ b/base/kra/shared/conf/catalina.properties
diff --git a/pki/base/kra/shared/conf/context.xml b/base/kra/shared/conf/context.xml
index 8b6fe4905..8b6fe4905 100644
--- a/pki/base/kra/shared/conf/context.xml
+++ b/base/kra/shared/conf/context.xml
diff --git a/pki/base/kra/shared/conf/database.ldif b/base/kra/shared/conf/database.ldif
index 4dfdcea69..4dfdcea69 100644
--- a/pki/base/kra/shared/conf/database.ldif
+++ b/base/kra/shared/conf/database.ldif
diff --git a/pki/base/kra/shared/conf/db.ldif b/base/kra/shared/conf/db.ldif
index c07e9f1a6..c07e9f1a6 100644
--- a/pki/base/kra/shared/conf/db.ldif
+++ b/base/kra/shared/conf/db.ldif
diff --git a/pki/base/kra/shared/conf/index.ldif b/base/kra/shared/conf/index.ldif
index 4bc8aebf9..4bc8aebf9 100644
--- a/pki/base/kra/shared/conf/index.ldif
+++ b/base/kra/shared/conf/index.ldif
diff --git a/pki/base/kra/shared/conf/jk2.manifest b/base/kra/shared/conf/jk2.manifest
index 986d7b874..986d7b874 100644
--- a/pki/base/kra/shared/conf/jk2.manifest
+++ b/base/kra/shared/conf/jk2.manifest
diff --git a/pki/base/kra/shared/conf/jk2.properties b/base/kra/shared/conf/jk2.properties
index 093bae802..093bae802 100644
--- a/pki/base/kra/shared/conf/jk2.properties
+++ b/base/kra/shared/conf/jk2.properties
diff --git a/pki/base/kra/shared/conf/jkconf.ant.xml b/base/kra/shared/conf/jkconf.ant.xml
index 245cf98e2..245cf98e2 100644
--- a/pki/base/kra/shared/conf/jkconf.ant.xml
+++ b/base/kra/shared/conf/jkconf.ant.xml
diff --git a/pki/base/kra/shared/conf/jkconfig.manifest b/base/kra/shared/conf/jkconfig.manifest
index 3ba1f2e3e..3ba1f2e3e 100644
--- a/pki/base/kra/shared/conf/jkconfig.manifest
+++ b/base/kra/shared/conf/jkconfig.manifest
diff --git a/pki/base/kra/shared/conf/logging.properties b/base/kra/shared/conf/logging.properties
index 796cfc071..796cfc071 100644
--- a/pki/base/kra/shared/conf/logging.properties
+++ b/base/kra/shared/conf/logging.properties
diff --git a/pki/base/kra/shared/conf/manager.ldif b/base/kra/shared/conf/manager.ldif
index 52e486987..52e486987 100644
--- a/pki/base/kra/shared/conf/manager.ldif
+++ b/base/kra/shared/conf/manager.ldif
diff --git a/pki/base/kra/shared/conf/schema.ldif b/base/kra/shared/conf/schema.ldif
index 70578e21c..70578e21c 100644
--- a/pki/base/kra/shared/conf/schema.ldif
+++ b/base/kra/shared/conf/schema.ldif
diff --git a/pki/base/kra/shared/conf/server-minimal.xml b/base/kra/shared/conf/server-minimal.xml
index 7b542b6cf..7b542b6cf 100644
--- a/pki/base/kra/shared/conf/server-minimal.xml
+++ b/base/kra/shared/conf/server-minimal.xml
diff --git a/pki/base/kra/shared/conf/server.xml b/base/kra/shared/conf/server.xml
index 58121d448..58121d448 100644
--- a/pki/base/kra/shared/conf/server.xml
+++ b/base/kra/shared/conf/server.xml
diff --git a/pki/base/kra/shared/conf/serverCert.profile b/base/kra/shared/conf/serverCert.profile
index adf6ee4ad..adf6ee4ad 100644
--- a/pki/base/kra/shared/conf/serverCert.profile
+++ b/base/kra/shared/conf/serverCert.profile
diff --git a/pki/base/kra/shared/conf/serverCertNick.conf b/base/kra/shared/conf/serverCertNick.conf
index 1b1f4fcad..1b1f4fcad 100644
--- a/pki/base/kra/shared/conf/serverCertNick.conf
+++ b/base/kra/shared/conf/serverCertNick.conf
diff --git a/pki/base/kra/shared/conf/shm.manifest b/base/kra/shared/conf/shm.manifest
index 0505c085b..0505c085b 100644
--- a/pki/base/kra/shared/conf/shm.manifest
+++ b/base/kra/shared/conf/shm.manifest
diff --git a/pki/base/kra/shared/conf/storageCert.profile b/base/kra/shared/conf/storageCert.profile
index fe46c19c1..fe46c19c1 100644
--- a/pki/base/kra/shared/conf/storageCert.profile
+++ b/base/kra/shared/conf/storageCert.profile
diff --git a/pki/base/kra/shared/conf/subsystemCert.profile b/base/kra/shared/conf/subsystemCert.profile
index 1fc1a6f71..1fc1a6f71 100644
--- a/pki/base/kra/shared/conf/subsystemCert.profile
+++ b/base/kra/shared/conf/subsystemCert.profile
diff --git a/pki/base/kra/shared/conf/tomcat-jk2.manifest b/base/kra/shared/conf/tomcat-jk2.manifest
index acfef4a90..acfef4a90 100644
--- a/pki/base/kra/shared/conf/tomcat-jk2.manifest
+++ b/base/kra/shared/conf/tomcat-jk2.manifest
diff --git a/pki/base/kra/shared/conf/tomcat-users.xml b/base/kra/shared/conf/tomcat-users.xml
index daa9260cc..daa9260cc 100644
--- a/pki/base/kra/shared/conf/tomcat-users.xml
+++ b/base/kra/shared/conf/tomcat-users.xml
diff --git a/pki/base/kra/shared/conf/tomcat6.conf b/base/kra/shared/conf/tomcat6.conf
index 2d7def5ec..2d7def5ec 100644
--- a/pki/base/kra/shared/conf/tomcat6.conf
+++ b/base/kra/shared/conf/tomcat6.conf
diff --git a/pki/base/kra/shared/conf/transportCert.profile b/base/kra/shared/conf/transportCert.profile
index aba748bfe..aba748bfe 100644
--- a/pki/base/kra/shared/conf/transportCert.profile
+++ b/base/kra/shared/conf/transportCert.profile
diff --git a/pki/base/kra/shared/conf/uriworkermap.properties b/base/kra/shared/conf/uriworkermap.properties
index c65445b10..c65445b10 100644
--- a/pki/base/kra/shared/conf/uriworkermap.properties
+++ b/base/kra/shared/conf/uriworkermap.properties
diff --git a/pki/base/kra/shared/conf/vlv.ldif b/base/kra/shared/conf/vlv.ldif
index b619e8657..b619e8657 100644
--- a/pki/base/kra/shared/conf/vlv.ldif
+++ b/base/kra/shared/conf/vlv.ldif
diff --git a/pki/base/kra/shared/conf/vlvtasks.ldif b/base/kra/shared/conf/vlvtasks.ldif
index c8a27f170..c8a27f170 100644
--- a/pki/base/kra/shared/conf/vlvtasks.ldif
+++ b/base/kra/shared/conf/vlvtasks.ldif
diff --git a/pki/base/kra/shared/conf/web.xml b/base/kra/shared/conf/web.xml
index fb22468ee..fb22468ee 100644
--- a/pki/base/kra/shared/conf/web.xml
+++ b/base/kra/shared/conf/web.xml
diff --git a/pki/base/kra/shared/conf/workers.properties b/base/kra/shared/conf/workers.properties
index 50d88557f..50d88557f 100644
--- a/pki/base/kra/shared/conf/workers.properties
+++ b/base/kra/shared/conf/workers.properties
diff --git a/pki/base/kra/shared/conf/workers.properties.minimal b/base/kra/shared/conf/workers.properties.minimal
index e3b5942c2..e3b5942c2 100644
--- a/pki/base/kra/shared/conf/workers.properties.minimal
+++ b/base/kra/shared/conf/workers.properties.minimal
diff --git a/pki/base/kra/shared/conf/workers2.properties b/base/kra/shared/conf/workers2.properties
index 778118ff2..778118ff2 100644
--- a/pki/base/kra/shared/conf/workers2.properties
+++ b/base/kra/shared/conf/workers2.properties
diff --git a/pki/base/kra/shared/conf/workers2.properties.minimal b/base/kra/shared/conf/workers2.properties.minimal
index 41a0ba6c1..41a0ba6c1 100644
--- a/pki/base/kra/shared/conf/workers2.properties.minimal
+++ b/base/kra/shared/conf/workers2.properties.minimal
diff --git a/pki/base/kra/shared/etc/init.d/pki-krad b/base/kra/shared/etc/init.d/pki-krad
index fe3f888b1..fe3f888b1 100755
--- a/pki/base/kra/shared/etc/init.d/pki-krad
+++ b/base/kra/shared/etc/init.d/pki-krad
diff --git a/pki/base/kra/shared/lib/systemd/system/pki-krad.target b/base/kra/shared/lib/systemd/system/pki-krad.target
index b7027fc72..b7027fc72 100644
--- a/pki/base/kra/shared/lib/systemd/system/pki-krad.target
+++ b/base/kra/shared/lib/systemd/system/pki-krad.target
diff --git a/pki/base/kra/shared/lib/systemd/system/pki-krad@.service b/base/kra/shared/lib/systemd/system/pki-krad@.service
index 3c4f177a9..3c4f177a9 100644
--- a/pki/base/kra/shared/lib/systemd/system/pki-krad@.service
+++ b/base/kra/shared/lib/systemd/system/pki-krad@.service
diff --git a/pki/base/kra/shared/webapps/ROOT/WEB-INF/web.xml b/base/kra/shared/webapps/ROOT/WEB-INF/web.xml
index 59245836e..59245836e 100644
--- a/pki/base/kra/shared/webapps/ROOT/WEB-INF/web.xml
+++ b/base/kra/shared/webapps/ROOT/WEB-INF/web.xml
diff --git a/pki/base/kra/shared/webapps/ROOT/index.jsp b/base/kra/shared/webapps/ROOT/index.jsp
index 4b2b3c60a..4b2b3c60a 100644
--- a/pki/base/kra/shared/webapps/ROOT/index.jsp
+++ b/base/kra/shared/webapps/ROOT/index.jsp
diff --git a/pki/base/kra/shared/webapps/kra/WEB-INF/auth.properties b/base/kra/shared/webapps/kra/WEB-INF/auth.properties
index a206aa9e4..a206aa9e4 100644
--- a/pki/base/kra/shared/webapps/kra/WEB-INF/auth.properties
+++ b/base/kra/shared/webapps/kra/WEB-INF/auth.properties
diff --git a/pki/base/kra/shared/webapps/kra/WEB-INF/velocity.properties b/base/kra/shared/webapps/kra/WEB-INF/velocity.properties
index 2dfae4bca..2dfae4bca 100644
--- a/pki/base/kra/shared/webapps/kra/WEB-INF/velocity.properties
+++ b/base/kra/shared/webapps/kra/WEB-INF/velocity.properties
diff --git a/pki/base/kra/shared/webapps/kra/WEB-INF/web.xml b/base/kra/shared/webapps/kra/WEB-INF/web.xml
index c6e9934eb..c6e9934eb 100644
--- a/pki/base/kra/shared/webapps/kra/WEB-INF/web.xml
+++ b/base/kra/shared/webapps/kra/WEB-INF/web.xml
diff --git a/pki/base/kra/src/CMakeLists.txt b/base/kra/src/CMakeLists.txt
index df7e1929b..df7e1929b 100644
--- a/pki/base/kra/src/CMakeLists.txt
+++ b/base/kra/src/CMakeLists.txt
diff --git a/pki/base/kra/src/com/netscape/kra/ArchiveOptions.java b/base/kra/src/com/netscape/kra/ArchiveOptions.java
index c4650f17e..c4650f17e 100644
--- a/pki/base/kra/src/com/netscape/kra/ArchiveOptions.java
+++ b/base/kra/src/com/netscape/kra/ArchiveOptions.java
diff --git a/pki/base/kra/src/com/netscape/kra/EncryptionUnit.java b/base/kra/src/com/netscape/kra/EncryptionUnit.java
index 946f57613..946f57613 100644
--- a/pki/base/kra/src/com/netscape/kra/EncryptionUnit.java
+++ b/base/kra/src/com/netscape/kra/EncryptionUnit.java
diff --git a/pki/base/kra/src/com/netscape/kra/EnrollmentService.java b/base/kra/src/com/netscape/kra/EnrollmentService.java
index 37d1aea53..37d1aea53 100644
--- a/pki/base/kra/src/com/netscape/kra/EnrollmentService.java
+++ b/base/kra/src/com/netscape/kra/EnrollmentService.java
diff --git a/pki/base/kra/src/com/netscape/kra/KRANotify.java b/base/kra/src/com/netscape/kra/KRANotify.java
index 29eaf477a..29eaf477a 100644
--- a/pki/base/kra/src/com/netscape/kra/KRANotify.java
+++ b/base/kra/src/com/netscape/kra/KRANotify.java
diff --git a/pki/base/kra/src/com/netscape/kra/KRAPolicy.java b/base/kra/src/com/netscape/kra/KRAPolicy.java
index aa2b2c2de..aa2b2c2de 100644
--- a/pki/base/kra/src/com/netscape/kra/KRAPolicy.java
+++ b/base/kra/src/com/netscape/kra/KRAPolicy.java
diff --git a/pki/base/kra/src/com/netscape/kra/KRAService.java b/base/kra/src/com/netscape/kra/KRAService.java
index 4858e286a..4858e286a 100644
--- a/pki/base/kra/src/com/netscape/kra/KRAService.java
+++ b/base/kra/src/com/netscape/kra/KRAService.java
diff --git a/pki/base/kra/src/com/netscape/kra/KeyRecoveryAuthority.java b/base/kra/src/com/netscape/kra/KeyRecoveryAuthority.java
index 8d8cafb84..8d8cafb84 100644
--- a/pki/base/kra/src/com/netscape/kra/KeyRecoveryAuthority.java
+++ b/base/kra/src/com/netscape/kra/KeyRecoveryAuthority.java
diff --git a/pki/base/kra/src/com/netscape/kra/NetkeyKeygenService.java b/base/kra/src/com/netscape/kra/NetkeyKeygenService.java
index ecce2eaa9..ecce2eaa9 100644
--- a/pki/base/kra/src/com/netscape/kra/NetkeyKeygenService.java
+++ b/base/kra/src/com/netscape/kra/NetkeyKeygenService.java
diff --git a/pki/base/kra/src/com/netscape/kra/RecoveryService.java b/base/kra/src/com/netscape/kra/RecoveryService.java
index c8ecdcf5a..c8ecdcf5a 100644
--- a/pki/base/kra/src/com/netscape/kra/RecoveryService.java
+++ b/base/kra/src/com/netscape/kra/RecoveryService.java
diff --git a/pki/base/kra/src/com/netscape/kra/SecurityDataRecoveryService.java b/base/kra/src/com/netscape/kra/SecurityDataRecoveryService.java
index f96ece890..f96ece890 100644
--- a/pki/base/kra/src/com/netscape/kra/SecurityDataRecoveryService.java
+++ b/base/kra/src/com/netscape/kra/SecurityDataRecoveryService.java
diff --git a/pki/base/kra/src/com/netscape/kra/SecurityDataService.java b/base/kra/src/com/netscape/kra/SecurityDataService.java
index fa009dac9..fa009dac9 100644
--- a/pki/base/kra/src/com/netscape/kra/SecurityDataService.java
+++ b/base/kra/src/com/netscape/kra/SecurityDataService.java
diff --git a/pki/base/kra/src/com/netscape/kra/StorageKeyUnit.java b/base/kra/src/com/netscape/kra/StorageKeyUnit.java
index c956bf8d8..c956bf8d8 100644
--- a/pki/base/kra/src/com/netscape/kra/StorageKeyUnit.java
+++ b/base/kra/src/com/netscape/kra/StorageKeyUnit.java
diff --git a/pki/base/kra/src/com/netscape/kra/TokenKeyRecoveryService.java b/base/kra/src/com/netscape/kra/TokenKeyRecoveryService.java
index 7575ea9f4..7575ea9f4 100644
--- a/pki/base/kra/src/com/netscape/kra/TokenKeyRecoveryService.java
+++ b/base/kra/src/com/netscape/kra/TokenKeyRecoveryService.java
diff --git a/pki/base/kra/src/com/netscape/kra/TransportKeyUnit.java b/base/kra/src/com/netscape/kra/TransportKeyUnit.java
index 90ac2120f..90ac2120f 100644
--- a/pki/base/kra/src/com/netscape/kra/TransportKeyUnit.java
+++ b/base/kra/src/com/netscape/kra/TransportKeyUnit.java
diff --git a/pki/base/migrate/41ToTxt/classes/CMS41LdifParser.class b/base/migrate/41ToTxt/classes/CMS41LdifParser.class
index b787984a2..b787984a2 100644
--- a/pki/base/migrate/41ToTxt/classes/CMS41LdifParser.class
+++ b/base/migrate/41ToTxt/classes/CMS41LdifParser.class
diff --git a/pki/base/migrate/41ToTxt/classes/Main.class b/base/migrate/41ToTxt/classes/Main.class
index 87854eb4d..87854eb4d 100644
--- a/pki/base/migrate/41ToTxt/classes/Main.class
+++ b/base/migrate/41ToTxt/classes/Main.class
diff --git a/pki/base/migrate/41ToTxt/run.bat b/base/migrate/41ToTxt/run.bat
index 35a5fda9f..35a5fda9f 100755
--- a/pki/base/migrate/41ToTxt/run.bat
+++ b/base/migrate/41ToTxt/run.bat
diff --git a/pki/base/migrate/41ToTxt/run.sh b/base/migrate/41ToTxt/run.sh
index 390195ea1..390195ea1 100755
--- a/pki/base/migrate/41ToTxt/run.sh
+++ b/base/migrate/41ToTxt/run.sh
diff --git a/pki/base/migrate/41ToTxt/src/Main.java b/base/migrate/41ToTxt/src/Main.java
index 758d725a9..758d725a9 100644
--- a/pki/base/migrate/41ToTxt/src/Main.java
+++ b/base/migrate/41ToTxt/src/Main.java
diff --git a/pki/base/migrate/41ToTxt/src/compile.bat b/base/migrate/41ToTxt/src/compile.bat
index fd92f3fb7..fd92f3fb7 100755
--- a/pki/base/migrate/41ToTxt/src/compile.bat
+++ b/base/migrate/41ToTxt/src/compile.bat
diff --git a/pki/base/migrate/41ToTxt/src/compile.sh b/base/migrate/41ToTxt/src/compile.sh
index 968190ff2..968190ff2 100755
--- a/pki/base/migrate/41ToTxt/src/compile.sh
+++ b/base/migrate/41ToTxt/src/compile.sh
diff --git a/pki/base/migrate/42SP2ToTxt/classes/CMS42SP2LdifParser.class b/base/migrate/42SP2ToTxt/classes/CMS42SP2LdifParser.class
index dbf8a1170..dbf8a1170 100644
--- a/pki/base/migrate/42SP2ToTxt/classes/CMS42SP2LdifParser.class
+++ b/base/migrate/42SP2ToTxt/classes/CMS42SP2LdifParser.class
diff --git a/pki/base/migrate/42SP2ToTxt/classes/Main.class b/base/migrate/42SP2ToTxt/classes/Main.class
index d881f3560..d881f3560 100644
--- a/pki/base/migrate/42SP2ToTxt/classes/Main.class
+++ b/base/migrate/42SP2ToTxt/classes/Main.class
diff --git a/pki/base/migrate/42SP2ToTxt/run.bat b/base/migrate/42SP2ToTxt/run.bat
index ec2a5d6ff..ec2a5d6ff 100755
--- a/pki/base/migrate/42SP2ToTxt/run.bat
+++ b/base/migrate/42SP2ToTxt/run.bat
diff --git a/pki/base/migrate/42SP2ToTxt/run.sh b/base/migrate/42SP2ToTxt/run.sh
index 79a203700..79a203700 100755
--- a/pki/base/migrate/42SP2ToTxt/run.sh
+++ b/base/migrate/42SP2ToTxt/run.sh
diff --git a/pki/base/migrate/42SP2ToTxt/src/Main.java b/base/migrate/42SP2ToTxt/src/Main.java
index 1a324d8ee..1a324d8ee 100644
--- a/pki/base/migrate/42SP2ToTxt/src/Main.java
+++ b/base/migrate/42SP2ToTxt/src/Main.java
diff --git a/pki/base/migrate/42SP2ToTxt/src/compile.bat b/base/migrate/42SP2ToTxt/src/compile.bat
index 5b6c11566..5b6c11566 100755
--- a/pki/base/migrate/42SP2ToTxt/src/compile.bat
+++ b/base/migrate/42SP2ToTxt/src/compile.bat
diff --git a/pki/base/migrate/42SP2ToTxt/src/compile.sh b/base/migrate/42SP2ToTxt/src/compile.sh
index 26aa6140b..26aa6140b 100755
--- a/pki/base/migrate/42SP2ToTxt/src/compile.sh
+++ b/base/migrate/42SP2ToTxt/src/compile.sh
diff --git a/pki/base/migrate/42ToTxt/classes/CMS42LdifParser.class b/base/migrate/42ToTxt/classes/CMS42LdifParser.class
index 81c20523c..81c20523c 100644
--- a/pki/base/migrate/42ToTxt/classes/CMS42LdifParser.class
+++ b/base/migrate/42ToTxt/classes/CMS42LdifParser.class
diff --git a/pki/base/migrate/42ToTxt/classes/Main.class b/base/migrate/42ToTxt/classes/Main.class
index 7a75e96c0..7a75e96c0 100644
--- a/pki/base/migrate/42ToTxt/classes/Main.class
+++ b/base/migrate/42ToTxt/classes/Main.class
diff --git a/pki/base/migrate/42ToTxt/run.bat b/base/migrate/42ToTxt/run.bat
index 43300869c..43300869c 100755
--- a/pki/base/migrate/42ToTxt/run.bat
+++ b/base/migrate/42ToTxt/run.bat
diff --git a/pki/base/migrate/42ToTxt/run.sh b/base/migrate/42ToTxt/run.sh
index 3172159f1..3172159f1 100755
--- a/pki/base/migrate/42ToTxt/run.sh
+++ b/base/migrate/42ToTxt/run.sh
diff --git a/pki/base/migrate/42ToTxt/src/Main.java b/base/migrate/42ToTxt/src/Main.java
index 55e64df08..55e64df08 100644
--- a/pki/base/migrate/42ToTxt/src/Main.java
+++ b/base/migrate/42ToTxt/src/Main.java
diff --git a/pki/base/migrate/42ToTxt/src/compile.bat b/base/migrate/42ToTxt/src/compile.bat
index 20ca0ebb5..20ca0ebb5 100755
--- a/pki/base/migrate/42ToTxt/src/compile.bat
+++ b/base/migrate/42ToTxt/src/compile.bat
diff --git a/pki/base/migrate/42ToTxt/src/compile.sh b/base/migrate/42ToTxt/src/compile.sh
index e8acf71bf..e8acf71bf 100755
--- a/pki/base/migrate/42ToTxt/src/compile.sh
+++ b/base/migrate/42ToTxt/src/compile.sh
diff --git a/pki/base/migrate/45ToTxt/classes/CMS45LdifParser.class b/base/migrate/45ToTxt/classes/CMS45LdifParser.class
index 75d4ab47c..75d4ab47c 100644
--- a/pki/base/migrate/45ToTxt/classes/CMS45LdifParser.class
+++ b/base/migrate/45ToTxt/classes/CMS45LdifParser.class
diff --git a/pki/base/migrate/45ToTxt/classes/Main.class b/base/migrate/45ToTxt/classes/Main.class
index a1f3e91c2..a1f3e91c2 100644
--- a/pki/base/migrate/45ToTxt/classes/Main.class
+++ b/base/migrate/45ToTxt/classes/Main.class
diff --git a/pki/base/migrate/45ToTxt/run.bat b/base/migrate/45ToTxt/run.bat
index 8dfb4e77c..8dfb4e77c 100755
--- a/pki/base/migrate/45ToTxt/run.bat
+++ b/base/migrate/45ToTxt/run.bat
diff --git a/pki/base/migrate/45ToTxt/run.sh b/base/migrate/45ToTxt/run.sh
index f19a550d5..f19a550d5 100755
--- a/pki/base/migrate/45ToTxt/run.sh
+++ b/base/migrate/45ToTxt/run.sh
diff --git a/pki/base/migrate/45ToTxt/src/Main.java b/base/migrate/45ToTxt/src/Main.java
index 916ca9cd1..916ca9cd1 100644
--- a/pki/base/migrate/45ToTxt/src/Main.java
+++ b/base/migrate/45ToTxt/src/Main.java
diff --git a/pki/base/migrate/45ToTxt/src/compile.bat b/base/migrate/45ToTxt/src/compile.bat
index 11abbf103..11abbf103 100755
--- a/pki/base/migrate/45ToTxt/src/compile.bat
+++ b/base/migrate/45ToTxt/src/compile.bat
diff --git a/pki/base/migrate/45ToTxt/src/compile.sh b/base/migrate/45ToTxt/src/compile.sh
index a08eea1b7..a08eea1b7 100755
--- a/pki/base/migrate/45ToTxt/src/compile.sh
+++ b/base/migrate/45ToTxt/src/compile.sh
diff --git a/pki/base/migrate/47ToTxt/classes/CMS47LdifParser.class b/base/migrate/47ToTxt/classes/CMS47LdifParser.class
index 79d1bc12d..79d1bc12d 100644
--- a/pki/base/migrate/47ToTxt/classes/CMS47LdifParser.class
+++ b/base/migrate/47ToTxt/classes/CMS47LdifParser.class
diff --git a/pki/base/migrate/47ToTxt/classes/Main.class b/base/migrate/47ToTxt/classes/Main.class
index 7ee99ee96..7ee99ee96 100644
--- a/pki/base/migrate/47ToTxt/classes/Main.class
+++ b/base/migrate/47ToTxt/classes/Main.class
diff --git a/pki/base/migrate/47ToTxt/run.bat b/base/migrate/47ToTxt/run.bat
index e658ab410..e658ab410 100755
--- a/pki/base/migrate/47ToTxt/run.bat
+++ b/base/migrate/47ToTxt/run.bat
diff --git a/pki/base/migrate/47ToTxt/run.sh b/base/migrate/47ToTxt/run.sh
index 35a41bc90..35a41bc90 100755
--- a/pki/base/migrate/47ToTxt/run.sh
+++ b/base/migrate/47ToTxt/run.sh
diff --git a/pki/base/migrate/47ToTxt/src/Main.java b/base/migrate/47ToTxt/src/Main.java
index 194c277f1..194c277f1 100644
--- a/pki/base/migrate/47ToTxt/src/Main.java
+++ b/base/migrate/47ToTxt/src/Main.java
diff --git a/pki/base/migrate/47ToTxt/src/compile.bat b/base/migrate/47ToTxt/src/compile.bat
index 553beca5c..553beca5c 100755
--- a/pki/base/migrate/47ToTxt/src/compile.bat
+++ b/base/migrate/47ToTxt/src/compile.bat
diff --git a/pki/base/migrate/47ToTxt/src/compile.sh b/base/migrate/47ToTxt/src/compile.sh
index 8d91b4491..8d91b4491 100755
--- a/pki/base/migrate/47ToTxt/src/compile.sh
+++ b/base/migrate/47ToTxt/src/compile.sh
diff --git a/pki/base/migrate/60ToTxt/classes/CMS60LdifParser.class b/base/migrate/60ToTxt/classes/CMS60LdifParser.class
index f3ff43045..f3ff43045 100644
--- a/pki/base/migrate/60ToTxt/classes/CMS60LdifParser.class
+++ b/base/migrate/60ToTxt/classes/CMS60LdifParser.class
diff --git a/pki/base/migrate/60ToTxt/classes/Main.class b/base/migrate/60ToTxt/classes/Main.class
index 6d0d3dcd3..6d0d3dcd3 100644
--- a/pki/base/migrate/60ToTxt/classes/Main.class
+++ b/base/migrate/60ToTxt/classes/Main.class
diff --git a/pki/base/migrate/60ToTxt/run.bat b/base/migrate/60ToTxt/run.bat
index cc24fd214..cc24fd214 100755
--- a/pki/base/migrate/60ToTxt/run.bat
+++ b/base/migrate/60ToTxt/run.bat
diff --git a/pki/base/migrate/60ToTxt/run.sh b/base/migrate/60ToTxt/run.sh
index d41d65294..d41d65294 100755
--- a/pki/base/migrate/60ToTxt/run.sh
+++ b/base/migrate/60ToTxt/run.sh
diff --git a/pki/base/migrate/60ToTxt/src/Main.java b/base/migrate/60ToTxt/src/Main.java
index 72de924c4..72de924c4 100644
--- a/pki/base/migrate/60ToTxt/src/Main.java
+++ b/base/migrate/60ToTxt/src/Main.java
diff --git a/pki/base/migrate/60ToTxt/src/compile.bat b/base/migrate/60ToTxt/src/compile.bat
index 8c8b122c0..8c8b122c0 100755
--- a/pki/base/migrate/60ToTxt/src/compile.bat
+++ b/base/migrate/60ToTxt/src/compile.bat
diff --git a/pki/base/migrate/60ToTxt/src/compile.sh b/base/migrate/60ToTxt/src/compile.sh
index 5641688bb..5641688bb 100755
--- a/pki/base/migrate/60ToTxt/src/compile.sh
+++ b/base/migrate/60ToTxt/src/compile.sh
diff --git a/pki/base/migrate/61ToTxt/classes/CMS61LdifParser.class b/base/migrate/61ToTxt/classes/CMS61LdifParser.class
index 4c08a38aa..4c08a38aa 100644
--- a/pki/base/migrate/61ToTxt/classes/CMS61LdifParser.class
+++ b/base/migrate/61ToTxt/classes/CMS61LdifParser.class
diff --git a/pki/base/migrate/61ToTxt/classes/Main.class b/base/migrate/61ToTxt/classes/Main.class
index 8f141215d..8f141215d 100644
--- a/pki/base/migrate/61ToTxt/classes/Main.class
+++ b/base/migrate/61ToTxt/classes/Main.class
diff --git a/pki/base/migrate/61ToTxt/run.bat b/base/migrate/61ToTxt/run.bat
index 2386ab20b..2386ab20b 100755
--- a/pki/base/migrate/61ToTxt/run.bat
+++ b/base/migrate/61ToTxt/run.bat
diff --git a/pki/base/migrate/61ToTxt/run.sh b/base/migrate/61ToTxt/run.sh
index 9fa8ffe12..9fa8ffe12 100755
--- a/pki/base/migrate/61ToTxt/run.sh
+++ b/base/migrate/61ToTxt/run.sh
diff --git a/pki/base/migrate/61ToTxt/src/Main.java b/base/migrate/61ToTxt/src/Main.java
index cd235f73f..cd235f73f 100644
--- a/pki/base/migrate/61ToTxt/src/Main.java
+++ b/base/migrate/61ToTxt/src/Main.java
diff --git a/pki/base/migrate/61ToTxt/src/compile.bat b/base/migrate/61ToTxt/src/compile.bat
index 48bb90018..48bb90018 100755
--- a/pki/base/migrate/61ToTxt/src/compile.bat
+++ b/base/migrate/61ToTxt/src/compile.bat
diff --git a/pki/base/migrate/61ToTxt/src/compile.sh b/base/migrate/61ToTxt/src/compile.sh
index b1f8c8505..b1f8c8505 100755
--- a/pki/base/migrate/61ToTxt/src/compile.sh
+++ b/base/migrate/61ToTxt/src/compile.sh
diff --git a/pki/base/migrate/62ToTxt/classes/CMS62LdifParser.class b/base/migrate/62ToTxt/classes/CMS62LdifParser.class
index 8c413efe2..8c413efe2 100644
--- a/pki/base/migrate/62ToTxt/classes/CMS62LdifParser.class
+++ b/base/migrate/62ToTxt/classes/CMS62LdifParser.class
diff --git a/pki/base/migrate/62ToTxt/classes/Main.class b/base/migrate/62ToTxt/classes/Main.class
index a3b28db52..a3b28db52 100644
--- a/pki/base/migrate/62ToTxt/classes/Main.class
+++ b/base/migrate/62ToTxt/classes/Main.class
diff --git a/pki/base/migrate/62ToTxt/run.bat b/base/migrate/62ToTxt/run.bat
index f182fd715..f182fd715 100755
--- a/pki/base/migrate/62ToTxt/run.bat
+++ b/base/migrate/62ToTxt/run.bat
diff --git a/pki/base/migrate/62ToTxt/run.sh b/base/migrate/62ToTxt/run.sh
index a192df1ce..a192df1ce 100755
--- a/pki/base/migrate/62ToTxt/run.sh
+++ b/base/migrate/62ToTxt/run.sh
diff --git a/pki/base/migrate/62ToTxt/src/Main.java b/base/migrate/62ToTxt/src/Main.java
index 109162475..109162475 100644
--- a/pki/base/migrate/62ToTxt/src/Main.java
+++ b/base/migrate/62ToTxt/src/Main.java
diff --git a/pki/base/migrate/62ToTxt/src/compile.bat b/base/migrate/62ToTxt/src/compile.bat
index c6bfff97e..c6bfff97e 100755
--- a/pki/base/migrate/62ToTxt/src/compile.bat
+++ b/base/migrate/62ToTxt/src/compile.bat
diff --git a/pki/base/migrate/62ToTxt/src/compile.sh b/base/migrate/62ToTxt/src/compile.sh
index 163d5e440..163d5e440 100755
--- a/pki/base/migrate/62ToTxt/src/compile.sh
+++ b/base/migrate/62ToTxt/src/compile.sh
diff --git a/pki/base/migrate/63ToTxt/classes/CMS63LdifParser.class b/base/migrate/63ToTxt/classes/CMS63LdifParser.class
index 39dde5f50..39dde5f50 100644
--- a/pki/base/migrate/63ToTxt/classes/CMS63LdifParser.class
+++ b/base/migrate/63ToTxt/classes/CMS63LdifParser.class
diff --git a/pki/base/migrate/63ToTxt/classes/Main.class b/base/migrate/63ToTxt/classes/Main.class
index d8885bc11..d8885bc11 100644
--- a/pki/base/migrate/63ToTxt/classes/Main.class
+++ b/base/migrate/63ToTxt/classes/Main.class
diff --git a/pki/base/migrate/63ToTxt/run.bat b/base/migrate/63ToTxt/run.bat
index 34c9422c8..34c9422c8 100755
--- a/pki/base/migrate/63ToTxt/run.bat
+++ b/base/migrate/63ToTxt/run.bat
diff --git a/pki/base/migrate/63ToTxt/run.sh b/base/migrate/63ToTxt/run.sh
index d4aa5d5a2..d4aa5d5a2 100755
--- a/pki/base/migrate/63ToTxt/run.sh
+++ b/base/migrate/63ToTxt/run.sh
diff --git a/pki/base/migrate/63ToTxt/src/Main.java b/base/migrate/63ToTxt/src/Main.java
index 6066801e2..6066801e2 100644
--- a/pki/base/migrate/63ToTxt/src/Main.java
+++ b/base/migrate/63ToTxt/src/Main.java
diff --git a/pki/base/migrate/63ToTxt/src/compile.bat b/base/migrate/63ToTxt/src/compile.bat
index f587dd7e8..f587dd7e8 100755
--- a/pki/base/migrate/63ToTxt/src/compile.bat
+++ b/base/migrate/63ToTxt/src/compile.bat
diff --git a/pki/base/migrate/63ToTxt/src/compile.sh b/base/migrate/63ToTxt/src/compile.sh
index 57b9c7718..57b9c7718 100755
--- a/pki/base/migrate/63ToTxt/src/compile.sh
+++ b/base/migrate/63ToTxt/src/compile.sh
diff --git a/pki/base/migrate/70ToTxt/classes/CMS70LdifParser.class b/base/migrate/70ToTxt/classes/CMS70LdifParser.class
index e6900f5aa..e6900f5aa 100644
--- a/pki/base/migrate/70ToTxt/classes/CMS70LdifParser.class
+++ b/base/migrate/70ToTxt/classes/CMS70LdifParser.class
diff --git a/pki/base/migrate/70ToTxt/classes/Main.class b/base/migrate/70ToTxt/classes/Main.class
index 0743af44a..0743af44a 100644
--- a/pki/base/migrate/70ToTxt/classes/Main.class
+++ b/base/migrate/70ToTxt/classes/Main.class
diff --git a/pki/base/migrate/70ToTxt/run.bat b/base/migrate/70ToTxt/run.bat
index 3adeee6f9..3adeee6f9 100755
--- a/pki/base/migrate/70ToTxt/run.bat
+++ b/base/migrate/70ToTxt/run.bat
diff --git a/pki/base/migrate/70ToTxt/run.sh b/base/migrate/70ToTxt/run.sh
index 294bb63c7..294bb63c7 100755
--- a/pki/base/migrate/70ToTxt/run.sh
+++ b/base/migrate/70ToTxt/run.sh
diff --git a/pki/base/migrate/70ToTxt/src/Main.java b/base/migrate/70ToTxt/src/Main.java
index 133671267..133671267 100644
--- a/pki/base/migrate/70ToTxt/src/Main.java
+++ b/base/migrate/70ToTxt/src/Main.java
diff --git a/pki/base/migrate/70ToTxt/src/compile.bat b/base/migrate/70ToTxt/src/compile.bat
index 164cdc321..164cdc321 100755
--- a/pki/base/migrate/70ToTxt/src/compile.bat
+++ b/base/migrate/70ToTxt/src/compile.bat
diff --git a/pki/base/migrate/70ToTxt/src/compile.sh b/base/migrate/70ToTxt/src/compile.sh
index 7c9de9b89..7c9de9b89 100755
--- a/pki/base/migrate/70ToTxt/src/compile.sh
+++ b/base/migrate/70ToTxt/src/compile.sh
diff --git a/pki/base/migrate/71ToTxt/classes/CMS71LdifParser.class b/base/migrate/71ToTxt/classes/CMS71LdifParser.class
index b78e44623..b78e44623 100644
--- a/pki/base/migrate/71ToTxt/classes/CMS71LdifParser.class
+++ b/base/migrate/71ToTxt/classes/CMS71LdifParser.class
diff --git a/pki/base/migrate/71ToTxt/classes/Main.class b/base/migrate/71ToTxt/classes/Main.class
index e37d5400a..e37d5400a 100644
--- a/pki/base/migrate/71ToTxt/classes/Main.class
+++ b/base/migrate/71ToTxt/classes/Main.class
diff --git a/pki/base/migrate/71ToTxt/run.bat b/base/migrate/71ToTxt/run.bat
index 4dbe2f5cd..4dbe2f5cd 100755
--- a/pki/base/migrate/71ToTxt/run.bat
+++ b/base/migrate/71ToTxt/run.bat
diff --git a/pki/base/migrate/71ToTxt/run.sh b/base/migrate/71ToTxt/run.sh
index e1a33a541..e1a33a541 100755
--- a/pki/base/migrate/71ToTxt/run.sh
+++ b/base/migrate/71ToTxt/run.sh
diff --git a/pki/base/migrate/71ToTxt/src/Main.java b/base/migrate/71ToTxt/src/Main.java
index f7f3a5b95..f7f3a5b95 100644
--- a/pki/base/migrate/71ToTxt/src/Main.java
+++ b/base/migrate/71ToTxt/src/Main.java
diff --git a/pki/base/migrate/71ToTxt/src/compile.bat b/base/migrate/71ToTxt/src/compile.bat
index 49ba89621..49ba89621 100755
--- a/pki/base/migrate/71ToTxt/src/compile.bat
+++ b/base/migrate/71ToTxt/src/compile.bat
diff --git a/pki/base/migrate/71ToTxt/src/compile.sh b/base/migrate/71ToTxt/src/compile.sh
index 23464bcb3..23464bcb3 100755
--- a/pki/base/migrate/71ToTxt/src/compile.sh
+++ b/base/migrate/71ToTxt/src/compile.sh
diff --git a/pki/base/migrate/72ToTxt/classes/CMS72LdifParser.class b/base/migrate/72ToTxt/classes/CMS72LdifParser.class
index 707657160..707657160 100644
--- a/pki/base/migrate/72ToTxt/classes/CMS72LdifParser.class
+++ b/base/migrate/72ToTxt/classes/CMS72LdifParser.class
diff --git a/pki/base/migrate/72ToTxt/classes/Main.class b/base/migrate/72ToTxt/classes/Main.class
index 470df979a..470df979a 100644
--- a/pki/base/migrate/72ToTxt/classes/Main.class
+++ b/base/migrate/72ToTxt/classes/Main.class
diff --git a/pki/base/migrate/72ToTxt/run.bat b/base/migrate/72ToTxt/run.bat
index 9613fe5d5..9613fe5d5 100755
--- a/pki/base/migrate/72ToTxt/run.bat
+++ b/base/migrate/72ToTxt/run.bat
diff --git a/pki/base/migrate/72ToTxt/run.sh b/base/migrate/72ToTxt/run.sh
index ccdd00630..ccdd00630 100755
--- a/pki/base/migrate/72ToTxt/run.sh
+++ b/base/migrate/72ToTxt/run.sh
diff --git a/pki/base/migrate/72ToTxt/src/Main.java b/base/migrate/72ToTxt/src/Main.java
index 0a0dc812e..0a0dc812e 100644
--- a/pki/base/migrate/72ToTxt/src/Main.java
+++ b/base/migrate/72ToTxt/src/Main.java
diff --git a/pki/base/migrate/72ToTxt/src/compile.bat b/base/migrate/72ToTxt/src/compile.bat
index c0377e5e5..c0377e5e5 100755
--- a/pki/base/migrate/72ToTxt/src/compile.bat
+++ b/base/migrate/72ToTxt/src/compile.bat
diff --git a/pki/base/migrate/72ToTxt/src/compile.sh b/base/migrate/72ToTxt/src/compile.sh
index 6c616cd40..6c616cd40 100755
--- a/pki/base/migrate/72ToTxt/src/compile.sh
+++ b/base/migrate/72ToTxt/src/compile.sh
diff --git a/pki/base/migrate/73ToTxt/classes/CMS73LdifParser.class b/base/migrate/73ToTxt/classes/CMS73LdifParser.class
index 9ca1fdfd5..9ca1fdfd5 100644
--- a/pki/base/migrate/73ToTxt/classes/CMS73LdifParser.class
+++ b/base/migrate/73ToTxt/classes/CMS73LdifParser.class
diff --git a/pki/base/migrate/73ToTxt/classes/Main.class b/base/migrate/73ToTxt/classes/Main.class
index 30a21375d..30a21375d 100644
--- a/pki/base/migrate/73ToTxt/classes/Main.class
+++ b/base/migrate/73ToTxt/classes/Main.class
diff --git a/pki/base/migrate/73ToTxt/run.bat b/base/migrate/73ToTxt/run.bat
index f360f44d0..f360f44d0 100755
--- a/pki/base/migrate/73ToTxt/run.bat
+++ b/base/migrate/73ToTxt/run.bat
diff --git a/pki/base/migrate/73ToTxt/run.sh b/base/migrate/73ToTxt/run.sh
index a35994fb0..a35994fb0 100755
--- a/pki/base/migrate/73ToTxt/run.sh
+++ b/base/migrate/73ToTxt/run.sh
diff --git a/pki/base/migrate/73ToTxt/src/Main.java b/base/migrate/73ToTxt/src/Main.java
index be26e9858..be26e9858 100644
--- a/pki/base/migrate/73ToTxt/src/Main.java
+++ b/base/migrate/73ToTxt/src/Main.java
diff --git a/pki/base/migrate/73ToTxt/src/compile.bat b/base/migrate/73ToTxt/src/compile.bat
index f5b720e54..f5b720e54 100755
--- a/pki/base/migrate/73ToTxt/src/compile.bat
+++ b/base/migrate/73ToTxt/src/compile.bat
diff --git a/pki/base/migrate/73ToTxt/src/compile.sh b/base/migrate/73ToTxt/src/compile.sh
index 0c8975c4a..0c8975c4a 100755
--- a/pki/base/migrate/73ToTxt/src/compile.sh
+++ b/base/migrate/73ToTxt/src/compile.sh
diff --git a/pki/base/migrate/80/MigrateSecurityDomain.class b/base/migrate/80/MigrateSecurityDomain.class
index f2a174dab..f2a174dab 100644
--- a/pki/base/migrate/80/MigrateSecurityDomain.class
+++ b/base/migrate/80/MigrateSecurityDomain.class
diff --git a/pki/base/migrate/80/MigrateSecurityDomain.java b/base/migrate/80/MigrateSecurityDomain.java
index 4624f1259..4624f1259 100644
--- a/pki/base/migrate/80/MigrateSecurityDomain.java
+++ b/base/migrate/80/MigrateSecurityDomain.java
diff --git a/pki/base/migrate/80/readme b/base/migrate/80/readme
index 50365c985..50365c985 100644
--- a/pki/base/migrate/80/readme
+++ b/base/migrate/80/readme
diff --git a/pki/base/migrate/80/schema-add.ldif b/base/migrate/80/schema-add.ldif
index fe6577e51..fe6577e51 100644
--- a/pki/base/migrate/80/schema-add.ldif
+++ b/base/migrate/80/schema-add.ldif
diff --git a/pki/base/migrate/CMakeLists.txt b/base/migrate/CMakeLists.txt
index 94cc990f6..94cc990f6 100644
--- a/pki/base/migrate/CMakeLists.txt
+++ b/base/migrate/CMakeLists.txt
diff --git a/pki/base/migrate/LICENSE b/base/migrate/LICENSE
index e281f4362..e281f4362 100644
--- a/pki/base/migrate/LICENSE
+++ b/base/migrate/LICENSE
diff --git a/pki/base/migrate/TpsTo80/Makefile b/base/migrate/TpsTo80/Makefile
index 99c0d275c..99c0d275c 100644
--- a/pki/base/migrate/TpsTo80/Makefile
+++ b/base/migrate/TpsTo80/Makefile
diff --git a/pki/base/migrate/TpsTo80/linux/migrateTPSData.i386 b/base/migrate/TpsTo80/linux/migrateTPSData.i386
index 9fd4b3906..9fd4b3906 100755
--- a/pki/base/migrate/TpsTo80/linux/migrateTPSData.i386
+++ b/base/migrate/TpsTo80/linux/migrateTPSData.i386
diff --git a/pki/base/migrate/TpsTo80/linux/migrateTPSData.x86_64 b/base/migrate/TpsTo80/linux/migrateTPSData.x86_64
index d89125c7e..d89125c7e 100755
--- a/pki/base/migrate/TpsTo80/linux/migrateTPSData.x86_64
+++ b/base/migrate/TpsTo80/linux/migrateTPSData.x86_64
diff --git a/pki/base/migrate/TpsTo80/migrateTPSData.c b/base/migrate/TpsTo80/migrateTPSData.c
index a4cf340ab..a4cf340ab 100644
--- a/pki/base/migrate/TpsTo80/migrateTPSData.c
+++ b/base/migrate/TpsTo80/migrateTPSData.c
diff --git a/pki/base/migrate/TpsTo80/readme b/base/migrate/TpsTo80/readme
index aa98de930..aa98de930 100644
--- a/pki/base/migrate/TpsTo80/readme
+++ b/base/migrate/TpsTo80/readme
diff --git a/pki/base/migrate/TpsTo80/solaris/migrateTPSData.sol9sparc b/base/migrate/TpsTo80/solaris/migrateTPSData.sol9sparc
index 082201859..082201859 100755
--- a/pki/base/migrate/TpsTo80/solaris/migrateTPSData.sol9sparc
+++ b/base/migrate/TpsTo80/solaris/migrateTPSData.sol9sparc
diff --git a/pki/base/migrate/TxtTo60/classes/CMS60LdifParser.class b/base/migrate/TxtTo60/classes/CMS60LdifParser.class
index e65aea96f..e65aea96f 100644
--- a/pki/base/migrate/TxtTo60/classes/CMS60LdifParser.class
+++ b/base/migrate/TxtTo60/classes/CMS60LdifParser.class
diff --git a/pki/base/migrate/TxtTo60/classes/DummyAuthManager.class b/base/migrate/TxtTo60/classes/DummyAuthManager.class
index c713d8604..c713d8604 100644
--- a/pki/base/migrate/TxtTo60/classes/DummyAuthManager.class
+++ b/base/migrate/TxtTo60/classes/DummyAuthManager.class
diff --git a/pki/base/migrate/TxtTo60/classes/Main.class b/base/migrate/TxtTo60/classes/Main.class
index 5fa0c203e..5fa0c203e 100644
--- a/pki/base/migrate/TxtTo60/classes/Main.class
+++ b/base/migrate/TxtTo60/classes/Main.class
diff --git a/pki/base/migrate/TxtTo60/run.bat b/base/migrate/TxtTo60/run.bat
index bd7d582ed..bd7d582ed 100755
--- a/pki/base/migrate/TxtTo60/run.bat
+++ b/base/migrate/TxtTo60/run.bat
diff --git a/pki/base/migrate/TxtTo60/run.sh b/base/migrate/TxtTo60/run.sh
index 80856e207..80856e207 100755
--- a/pki/base/migrate/TxtTo60/run.sh
+++ b/base/migrate/TxtTo60/run.sh
diff --git a/pki/base/migrate/TxtTo60/src/Main.java b/base/migrate/TxtTo60/src/Main.java
index 3c47d8ad7..3c47d8ad7 100644
--- a/pki/base/migrate/TxtTo60/src/Main.java
+++ b/base/migrate/TxtTo60/src/Main.java
diff --git a/pki/base/migrate/TxtTo60/src/compile.bat b/base/migrate/TxtTo60/src/compile.bat
index bc21bb20e..bc21bb20e 100755
--- a/pki/base/migrate/TxtTo60/src/compile.bat
+++ b/base/migrate/TxtTo60/src/compile.bat
diff --git a/pki/base/migrate/TxtTo60/src/compile.sh b/base/migrate/TxtTo60/src/compile.sh
index a15b6a670..a15b6a670 100755
--- a/pki/base/migrate/TxtTo60/src/compile.sh
+++ b/base/migrate/TxtTo60/src/compile.sh
diff --git a/pki/base/migrate/TxtTo61/classes/CMS61LdifParser.class b/base/migrate/TxtTo61/classes/CMS61LdifParser.class
index 03f2d90af..03f2d90af 100644
--- a/pki/base/migrate/TxtTo61/classes/CMS61LdifParser.class
+++ b/base/migrate/TxtTo61/classes/CMS61LdifParser.class
diff --git a/pki/base/migrate/TxtTo61/classes/DummyAuthManager.class b/base/migrate/TxtTo61/classes/DummyAuthManager.class
index 8b2039e74..8b2039e74 100644
--- a/pki/base/migrate/TxtTo61/classes/DummyAuthManager.class
+++ b/base/migrate/TxtTo61/classes/DummyAuthManager.class
diff --git a/pki/base/migrate/TxtTo61/classes/Main.class b/base/migrate/TxtTo61/classes/Main.class
index 2f0c1663e..2f0c1663e 100644
--- a/pki/base/migrate/TxtTo61/classes/Main.class
+++ b/base/migrate/TxtTo61/classes/Main.class
diff --git a/pki/base/migrate/TxtTo61/run.bat b/base/migrate/TxtTo61/run.bat
index a63296608..a63296608 100755
--- a/pki/base/migrate/TxtTo61/run.bat
+++ b/base/migrate/TxtTo61/run.bat
diff --git a/pki/base/migrate/TxtTo61/run.sh b/base/migrate/TxtTo61/run.sh
index 6ef1cae42..6ef1cae42 100755
--- a/pki/base/migrate/TxtTo61/run.sh
+++ b/base/migrate/TxtTo61/run.sh
diff --git a/pki/base/migrate/TxtTo61/src/Main.java b/base/migrate/TxtTo61/src/Main.java
index 8b95ccc97..8b95ccc97 100644
--- a/pki/base/migrate/TxtTo61/src/Main.java
+++ b/base/migrate/TxtTo61/src/Main.java
diff --git a/pki/base/migrate/TxtTo61/src/compile.bat b/base/migrate/TxtTo61/src/compile.bat
index 8b2a3bff9..8b2a3bff9 100755
--- a/pki/base/migrate/TxtTo61/src/compile.bat
+++ b/base/migrate/TxtTo61/src/compile.bat
diff --git a/pki/base/migrate/TxtTo61/src/compile.sh b/base/migrate/TxtTo61/src/compile.sh
index 3ec4885c9..3ec4885c9 100755
--- a/pki/base/migrate/TxtTo61/src/compile.sh
+++ b/base/migrate/TxtTo61/src/compile.sh
diff --git a/pki/base/migrate/TxtTo62/classes/CMS62LdifParser.class b/base/migrate/TxtTo62/classes/CMS62LdifParser.class
index ca25274a8..ca25274a8 100644
--- a/pki/base/migrate/TxtTo62/classes/CMS62LdifParser.class
+++ b/base/migrate/TxtTo62/classes/CMS62LdifParser.class
diff --git a/pki/base/migrate/TxtTo62/classes/DummyAuthManager.class b/base/migrate/TxtTo62/classes/DummyAuthManager.class
index 387cde908..387cde908 100644
--- a/pki/base/migrate/TxtTo62/classes/DummyAuthManager.class
+++ b/base/migrate/TxtTo62/classes/DummyAuthManager.class
diff --git a/pki/base/migrate/TxtTo62/classes/Main.class b/base/migrate/TxtTo62/classes/Main.class
index e2e92309e..e2e92309e 100644
--- a/pki/base/migrate/TxtTo62/classes/Main.class
+++ b/base/migrate/TxtTo62/classes/Main.class
diff --git a/pki/base/migrate/TxtTo62/run.bat b/base/migrate/TxtTo62/run.bat
index 1e342ed24..1e342ed24 100755
--- a/pki/base/migrate/TxtTo62/run.bat
+++ b/base/migrate/TxtTo62/run.bat
diff --git a/pki/base/migrate/TxtTo62/run.sh b/base/migrate/TxtTo62/run.sh
index fdd6b2ee9..fdd6b2ee9 100755
--- a/pki/base/migrate/TxtTo62/run.sh
+++ b/base/migrate/TxtTo62/run.sh
diff --git a/pki/base/migrate/TxtTo62/src/Main.java b/base/migrate/TxtTo62/src/Main.java
index da48981b7..da48981b7 100644
--- a/pki/base/migrate/TxtTo62/src/Main.java
+++ b/base/migrate/TxtTo62/src/Main.java
diff --git a/pki/base/migrate/TxtTo62/src/compile.bat b/base/migrate/TxtTo62/src/compile.bat
index 063b8969f..063b8969f 100755
--- a/pki/base/migrate/TxtTo62/src/compile.bat
+++ b/base/migrate/TxtTo62/src/compile.bat
diff --git a/pki/base/migrate/TxtTo62/src/compile.sh b/base/migrate/TxtTo62/src/compile.sh
index 4ab44f966..4ab44f966 100755
--- a/pki/base/migrate/TxtTo62/src/compile.sh
+++ b/base/migrate/TxtTo62/src/compile.sh
diff --git a/pki/base/migrate/TxtTo70/classes/CMS70LdifParser.class b/base/migrate/TxtTo70/classes/CMS70LdifParser.class
index 3f4ed9b52..3f4ed9b52 100644
--- a/pki/base/migrate/TxtTo70/classes/CMS70LdifParser.class
+++ b/base/migrate/TxtTo70/classes/CMS70LdifParser.class
diff --git a/pki/base/migrate/TxtTo70/classes/DummyAuthManager.class b/base/migrate/TxtTo70/classes/DummyAuthManager.class
index 387cde908..387cde908 100644
--- a/pki/base/migrate/TxtTo70/classes/DummyAuthManager.class
+++ b/base/migrate/TxtTo70/classes/DummyAuthManager.class
diff --git a/pki/base/migrate/TxtTo70/classes/Main.class b/base/migrate/TxtTo70/classes/Main.class
index 09498213f..09498213f 100644
--- a/pki/base/migrate/TxtTo70/classes/Main.class
+++ b/base/migrate/TxtTo70/classes/Main.class
diff --git a/pki/base/migrate/TxtTo70/run.bat b/base/migrate/TxtTo70/run.bat
index 3e70ee8cd..3e70ee8cd 100755
--- a/pki/base/migrate/TxtTo70/run.bat
+++ b/base/migrate/TxtTo70/run.bat
diff --git a/pki/base/migrate/TxtTo70/run.sh b/base/migrate/TxtTo70/run.sh
index c7e0a3140..c7e0a3140 100755
--- a/pki/base/migrate/TxtTo70/run.sh
+++ b/base/migrate/TxtTo70/run.sh
diff --git a/pki/base/migrate/TxtTo70/src/Main.java b/base/migrate/TxtTo70/src/Main.java
index bcb1b5a15..bcb1b5a15 100644
--- a/pki/base/migrate/TxtTo70/src/Main.java
+++ b/base/migrate/TxtTo70/src/Main.java
diff --git a/pki/base/migrate/TxtTo70/src/compile.bat b/base/migrate/TxtTo70/src/compile.bat
index f4d496a42..f4d496a42 100755
--- a/pki/base/migrate/TxtTo70/src/compile.bat
+++ b/base/migrate/TxtTo70/src/compile.bat
diff --git a/pki/base/migrate/TxtTo70/src/compile.sh b/base/migrate/TxtTo70/src/compile.sh
index 11b1b6df8..11b1b6df8 100755
--- a/pki/base/migrate/TxtTo70/src/compile.sh
+++ b/base/migrate/TxtTo70/src/compile.sh
diff --git a/pki/base/migrate/TxtTo71/classes/CMS71LdifParser.class b/base/migrate/TxtTo71/classes/CMS71LdifParser.class
index fb449c41f..fb449c41f 100644
--- a/pki/base/migrate/TxtTo71/classes/CMS71LdifParser.class
+++ b/base/migrate/TxtTo71/classes/CMS71LdifParser.class
diff --git a/pki/base/migrate/TxtTo71/classes/DummyAuthManager.class b/base/migrate/TxtTo71/classes/DummyAuthManager.class
index 387cde908..387cde908 100644
--- a/pki/base/migrate/TxtTo71/classes/DummyAuthManager.class
+++ b/base/migrate/TxtTo71/classes/DummyAuthManager.class
diff --git a/pki/base/migrate/TxtTo71/classes/Main.class b/base/migrate/TxtTo71/classes/Main.class
index 8f02b13db..8f02b13db 100644
--- a/pki/base/migrate/TxtTo71/classes/Main.class
+++ b/base/migrate/TxtTo71/classes/Main.class
diff --git a/pki/base/migrate/TxtTo71/run.bat b/base/migrate/TxtTo71/run.bat
index 1682bacbc..1682bacbc 100755
--- a/pki/base/migrate/TxtTo71/run.bat
+++ b/base/migrate/TxtTo71/run.bat
diff --git a/pki/base/migrate/TxtTo71/run.sh b/base/migrate/TxtTo71/run.sh
index 04e8d4587..04e8d4587 100755
--- a/pki/base/migrate/TxtTo71/run.sh
+++ b/base/migrate/TxtTo71/run.sh
diff --git a/pki/base/migrate/TxtTo71/src/Main.java b/base/migrate/TxtTo71/src/Main.java
index 7dcb13943..7dcb13943 100644
--- a/pki/base/migrate/TxtTo71/src/Main.java
+++ b/base/migrate/TxtTo71/src/Main.java
diff --git a/pki/base/migrate/TxtTo71/src/compile.bat b/base/migrate/TxtTo71/src/compile.bat
index d0a1be0b2..d0a1be0b2 100755
--- a/pki/base/migrate/TxtTo71/src/compile.bat
+++ b/base/migrate/TxtTo71/src/compile.bat
diff --git a/pki/base/migrate/TxtTo71/src/compile.sh b/base/migrate/TxtTo71/src/compile.sh
index 397912a3f..397912a3f 100755
--- a/pki/base/migrate/TxtTo71/src/compile.sh
+++ b/base/migrate/TxtTo71/src/compile.sh
diff --git a/pki/base/migrate/TxtTo72/classes/CMS72LdifParser.class b/base/migrate/TxtTo72/classes/CMS72LdifParser.class
index c3b8d5643..c3b8d5643 100644
--- a/pki/base/migrate/TxtTo72/classes/CMS72LdifParser.class
+++ b/base/migrate/TxtTo72/classes/CMS72LdifParser.class
diff --git a/pki/base/migrate/TxtTo72/classes/DummyAuthManager.class b/base/migrate/TxtTo72/classes/DummyAuthManager.class
index 323081a39..323081a39 100644
--- a/pki/base/migrate/TxtTo72/classes/DummyAuthManager.class
+++ b/base/migrate/TxtTo72/classes/DummyAuthManager.class
diff --git a/pki/base/migrate/TxtTo72/classes/Main.class b/base/migrate/TxtTo72/classes/Main.class
index 2512afa7d..2512afa7d 100644
--- a/pki/base/migrate/TxtTo72/classes/Main.class
+++ b/base/migrate/TxtTo72/classes/Main.class
diff --git a/pki/base/migrate/TxtTo72/run.bat b/base/migrate/TxtTo72/run.bat
index 852158747..852158747 100755
--- a/pki/base/migrate/TxtTo72/run.bat
+++ b/base/migrate/TxtTo72/run.bat
diff --git a/pki/base/migrate/TxtTo72/run.sh b/base/migrate/TxtTo72/run.sh
index 972686e3b..972686e3b 100755
--- a/pki/base/migrate/TxtTo72/run.sh
+++ b/base/migrate/TxtTo72/run.sh
diff --git a/pki/base/migrate/TxtTo72/src/Main.java b/base/migrate/TxtTo72/src/Main.java
index 9b22cd84d..9b22cd84d 100644
--- a/pki/base/migrate/TxtTo72/src/Main.java
+++ b/base/migrate/TxtTo72/src/Main.java
diff --git a/pki/base/migrate/TxtTo72/src/compile.bat b/base/migrate/TxtTo72/src/compile.bat
index 2c50e988e..2c50e988e 100755
--- a/pki/base/migrate/TxtTo72/src/compile.bat
+++ b/base/migrate/TxtTo72/src/compile.bat
diff --git a/pki/base/migrate/TxtTo72/src/compile.sh b/base/migrate/TxtTo72/src/compile.sh
index ec0b466ba..ec0b466ba 100755
--- a/pki/base/migrate/TxtTo72/src/compile.sh
+++ b/base/migrate/TxtTo72/src/compile.sh
diff --git a/pki/base/migrate/TxtTo73/classes/CMS73LdifParser.class b/base/migrate/TxtTo73/classes/CMS73LdifParser.class
index 03a09612d..03a09612d 100644
--- a/pki/base/migrate/TxtTo73/classes/CMS73LdifParser.class
+++ b/base/migrate/TxtTo73/classes/CMS73LdifParser.class
diff --git a/pki/base/migrate/TxtTo73/classes/DummyAuthManager.class b/base/migrate/TxtTo73/classes/DummyAuthManager.class
index 323081a39..323081a39 100644
--- a/pki/base/migrate/TxtTo73/classes/DummyAuthManager.class
+++ b/base/migrate/TxtTo73/classes/DummyAuthManager.class
diff --git a/pki/base/migrate/TxtTo73/classes/Main.class b/base/migrate/TxtTo73/classes/Main.class
index 6609674ae..6609674ae 100644
--- a/pki/base/migrate/TxtTo73/classes/Main.class
+++ b/base/migrate/TxtTo73/classes/Main.class
diff --git a/pki/base/migrate/TxtTo73/run.bat b/base/migrate/TxtTo73/run.bat
index 9e3898a47..9e3898a47 100755
--- a/pki/base/migrate/TxtTo73/run.bat
+++ b/base/migrate/TxtTo73/run.bat
diff --git a/pki/base/migrate/TxtTo73/run.sh b/base/migrate/TxtTo73/run.sh
index 52469acca..52469acca 100755
--- a/pki/base/migrate/TxtTo73/run.sh
+++ b/base/migrate/TxtTo73/run.sh
diff --git a/pki/base/migrate/TxtTo73/src/Main.java b/base/migrate/TxtTo73/src/Main.java
index 4ffe0c120..4ffe0c120 100644
--- a/pki/base/migrate/TxtTo73/src/Main.java
+++ b/base/migrate/TxtTo73/src/Main.java
diff --git a/pki/base/migrate/TxtTo73/src/compile.bat b/base/migrate/TxtTo73/src/compile.bat
index db46fa019..db46fa019 100755
--- a/pki/base/migrate/TxtTo73/src/compile.bat
+++ b/base/migrate/TxtTo73/src/compile.bat
diff --git a/pki/base/migrate/TxtTo73/src/compile.sh b/base/migrate/TxtTo73/src/compile.sh
index a8230e673..a8230e673 100755
--- a/pki/base/migrate/TxtTo73/src/compile.sh
+++ b/base/migrate/TxtTo73/src/compile.sh
diff --git a/pki/base/migrate/TxtTo80/classes/CS80LdifParser.class b/base/migrate/TxtTo80/classes/CS80LdifParser.class
index 1265fd153..1265fd153 100644
--- a/pki/base/migrate/TxtTo80/classes/CS80LdifParser.class
+++ b/base/migrate/TxtTo80/classes/CS80LdifParser.class
diff --git a/pki/base/migrate/TxtTo80/classes/Main.class b/base/migrate/TxtTo80/classes/Main.class
index 0f162327d..0f162327d 100644
--- a/pki/base/migrate/TxtTo80/classes/Main.class
+++ b/base/migrate/TxtTo80/classes/Main.class
diff --git a/pki/base/migrate/TxtTo80/run.sh b/base/migrate/TxtTo80/run.sh
index 6dde55758..6dde55758 100755
--- a/pki/base/migrate/TxtTo80/run.sh
+++ b/base/migrate/TxtTo80/run.sh
diff --git a/pki/base/migrate/TxtTo80/src/Main.java b/base/migrate/TxtTo80/src/Main.java
index ad9eb6b18..ad9eb6b18 100644
--- a/pki/base/migrate/TxtTo80/src/Main.java
+++ b/base/migrate/TxtTo80/src/Main.java
diff --git a/pki/base/migrate/TxtTo80/src/compile.sh b/base/migrate/TxtTo80/src/compile.sh
index c8dd848e0..c8dd848e0 100755
--- a/pki/base/migrate/TxtTo80/src/compile.sh
+++ b/base/migrate/TxtTo80/src/compile.sh
diff --git a/pki/base/migrate/kra/RecoverKey.class b/base/migrate/kra/RecoverKey.class
index 756380e8d..756380e8d 100755
--- a/pki/base/migrate/kra/RecoverKey.class
+++ b/base/migrate/kra/RecoverKey.class
diff --git a/pki/base/migrate/kra/RecoverKey.java b/base/migrate/kra/RecoverKey.java
index 06e5fc55f..06e5fc55f 100755
--- a/pki/base/migrate/kra/RecoverKey.java
+++ b/base/migrate/kra/RecoverKey.java
diff --git a/pki/base/migrate/kra/RecoverPin.class b/base/migrate/kra/RecoverPin.class
index 75db9d5f9..75db9d5f9 100755
--- a/pki/base/migrate/kra/RecoverPin.class
+++ b/base/migrate/kra/RecoverPin.class
diff --git a/pki/base/migrate/kra/RecoverPin.java b/base/migrate/kra/RecoverPin.java
index 2ad268c37..2ad268c37 100755
--- a/pki/base/migrate/kra/RecoverPin.java
+++ b/base/migrate/kra/RecoverPin.java
diff --git a/pki/base/migrate/kra/readme.txt b/base/migrate/kra/readme.txt
index 8b7b69b49..8b7b69b49 100755
--- a/pki/base/migrate/kra/readme.txt
+++ b/base/migrate/kra/readme.txt
diff --git a/pki/base/native-tools/CMakeLists.txt b/base/native-tools/CMakeLists.txt
index 0ccebe578..0ccebe578 100644
--- a/pki/base/native-tools/CMakeLists.txt
+++ b/base/native-tools/CMakeLists.txt
diff --git a/pki/base/native-tools/LICENSE b/base/native-tools/LICENSE
index e281f4362..e281f4362 100644
--- a/pki/base/native-tools/LICENSE
+++ b/base/native-tools/LICENSE
diff --git a/pki/base/native-tools/doc/README b/base/native-tools/doc/README
index 01b11a7a3..01b11a7a3 100644
--- a/pki/base/native-tools/doc/README
+++ b/base/native-tools/doc/README
diff --git a/pki/base/native-tools/src/CMakeLists.txt b/base/native-tools/src/CMakeLists.txt
index c727a9a49..c727a9a49 100644
--- a/pki/base/native-tools/src/CMakeLists.txt
+++ b/base/native-tools/src/CMakeLists.txt
diff --git a/pki/base/native-tools/src/bulkissuance/CMakeLists.txt b/base/native-tools/src/bulkissuance/CMakeLists.txt
index 31df27306..31df27306 100644
--- a/pki/base/native-tools/src/bulkissuance/CMakeLists.txt
+++ b/base/native-tools/src/bulkissuance/CMakeLists.txt
diff --git a/pki/base/native-tools/src/bulkissuance/bulkissuance.c b/base/native-tools/src/bulkissuance/bulkissuance.c
index ec33e8a7a..ec33e8a7a 100644
--- a/pki/base/native-tools/src/bulkissuance/bulkissuance.c
+++ b/base/native-tools/src/bulkissuance/bulkissuance.c
diff --git a/pki/base/native-tools/src/bulkissuance/bulkissuance.data b/base/native-tools/src/bulkissuance/bulkissuance.data
index 1d68c26a1..1d68c26a1 100644
--- a/pki/base/native-tools/src/bulkissuance/bulkissuance.data
+++ b/base/native-tools/src/bulkissuance/bulkissuance.data
diff --git a/pki/base/native-tools/src/bulkissuance/getopt.c b/base/native-tools/src/bulkissuance/getopt.c
index 7554e1a14..7554e1a14 100644
--- a/pki/base/native-tools/src/bulkissuance/getopt.c
+++ b/base/native-tools/src/bulkissuance/getopt.c
diff --git a/pki/base/native-tools/src/p7tool/CMakeLists.txt b/base/native-tools/src/p7tool/CMakeLists.txt
index 6adfbedb7..6adfbedb7 100644
--- a/pki/base/native-tools/src/p7tool/CMakeLists.txt
+++ b/base/native-tools/src/p7tool/CMakeLists.txt
diff --git a/pki/base/native-tools/src/p7tool/NSPRerrs.h b/base/native-tools/src/p7tool/NSPRerrs.h
index f0bc8b77e..f0bc8b77e 100644
--- a/pki/base/native-tools/src/p7tool/NSPRerrs.h
+++ b/base/native-tools/src/p7tool/NSPRerrs.h
diff --git a/pki/base/native-tools/src/p7tool/SECerrs.h b/base/native-tools/src/p7tool/SECerrs.h
index 55858b98f..55858b98f 100644
--- a/pki/base/native-tools/src/p7tool/SECerrs.h
+++ b/base/native-tools/src/p7tool/SECerrs.h
diff --git a/pki/base/native-tools/src/p7tool/SSLerrs.h b/base/native-tools/src/p7tool/SSLerrs.h
index d6ec13b47..d6ec13b47 100644
--- a/pki/base/native-tools/src/p7tool/SSLerrs.h
+++ b/base/native-tools/src/p7tool/SSLerrs.h
diff --git a/pki/base/native-tools/src/p7tool/p7tool.c b/base/native-tools/src/p7tool/p7tool.c
index 9ab6023ff..9ab6023ff 100644
--- a/pki/base/native-tools/src/p7tool/p7tool.c
+++ b/base/native-tools/src/p7tool/p7tool.c
diff --git a/pki/base/native-tools/src/p7tool/pppolicy.c b/base/native-tools/src/p7tool/pppolicy.c
index 76ec6e8c6..76ec6e8c6 100644
--- a/pki/base/native-tools/src/p7tool/pppolicy.c
+++ b/base/native-tools/src/p7tool/pppolicy.c
diff --git a/pki/base/native-tools/src/p7tool/secerror.c b/base/native-tools/src/p7tool/secerror.c
index 07e6bac8e..07e6bac8e 100644
--- a/pki/base/native-tools/src/p7tool/secerror.c
+++ b/base/native-tools/src/p7tool/secerror.c
diff --git a/pki/base/native-tools/src/p7tool/secerror.h b/base/native-tools/src/p7tool/secerror.h
index dce63728f..dce63728f 100644
--- a/pki/base/native-tools/src/p7tool/secerror.h
+++ b/base/native-tools/src/p7tool/secerror.h
diff --git a/pki/base/native-tools/src/p7tool/secpwd.c b/base/native-tools/src/p7tool/secpwd.c
index c0cb9b3d5..c0cb9b3d5 100644
--- a/pki/base/native-tools/src/p7tool/secpwd.c
+++ b/base/native-tools/src/p7tool/secpwd.c
diff --git a/pki/base/native-tools/src/p7tool/secutil.c b/base/native-tools/src/p7tool/secutil.c
index abdfd216f..abdfd216f 100644
--- a/pki/base/native-tools/src/p7tool/secutil.c
+++ b/base/native-tools/src/p7tool/secutil.c
diff --git a/pki/base/native-tools/src/p7tool/secutil.h b/base/native-tools/src/p7tool/secutil.h
index 10c8f9ae6..10c8f9ae6 100644
--- a/pki/base/native-tools/src/p7tool/secutil.h
+++ b/base/native-tools/src/p7tool/secutil.h
diff --git a/pki/base/native-tools/src/revoker/CMakeLists.txt b/base/native-tools/src/revoker/CMakeLists.txt
index 5aa5ddff3..5aa5ddff3 100644
--- a/pki/base/native-tools/src/revoker/CMakeLists.txt
+++ b/base/native-tools/src/revoker/CMakeLists.txt
diff --git a/pki/base/native-tools/src/revoker/getopt.c b/base/native-tools/src/revoker/getopt.c
index 7554e1a14..7554e1a14 100644
--- a/pki/base/native-tools/src/revoker/getopt.c
+++ b/base/native-tools/src/revoker/getopt.c
diff --git a/pki/base/native-tools/src/revoker/revoker.c b/base/native-tools/src/revoker/revoker.c
index c7fc76294..c7fc76294 100644
--- a/pki/base/native-tools/src/revoker/revoker.c
+++ b/base/native-tools/src/revoker/revoker.c
diff --git a/pki/base/native-tools/src/setpin/CMakeLists.txt b/base/native-tools/src/setpin/CMakeLists.txt
index b32e12b22..b32e12b22 100644
--- a/pki/base/native-tools/src/setpin/CMakeLists.txt
+++ b/base/native-tools/src/setpin/CMakeLists.txt
diff --git a/pki/base/native-tools/src/setpin/b64.c b/base/native-tools/src/setpin/b64.c
index 1c20f3792..1c20f3792 100644
--- a/pki/base/native-tools/src/setpin/b64.c
+++ b/base/native-tools/src/setpin/b64.c
diff --git a/pki/base/native-tools/src/setpin/options.c b/base/native-tools/src/setpin/options.c
index 9e2dab129..9e2dab129 100644
--- a/pki/base/native-tools/src/setpin/options.c
+++ b/base/native-tools/src/setpin/options.c
diff --git a/pki/base/native-tools/src/setpin/options.h b/base/native-tools/src/setpin/options.h
index 80ccae478..80ccae478 100644
--- a/pki/base/native-tools/src/setpin/options.h
+++ b/base/native-tools/src/setpin/options.h
diff --git a/pki/base/native-tools/src/setpin/setpin.c b/base/native-tools/src/setpin/setpin.c
index f1bf6a8c7..f1bf6a8c7 100644
--- a/pki/base/native-tools/src/setpin/setpin.c
+++ b/base/native-tools/src/setpin/setpin.c
diff --git a/pki/base/native-tools/src/setpin/setpin.conf b/base/native-tools/src/setpin/setpin.conf
index 4e5851858..4e5851858 100644
--- a/pki/base/native-tools/src/setpin/setpin.conf
+++ b/base/native-tools/src/setpin/setpin.conf
diff --git a/pki/base/native-tools/src/setpin/setpin_options.c b/base/native-tools/src/setpin/setpin_options.c
index d8ee83a8c..d8ee83a8c 100644
--- a/pki/base/native-tools/src/setpin/setpin_options.c
+++ b/base/native-tools/src/setpin/setpin_options.c
diff --git a/pki/base/native-tools/src/setpin/setpin_options.h b/base/native-tools/src/setpin/setpin_options.h
index 45373f356..45373f356 100644
--- a/pki/base/native-tools/src/setpin/setpin_options.h
+++ b/base/native-tools/src/setpin/setpin_options.h
diff --git a/pki/base/native-tools/src/sslget/CMakeLists.txt b/base/native-tools/src/sslget/CMakeLists.txt
index ec4bd85f9..ec4bd85f9 100644
--- a/pki/base/native-tools/src/sslget/CMakeLists.txt
+++ b/base/native-tools/src/sslget/CMakeLists.txt
diff --git a/pki/base/native-tools/src/sslget/getopt.c b/base/native-tools/src/sslget/getopt.c
index 7554e1a14..7554e1a14 100644
--- a/pki/base/native-tools/src/sslget/getopt.c
+++ b/base/native-tools/src/sslget/getopt.c
diff --git a/pki/base/native-tools/src/sslget/sslget.c b/base/native-tools/src/sslget/sslget.c
index 7288a1c58..7288a1c58 100644
--- a/pki/base/native-tools/src/sslget/sslget.c
+++ b/base/native-tools/src/sslget/sslget.c
diff --git a/pki/base/native-tools/src/tkstool/CMakeLists.txt b/base/native-tools/src/tkstool/CMakeLists.txt
index 8b07950eb..8b07950eb 100644
--- a/pki/base/native-tools/src/tkstool/CMakeLists.txt
+++ b/base/native-tools/src/tkstool/CMakeLists.txt
diff --git a/pki/base/native-tools/src/tkstool/NSPRerrs.h b/base/native-tools/src/tkstool/NSPRerrs.h
index f0bc8b77e..f0bc8b77e 100644
--- a/pki/base/native-tools/src/tkstool/NSPRerrs.h
+++ b/base/native-tools/src/tkstool/NSPRerrs.h
diff --git a/pki/base/native-tools/src/tkstool/SECerrs.h b/base/native-tools/src/tkstool/SECerrs.h
index 55858b98f..55858b98f 100644
--- a/pki/base/native-tools/src/tkstool/SECerrs.h
+++ b/base/native-tools/src/tkstool/SECerrs.h
diff --git a/pki/base/native-tools/src/tkstool/SSLerrs.h b/base/native-tools/src/tkstool/SSLerrs.h
index d6ec13b47..d6ec13b47 100644
--- a/pki/base/native-tools/src/tkstool/SSLerrs.h
+++ b/base/native-tools/src/tkstool/SSLerrs.h
diff --git a/pki/base/native-tools/src/tkstool/delete.c b/base/native-tools/src/tkstool/delete.c
index f40e66d16..f40e66d16 100644
--- a/pki/base/native-tools/src/tkstool/delete.c
+++ b/base/native-tools/src/tkstool/delete.c
diff --git a/pki/base/native-tools/src/tkstool/file.c b/base/native-tools/src/tkstool/file.c
index d757225fc..d757225fc 100644
--- a/pki/base/native-tools/src/tkstool/file.c
+++ b/base/native-tools/src/tkstool/file.c
diff --git a/pki/base/native-tools/src/tkstool/find.c b/base/native-tools/src/tkstool/find.c
index 8926d5cbb..8926d5cbb 100644
--- a/pki/base/native-tools/src/tkstool/find.c
+++ b/base/native-tools/src/tkstool/find.c
diff --git a/pki/base/native-tools/src/tkstool/help.c b/base/native-tools/src/tkstool/help.c
index 97c724459..97c724459 100644
--- a/pki/base/native-tools/src/tkstool/help.c
+++ b/base/native-tools/src/tkstool/help.c
diff --git a/pki/base/native-tools/src/tkstool/key.c b/base/native-tools/src/tkstool/key.c
index 4fd37963b..4fd37963b 100644
--- a/pki/base/native-tools/src/tkstool/key.c
+++ b/base/native-tools/src/tkstool/key.c
diff --git a/pki/base/native-tools/src/tkstool/list.c b/base/native-tools/src/tkstool/list.c
index 44173fa36..44173fa36 100644
--- a/pki/base/native-tools/src/tkstool/list.c
+++ b/base/native-tools/src/tkstool/list.c
diff --git a/pki/base/native-tools/src/tkstool/modules.c b/base/native-tools/src/tkstool/modules.c
index 0c4297251..0c4297251 100644
--- a/pki/base/native-tools/src/tkstool/modules.c
+++ b/base/native-tools/src/tkstool/modules.c
diff --git a/pki/base/native-tools/src/tkstool/pppolicy.c b/base/native-tools/src/tkstool/pppolicy.c
index 8b198ca52..8b198ca52 100644
--- a/pki/base/native-tools/src/tkstool/pppolicy.c
+++ b/base/native-tools/src/tkstool/pppolicy.c
diff --git a/pki/base/native-tools/src/tkstool/random.c b/base/native-tools/src/tkstool/random.c
index 49dfb525e..49dfb525e 100644
--- a/pki/base/native-tools/src/tkstool/random.c
+++ b/base/native-tools/src/tkstool/random.c
diff --git a/pki/base/native-tools/src/tkstool/retrieve.c b/base/native-tools/src/tkstool/retrieve.c
index 44cf3c069..44cf3c069 100644
--- a/pki/base/native-tools/src/tkstool/retrieve.c
+++ b/base/native-tools/src/tkstool/retrieve.c
diff --git a/pki/base/native-tools/src/tkstool/secerror.c b/base/native-tools/src/tkstool/secerror.c
index 6b0f40d70..6b0f40d70 100644
--- a/pki/base/native-tools/src/tkstool/secerror.c
+++ b/base/native-tools/src/tkstool/secerror.c
diff --git a/pki/base/native-tools/src/tkstool/secpwd.c b/base/native-tools/src/tkstool/secpwd.c
index 542885858..542885858 100644
--- a/pki/base/native-tools/src/tkstool/secpwd.c
+++ b/base/native-tools/src/tkstool/secpwd.c
diff --git a/pki/base/native-tools/src/tkstool/secutil.c b/base/native-tools/src/tkstool/secutil.c
index 9ece007fa..9ece007fa 100644
--- a/pki/base/native-tools/src/tkstool/secutil.c
+++ b/base/native-tools/src/tkstool/secutil.c
diff --git a/pki/base/native-tools/src/tkstool/secutil.h b/base/native-tools/src/tkstool/secutil.h
index a2f065067..a2f065067 100644
--- a/pki/base/native-tools/src/tkstool/secutil.h
+++ b/base/native-tools/src/tkstool/secutil.h
diff --git a/pki/base/native-tools/src/tkstool/tkstool.c b/base/native-tools/src/tkstool/tkstool.c
index 5368b2e7b..5368b2e7b 100644
--- a/pki/base/native-tools/src/tkstool/tkstool.c
+++ b/base/native-tools/src/tkstool/tkstool.c
diff --git a/pki/base/native-tools/src/tkstool/tkstool.h b/base/native-tools/src/tkstool/tkstool.h
index 3b0407227..3b0407227 100644
--- a/pki/base/native-tools/src/tkstool/tkstool.h
+++ b/base/native-tools/src/tkstool/tkstool.h
diff --git a/pki/base/native-tools/src/tkstool/util.c b/base/native-tools/src/tkstool/util.c
index 5fda75f8e..5fda75f8e 100644
--- a/pki/base/native-tools/src/tkstool/util.c
+++ b/base/native-tools/src/tkstool/util.c
diff --git a/pki/base/native-tools/src/tkstool/version.c b/base/native-tools/src/tkstool/version.c
index b8d4c5fbb..b8d4c5fbb 100644
--- a/pki/base/native-tools/src/tkstool/version.c
+++ b/base/native-tools/src/tkstool/version.c
diff --git a/pki/base/ocsp/CMakeLists.txt b/base/ocsp/CMakeLists.txt
index c8e22ea1e..c8e22ea1e 100644
--- a/pki/base/ocsp/CMakeLists.txt
+++ b/base/ocsp/CMakeLists.txt
diff --git a/pki/base/ocsp/LICENSE b/base/ocsp/LICENSE
index e281f4362..e281f4362 100644
--- a/pki/base/ocsp/LICENSE
+++ b/base/ocsp/LICENSE
diff --git a/pki/base/ocsp/setup/CMakeLists.txt b/base/ocsp/setup/CMakeLists.txt
index f5f069cdb..f5f069cdb 100644
--- a/pki/base/ocsp/setup/CMakeLists.txt
+++ b/base/ocsp/setup/CMakeLists.txt
diff --git a/pki/base/ocsp/setup/registry_instance b/base/ocsp/setup/registry_instance
index 3210b9131..3210b9131 100644
--- a/pki/base/ocsp/setup/registry_instance
+++ b/base/ocsp/setup/registry_instance
diff --git a/pki/base/ocsp/shared/conf/CMakeLists.txt b/base/ocsp/shared/conf/CMakeLists.txt
index e3cef5915..e3cef5915 100644
--- a/pki/base/ocsp/shared/conf/CMakeLists.txt
+++ b/base/ocsp/shared/conf/CMakeLists.txt
diff --git a/pki/base/ocsp/shared/conf/CS.cfg.in b/base/ocsp/shared/conf/CS.cfg.in
index 5be916e7c..5be916e7c 100644
--- a/pki/base/ocsp/shared/conf/CS.cfg.in
+++ b/base/ocsp/shared/conf/CS.cfg.in
diff --git a/pki/base/ocsp/shared/conf/acl.ldif b/base/ocsp/shared/conf/acl.ldif
index 94a102b48..94a102b48 100644
--- a/pki/base/ocsp/shared/conf/acl.ldif
+++ b/base/ocsp/shared/conf/acl.ldif
diff --git a/pki/base/ocsp/shared/conf/catalina.policy b/base/ocsp/shared/conf/catalina.policy
index cf8302cd0..cf8302cd0 100644
--- a/pki/base/ocsp/shared/conf/catalina.policy
+++ b/base/ocsp/shared/conf/catalina.policy
diff --git a/pki/base/ocsp/shared/conf/catalina.properties b/base/ocsp/shared/conf/catalina.properties
index 70cb7c05e..70cb7c05e 100644
--- a/pki/base/ocsp/shared/conf/catalina.properties
+++ b/base/ocsp/shared/conf/catalina.properties
diff --git a/pki/base/ocsp/shared/conf/context.xml b/base/ocsp/shared/conf/context.xml
index 8b6fe4905..8b6fe4905 100644
--- a/pki/base/ocsp/shared/conf/context.xml
+++ b/base/ocsp/shared/conf/context.xml
diff --git a/pki/base/ocsp/shared/conf/database.ldif b/base/ocsp/shared/conf/database.ldif
index d3c5f9e68..d3c5f9e68 100644
--- a/pki/base/ocsp/shared/conf/database.ldif
+++ b/base/ocsp/shared/conf/database.ldif
diff --git a/pki/base/ocsp/shared/conf/db.ldif b/base/ocsp/shared/conf/db.ldif
index ec159e02f..ec159e02f 100644
--- a/pki/base/ocsp/shared/conf/db.ldif
+++ b/base/ocsp/shared/conf/db.ldif
diff --git a/pki/base/ocsp/shared/conf/index.ldif b/base/ocsp/shared/conf/index.ldif
index 184187045..184187045 100644
--- a/pki/base/ocsp/shared/conf/index.ldif
+++ b/base/ocsp/shared/conf/index.ldif
diff --git a/pki/base/ocsp/shared/conf/jk2.manifest b/base/ocsp/shared/conf/jk2.manifest
index 986d7b874..986d7b874 100644
--- a/pki/base/ocsp/shared/conf/jk2.manifest
+++ b/base/ocsp/shared/conf/jk2.manifest
diff --git a/pki/base/ocsp/shared/conf/jk2.properties b/base/ocsp/shared/conf/jk2.properties
index 4d8e357f8..4d8e357f8 100644
--- a/pki/base/ocsp/shared/conf/jk2.properties
+++ b/base/ocsp/shared/conf/jk2.properties
diff --git a/pki/base/ocsp/shared/conf/jkconf.ant.xml b/base/ocsp/shared/conf/jkconf.ant.xml
index a4f498050..a4f498050 100644
--- a/pki/base/ocsp/shared/conf/jkconf.ant.xml
+++ b/base/ocsp/shared/conf/jkconf.ant.xml
diff --git a/pki/base/ocsp/shared/conf/jkconfig.manifest b/base/ocsp/shared/conf/jkconfig.manifest
index 3ba1f2e3e..3ba1f2e3e 100644
--- a/pki/base/ocsp/shared/conf/jkconfig.manifest
+++ b/base/ocsp/shared/conf/jkconfig.manifest
diff --git a/pki/base/ocsp/shared/conf/logging.properties b/base/ocsp/shared/conf/logging.properties
index 796cfc071..796cfc071 100644
--- a/pki/base/ocsp/shared/conf/logging.properties
+++ b/base/ocsp/shared/conf/logging.properties
diff --git a/pki/base/ocsp/shared/conf/manager.ldif b/base/ocsp/shared/conf/manager.ldif
index 52e486987..52e486987 100644
--- a/pki/base/ocsp/shared/conf/manager.ldif
+++ b/base/ocsp/shared/conf/manager.ldif
diff --git a/pki/base/ocsp/shared/conf/schema.ldif b/base/ocsp/shared/conf/schema.ldif
index 70578e21c..70578e21c 100644
--- a/pki/base/ocsp/shared/conf/schema.ldif
+++ b/base/ocsp/shared/conf/schema.ldif
diff --git a/pki/base/ocsp/shared/conf/server-minimal.xml b/base/ocsp/shared/conf/server-minimal.xml
index 0df50b528..0df50b528 100644
--- a/pki/base/ocsp/shared/conf/server-minimal.xml
+++ b/base/ocsp/shared/conf/server-minimal.xml
diff --git a/pki/base/ocsp/shared/conf/server.xml b/base/ocsp/shared/conf/server.xml
index 6217ce1d9..6217ce1d9 100644
--- a/pki/base/ocsp/shared/conf/server.xml
+++ b/base/ocsp/shared/conf/server.xml
diff --git a/pki/base/ocsp/shared/conf/serverCertNick.conf b/base/ocsp/shared/conf/serverCertNick.conf
index 2233ada52..2233ada52 100644
--- a/pki/base/ocsp/shared/conf/serverCertNick.conf
+++ b/base/ocsp/shared/conf/serverCertNick.conf
diff --git a/pki/base/ocsp/shared/conf/shm.manifest b/base/ocsp/shared/conf/shm.manifest
index 0505c085b..0505c085b 100644
--- a/pki/base/ocsp/shared/conf/shm.manifest
+++ b/base/ocsp/shared/conf/shm.manifest
diff --git a/pki/base/ocsp/shared/conf/tomcat-jk2.manifest b/base/ocsp/shared/conf/tomcat-jk2.manifest
index acfef4a90..acfef4a90 100644
--- a/pki/base/ocsp/shared/conf/tomcat-jk2.manifest
+++ b/base/ocsp/shared/conf/tomcat-jk2.manifest
diff --git a/pki/base/ocsp/shared/conf/tomcat-users.xml b/base/ocsp/shared/conf/tomcat-users.xml
index daa9260cc..daa9260cc 100644
--- a/pki/base/ocsp/shared/conf/tomcat-users.xml
+++ b/base/ocsp/shared/conf/tomcat-users.xml
diff --git a/pki/base/ocsp/shared/conf/tomcat6.conf b/base/ocsp/shared/conf/tomcat6.conf
index 2d7def5ec..2d7def5ec 100644
--- a/pki/base/ocsp/shared/conf/tomcat6.conf
+++ b/base/ocsp/shared/conf/tomcat6.conf
diff --git a/pki/base/ocsp/shared/conf/uriworkermap.properties b/base/ocsp/shared/conf/uriworkermap.properties
index c89dd82a6..c89dd82a6 100644
--- a/pki/base/ocsp/shared/conf/uriworkermap.properties
+++ b/base/ocsp/shared/conf/uriworkermap.properties
diff --git a/pki/base/ocsp/shared/conf/web.xml b/base/ocsp/shared/conf/web.xml
index 860a9c4af..860a9c4af 100644
--- a/pki/base/ocsp/shared/conf/web.xml
+++ b/base/ocsp/shared/conf/web.xml
diff --git a/pki/base/ocsp/shared/conf/workers.properties b/base/ocsp/shared/conf/workers.properties
index 2c39c6402..2c39c6402 100644
--- a/pki/base/ocsp/shared/conf/workers.properties
+++ b/base/ocsp/shared/conf/workers.properties
diff --git a/pki/base/ocsp/shared/conf/workers.properties.minimal b/base/ocsp/shared/conf/workers.properties.minimal
index 51980ac49..51980ac49 100644
--- a/pki/base/ocsp/shared/conf/workers.properties.minimal
+++ b/base/ocsp/shared/conf/workers.properties.minimal
diff --git a/pki/base/ocsp/shared/conf/workers2.properties b/base/ocsp/shared/conf/workers2.properties
index d24abd3a9..d24abd3a9 100644
--- a/pki/base/ocsp/shared/conf/workers2.properties
+++ b/base/ocsp/shared/conf/workers2.properties
diff --git a/pki/base/ocsp/shared/conf/workers2.properties.minimal b/base/ocsp/shared/conf/workers2.properties.minimal
index 4c440eb68..4c440eb68 100644
--- a/pki/base/ocsp/shared/conf/workers2.properties.minimal
+++ b/base/ocsp/shared/conf/workers2.properties.minimal
diff --git a/pki/base/ocsp/shared/etc/init.d/pki-ocspd b/base/ocsp/shared/etc/init.d/pki-ocspd
index 3d69601eb..3d69601eb 100755
--- a/pki/base/ocsp/shared/etc/init.d/pki-ocspd
+++ b/base/ocsp/shared/etc/init.d/pki-ocspd
diff --git a/pki/base/ocsp/shared/lib/systemd/system/pki-ocspd.target b/base/ocsp/shared/lib/systemd/system/pki-ocspd.target
index 5db6bf4df..5db6bf4df 100644
--- a/pki/base/ocsp/shared/lib/systemd/system/pki-ocspd.target
+++ b/base/ocsp/shared/lib/systemd/system/pki-ocspd.target
diff --git a/pki/base/ocsp/shared/lib/systemd/system/pki-ocspd@.service b/base/ocsp/shared/lib/systemd/system/pki-ocspd@.service
index 7b4e7855b..7b4e7855b 100644
--- a/pki/base/ocsp/shared/lib/systemd/system/pki-ocspd@.service
+++ b/base/ocsp/shared/lib/systemd/system/pki-ocspd@.service
diff --git a/pki/base/ocsp/shared/webapps/ROOT/WEB-INF/web.xml b/base/ocsp/shared/webapps/ROOT/WEB-INF/web.xml
index ed274862b..ed274862b 100644
--- a/pki/base/ocsp/shared/webapps/ROOT/WEB-INF/web.xml
+++ b/base/ocsp/shared/webapps/ROOT/WEB-INF/web.xml
diff --git a/pki/base/ocsp/shared/webapps/ROOT/index.jsp b/base/ocsp/shared/webapps/ROOT/index.jsp
index 4b2b3c60a..4b2b3c60a 100644
--- a/pki/base/ocsp/shared/webapps/ROOT/index.jsp
+++ b/base/ocsp/shared/webapps/ROOT/index.jsp
diff --git a/pki/base/ocsp/shared/webapps/ocsp/WEB-INF/velocity.properties b/base/ocsp/shared/webapps/ocsp/WEB-INF/velocity.properties
index 5cd0454cc..5cd0454cc 100644
--- a/pki/base/ocsp/shared/webapps/ocsp/WEB-INF/velocity.properties
+++ b/base/ocsp/shared/webapps/ocsp/WEB-INF/velocity.properties
diff --git a/pki/base/ocsp/shared/webapps/ocsp/WEB-INF/web.xml b/base/ocsp/shared/webapps/ocsp/WEB-INF/web.xml
index b31bd751e..b31bd751e 100644
--- a/pki/base/ocsp/shared/webapps/ocsp/WEB-INF/web.xml
+++ b/base/ocsp/shared/webapps/ocsp/WEB-INF/web.xml
diff --git a/pki/base/ocsp/src/CMakeLists.txt b/base/ocsp/src/CMakeLists.txt
index 0992eeaee..0992eeaee 100644
--- a/pki/base/ocsp/src/CMakeLists.txt
+++ b/base/ocsp/src/CMakeLists.txt
diff --git a/pki/base/ocsp/src/com/netscape/ocsp/EOCSPException.java b/base/ocsp/src/com/netscape/ocsp/EOCSPException.java
index 231ab2867..231ab2867 100644
--- a/pki/base/ocsp/src/com/netscape/ocsp/EOCSPException.java
+++ b/base/ocsp/src/com/netscape/ocsp/EOCSPException.java
diff --git a/pki/base/ocsp/src/com/netscape/ocsp/OCSPAuthority.java b/base/ocsp/src/com/netscape/ocsp/OCSPAuthority.java
index f009bd56f..f009bd56f 100644
--- a/pki/base/ocsp/src/com/netscape/ocsp/OCSPAuthority.java
+++ b/base/ocsp/src/com/netscape/ocsp/OCSPAuthority.java
diff --git a/pki/base/ocsp/src/com/netscape/ocsp/OCSPResources.java b/base/ocsp/src/com/netscape/ocsp/OCSPResources.java
index 7fb1e5a86..7fb1e5a86 100644
--- a/pki/base/ocsp/src/com/netscape/ocsp/OCSPResources.java
+++ b/base/ocsp/src/com/netscape/ocsp/OCSPResources.java
diff --git a/pki/base/ocsp/src/com/netscape/ocsp/SigningUnit.java b/base/ocsp/src/com/netscape/ocsp/SigningUnit.java
index 27d4e5c9b..27d4e5c9b 100644
--- a/pki/base/ocsp/src/com/netscape/ocsp/SigningUnit.java
+++ b/base/ocsp/src/com/netscape/ocsp/SigningUnit.java
diff --git a/pki/base/ra/CMakeLists.txt b/base/ra/CMakeLists.txt
index 59910fe95..59910fe95 100644
--- a/pki/base/ra/CMakeLists.txt
+++ b/base/ra/CMakeLists.txt
diff --git a/pki/base/ra/LICENSE b/base/ra/LICENSE
index e281f4362..e281f4362 100644
--- a/pki/base/ra/LICENSE
+++ b/base/ra/LICENSE
diff --git a/pki/base/ra/apache/conf/httpd.conf b/base/ra/apache/conf/httpd.conf
index 9f81b646d..9f81b646d 100644
--- a/pki/base/ra/apache/conf/httpd.conf
+++ b/base/ra/apache/conf/httpd.conf
diff --git a/pki/base/ra/apache/conf/magic b/base/ra/apache/conf/magic
index 0de73361f..0de73361f 100644
--- a/pki/base/ra/apache/conf/magic
+++ b/base/ra/apache/conf/magic
diff --git a/pki/base/ra/apache/conf/mime.types b/base/ra/apache/conf/mime.types
index 3485692d1..3485692d1 100644
--- a/pki/base/ra/apache/conf/mime.types
+++ b/base/ra/apache/conf/mime.types
diff --git a/pki/base/ra/apache/conf/nss.conf b/base/ra/apache/conf/nss.conf
index a3e0621ab..a3e0621ab 100644
--- a/pki/base/ra/apache/conf/nss.conf
+++ b/base/ra/apache/conf/nss.conf
diff --git a/pki/base/ra/apache/conf/perl.conf b/base/ra/apache/conf/perl.conf
index 50139cdab..50139cdab 100644
--- a/pki/base/ra/apache/conf/perl.conf
+++ b/base/ra/apache/conf/perl.conf
diff --git a/pki/base/ra/doc/CMakeLists.txt b/base/ra/doc/CMakeLists.txt
index 4cebbe1c9..4cebbe1c9 100644
--- a/pki/base/ra/doc/CMakeLists.txt
+++ b/base/ra/doc/CMakeLists.txt
diff --git a/pki/base/ra/doc/CS.cfg.in b/base/ra/doc/CS.cfg.in
index 0581e3a78..0581e3a78 100644
--- a/pki/base/ra/doc/CS.cfg.in
+++ b/base/ra/doc/CS.cfg.in
diff --git a/pki/base/ra/emails/mail_approve_request.vm b/base/ra/emails/mail_approve_request.vm
index 461eb4d10..461eb4d10 100644
--- a/pki/base/ra/emails/mail_approve_request.vm
+++ b/base/ra/emails/mail_approve_request.vm
diff --git a/pki/base/ra/emails/mail_create_request.vm b/base/ra/emails/mail_create_request.vm
index 317270efa..317270efa 100644
--- a/pki/base/ra/emails/mail_create_request.vm
+++ b/base/ra/emails/mail_create_request.vm
diff --git a/pki/base/ra/etc/init.d/pki-rad b/base/ra/etc/init.d/pki-rad
index 666bf6387..666bf6387 100755
--- a/pki/base/ra/etc/init.d/pki-rad
+++ b/base/ra/etc/init.d/pki-rad
diff --git a/pki/base/ra/forms/admin/group/add.cgi b/base/ra/forms/admin/group/add.cgi
index 212330d0d..212330d0d 100755
--- a/pki/base/ra/forms/admin/group/add.cgi
+++ b/base/ra/forms/admin/group/add.cgi
diff --git a/pki/base/ra/forms/admin/group/add_member.cgi b/base/ra/forms/admin/group/add_member.cgi
index d60fe965e..d60fe965e 100755
--- a/pki/base/ra/forms/admin/group/add_member.cgi
+++ b/base/ra/forms/admin/group/add_member.cgi
diff --git a/pki/base/ra/forms/admin/group/add_new.cgi b/base/ra/forms/admin/group/add_new.cgi
index 5a1ca7eda..5a1ca7eda 100755
--- a/pki/base/ra/forms/admin/group/add_new.cgi
+++ b/base/ra/forms/admin/group/add_new.cgi
diff --git a/pki/base/ra/forms/admin/group/delete.cgi b/base/ra/forms/admin/group/delete.cgi
index 5fb1f22ce..5fb1f22ce 100755
--- a/pki/base/ra/forms/admin/group/delete.cgi
+++ b/base/ra/forms/admin/group/delete.cgi
diff --git a/pki/base/ra/forms/admin/group/delete_member.cgi b/base/ra/forms/admin/group/delete_member.cgi
index 2e516eeee..2e516eeee 100755
--- a/pki/base/ra/forms/admin/group/delete_member.cgi
+++ b/base/ra/forms/admin/group/delete_member.cgi
diff --git a/pki/base/ra/forms/admin/group/index.cgi b/base/ra/forms/admin/group/index.cgi
index 07dc653e6..07dc653e6 100755
--- a/pki/base/ra/forms/admin/group/index.cgi
+++ b/base/ra/forms/admin/group/index.cgi
diff --git a/pki/base/ra/forms/admin/group/read.cgi b/base/ra/forms/admin/group/read.cgi
index 9ede3aa53..9ede3aa53 100755
--- a/pki/base/ra/forms/admin/group/read.cgi
+++ b/base/ra/forms/admin/group/read.cgi
diff --git a/pki/base/ra/forms/admin/index.cgi b/base/ra/forms/admin/index.cgi
index 2db7b2500..2db7b2500 100755
--- a/pki/base/ra/forms/admin/index.cgi
+++ b/base/ra/forms/admin/index.cgi
diff --git a/pki/base/ra/forms/admin/user/add.cgi b/base/ra/forms/admin/user/add.cgi
index 94c4bae81..94c4bae81 100755
--- a/pki/base/ra/forms/admin/user/add.cgi
+++ b/base/ra/forms/admin/user/add.cgi
diff --git a/pki/base/ra/forms/admin/user/add_new.cgi b/base/ra/forms/admin/user/add_new.cgi
index 8bfbd0e9e..8bfbd0e9e 100755
--- a/pki/base/ra/forms/admin/user/add_new.cgi
+++ b/base/ra/forms/admin/user/add_new.cgi
diff --git a/pki/base/ra/forms/admin/user/delete.cgi b/base/ra/forms/admin/user/delete.cgi
index 707035edb..707035edb 100755
--- a/pki/base/ra/forms/admin/user/delete.cgi
+++ b/base/ra/forms/admin/user/delete.cgi
diff --git a/pki/base/ra/forms/admin/user/index.cgi b/base/ra/forms/admin/user/index.cgi
index c845ae1dc..c845ae1dc 100755
--- a/pki/base/ra/forms/admin/user/index.cgi
+++ b/base/ra/forms/admin/user/index.cgi
diff --git a/pki/base/ra/forms/admin/user/read.cgi b/base/ra/forms/admin/user/read.cgi
index 08d2fd3f7..08d2fd3f7 100755
--- a/pki/base/ra/forms/admin/user/read.cgi
+++ b/base/ra/forms/admin/user/read.cgi
diff --git a/pki/base/ra/forms/agent/cert/index.cgi b/base/ra/forms/agent/cert/index.cgi
index 46e5b8c2c..46e5b8c2c 100755
--- a/pki/base/ra/forms/agent/cert/index.cgi
+++ b/base/ra/forms/agent/cert/index.cgi
diff --git a/pki/base/ra/forms/agent/cert/read.cgi b/base/ra/forms/agent/cert/read.cgi
index f434baedb..f434baedb 100755
--- a/pki/base/ra/forms/agent/cert/read.cgi
+++ b/base/ra/forms/agent/cert/read.cgi
diff --git a/pki/base/ra/forms/agent/cert/revoke.cgi b/base/ra/forms/agent/cert/revoke.cgi
index 1e483aea0..1e483aea0 100755
--- a/pki/base/ra/forms/agent/cert/revoke.cgi
+++ b/base/ra/forms/agent/cert/revoke.cgi
diff --git a/pki/base/ra/forms/agent/cert/submit.cgi b/base/ra/forms/agent/cert/submit.cgi
index 571385f3a..571385f3a 100755
--- a/pki/base/ra/forms/agent/cert/submit.cgi
+++ b/base/ra/forms/agent/cert/submit.cgi
diff --git a/pki/base/ra/forms/agent/error.cgi b/base/ra/forms/agent/error.cgi
index fa13365a7..fa13365a7 100755
--- a/pki/base/ra/forms/agent/error.cgi
+++ b/base/ra/forms/agent/error.cgi
diff --git a/pki/base/ra/forms/agent/index.cgi b/base/ra/forms/agent/index.cgi
index c8f2040fe..c8f2040fe 100755
--- a/pki/base/ra/forms/agent/index.cgi
+++ b/base/ra/forms/agent/index.cgi
diff --git a/pki/base/ra/forms/agent/request/add_note.cgi b/base/ra/forms/agent/request/add_note.cgi
index 0ffac91c7..0ffac91c7 100755
--- a/pki/base/ra/forms/agent/request/add_note.cgi
+++ b/base/ra/forms/agent/request/add_note.cgi
diff --git a/pki/base/ra/forms/agent/request/index.cgi b/base/ra/forms/agent/request/index.cgi
index 81b25977a..81b25977a 100755
--- a/pki/base/ra/forms/agent/request/index.cgi
+++ b/base/ra/forms/agent/request/index.cgi
diff --git a/pki/base/ra/forms/agent/request/op.cgi b/base/ra/forms/agent/request/op.cgi
index 363d7121b..363d7121b 100755
--- a/pki/base/ra/forms/agent/request/op.cgi
+++ b/base/ra/forms/agent/request/op.cgi
diff --git a/pki/base/ra/forms/agent/request/read.cgi b/base/ra/forms/agent/request/read.cgi
index d1633c164..d1633c164 100755
--- a/pki/base/ra/forms/agent/request/read.cgi
+++ b/base/ra/forms/agent/request/read.cgi
diff --git a/pki/base/ra/forms/ee/agent/enroll.cgi b/base/ra/forms/ee/agent/enroll.cgi
index 4f1af8f16..4f1af8f16 100755
--- a/pki/base/ra/forms/ee/agent/enroll.cgi
+++ b/base/ra/forms/ee/agent/enroll.cgi
diff --git a/pki/base/ra/forms/ee/agent/index.cgi b/base/ra/forms/ee/agent/index.cgi
index 66fceb8ff..66fceb8ff 100755
--- a/pki/base/ra/forms/ee/agent/index.cgi
+++ b/base/ra/forms/ee/agent/index.cgi
diff --git a/pki/base/ra/forms/ee/agent/new.cgi b/base/ra/forms/ee/agent/new.cgi
index c209f5e74..c209f5e74 100755
--- a/pki/base/ra/forms/ee/agent/new.cgi
+++ b/base/ra/forms/ee/agent/new.cgi
diff --git a/pki/base/ra/forms/ee/agent/start.cgi b/base/ra/forms/ee/agent/start.cgi
index 27aedb546..27aedb546 100755
--- a/pki/base/ra/forms/ee/agent/start.cgi
+++ b/base/ra/forms/ee/agent/start.cgi
diff --git a/pki/base/ra/forms/ee/agent/submit.cgi b/base/ra/forms/ee/agent/submit.cgi
index a68242114..a68242114 100755
--- a/pki/base/ra/forms/ee/agent/submit.cgi
+++ b/base/ra/forms/ee/agent/submit.cgi
diff --git a/pki/base/ra/forms/ee/error.cgi b/base/ra/forms/ee/error.cgi
index 1417d4b61..1417d4b61 100755
--- a/pki/base/ra/forms/ee/error.cgi
+++ b/base/ra/forms/ee/error.cgi
diff --git a/pki/base/ra/forms/ee/index.cgi b/base/ra/forms/ee/index.cgi
index 453b2873b..453b2873b 100755
--- a/pki/base/ra/forms/ee/index.cgi
+++ b/base/ra/forms/ee/index.cgi
diff --git a/pki/base/ra/forms/ee/request/getcert.cgi b/base/ra/forms/ee/request/getcert.cgi
index b22444dc1..b22444dc1 100755
--- a/pki/base/ra/forms/ee/request/getcert.cgi
+++ b/base/ra/forms/ee/request/getcert.cgi
diff --git a/pki/base/ra/forms/ee/request/importcert.cgi b/base/ra/forms/ee/request/importcert.cgi
index fdc309746..fdc309746 100755
--- a/pki/base/ra/forms/ee/request/importcert.cgi
+++ b/base/ra/forms/ee/request/importcert.cgi
diff --git a/pki/base/ra/forms/ee/request/index.cgi b/base/ra/forms/ee/request/index.cgi
index ef2a68b23..ef2a68b23 100755
--- a/pki/base/ra/forms/ee/request/index.cgi
+++ b/base/ra/forms/ee/request/index.cgi
diff --git a/pki/base/ra/forms/ee/request/status.cgi b/base/ra/forms/ee/request/status.cgi
index 6a3154716..6a3154716 100755
--- a/pki/base/ra/forms/ee/request/status.cgi
+++ b/base/ra/forms/ee/request/status.cgi
diff --git a/pki/base/ra/forms/ee/scep/enroll.cgi b/base/ra/forms/ee/scep/enroll.cgi
index 53291636a..53291636a 100755
--- a/pki/base/ra/forms/ee/scep/enroll.cgi
+++ b/base/ra/forms/ee/scep/enroll.cgi
diff --git a/pki/base/ra/forms/ee/scep/index.cgi b/base/ra/forms/ee/scep/index.cgi
index c73fc379a..c73fc379a 100755
--- a/pki/base/ra/forms/ee/scep/index.cgi
+++ b/base/ra/forms/ee/scep/index.cgi
diff --git a/pki/base/ra/forms/ee/scep/installer.cgi b/base/ra/forms/ee/scep/installer.cgi
index 8453c2cc4..8453c2cc4 100755
--- a/pki/base/ra/forms/ee/scep/installer.cgi
+++ b/base/ra/forms/ee/scep/installer.cgi
diff --git a/pki/base/ra/forms/ee/scep/manager.cgi b/base/ra/forms/ee/scep/manager.cgi
index 8b547a928..8b547a928 100755
--- a/pki/base/ra/forms/ee/scep/manager.cgi
+++ b/base/ra/forms/ee/scep/manager.cgi
diff --git a/pki/base/ra/forms/ee/scep/pkiclient.cgi b/base/ra/forms/ee/scep/pkiclient.cgi
index a54558f37..a54558f37 100755
--- a/pki/base/ra/forms/ee/scep/pkiclient.cgi
+++ b/base/ra/forms/ee/scep/pkiclient.cgi
diff --git a/pki/base/ra/forms/ee/scep/submit.cgi b/base/ra/forms/ee/scep/submit.cgi
index b3dfd7a5d..b3dfd7a5d 100755
--- a/pki/base/ra/forms/ee/scep/submit.cgi
+++ b/base/ra/forms/ee/scep/submit.cgi
diff --git a/pki/base/ra/forms/ee/server/admin.cgi b/base/ra/forms/ee/server/admin.cgi
index 18945da02..18945da02 100755
--- a/pki/base/ra/forms/ee/server/admin.cgi
+++ b/base/ra/forms/ee/server/admin.cgi
diff --git a/pki/base/ra/forms/ee/server/index.cgi b/base/ra/forms/ee/server/index.cgi
index 830409a8b..830409a8b 100755
--- a/pki/base/ra/forms/ee/server/index.cgi
+++ b/base/ra/forms/ee/server/index.cgi
diff --git a/pki/base/ra/forms/ee/server/submit.cgi b/base/ra/forms/ee/server/submit.cgi
index 4916033ee..4916033ee 100755
--- a/pki/base/ra/forms/ee/server/submit.cgi
+++ b/base/ra/forms/ee/server/submit.cgi
diff --git a/pki/base/ra/forms/ee/user/index.cgi b/base/ra/forms/ee/user/index.cgi
index ef6b3aa47..ef6b3aa47 100755
--- a/pki/base/ra/forms/ee/user/index.cgi
+++ b/base/ra/forms/ee/user/index.cgi
diff --git a/pki/base/ra/forms/ee/user/renew.cgi b/base/ra/forms/ee/user/renew.cgi
index 63d646ec9..63d646ec9 100755
--- a/pki/base/ra/forms/ee/user/renew.cgi
+++ b/base/ra/forms/ee/user/renew.cgi
diff --git a/pki/base/ra/forms/ee/user/renewal.cgi b/base/ra/forms/ee/user/renewal.cgi
index 63a211eff..63a211eff 100755
--- a/pki/base/ra/forms/ee/user/renewal.cgi
+++ b/base/ra/forms/ee/user/renewal.cgi
diff --git a/pki/base/ra/forms/ee/user/submit.cgi b/base/ra/forms/ee/user/submit.cgi
index 26c900e00..26c900e00 100755
--- a/pki/base/ra/forms/ee/user/submit.cgi
+++ b/base/ra/forms/ee/user/submit.cgi
diff --git a/pki/base/ra/forms/ee/user/user.cgi b/base/ra/forms/ee/user/user.cgi
index 2d58a532b..2d58a532b 100755
--- a/pki/base/ra/forms/ee/user/user.cgi
+++ b/base/ra/forms/ee/user/user.cgi
diff --git a/pki/base/ra/forms/index.cgi b/base/ra/forms/index.cgi
index 0e643166b..0e643166b 100755
--- a/pki/base/ra/forms/index.cgi
+++ b/base/ra/forms/index.cgi
diff --git a/pki/base/ra/lib/perl/PKI/Base/CertStore.pm b/base/ra/lib/perl/PKI/Base/CertStore.pm
index 1a31ff971..1a31ff971 100644
--- a/pki/base/ra/lib/perl/PKI/Base/CertStore.pm
+++ b/base/ra/lib/perl/PKI/Base/CertStore.pm
diff --git a/pki/base/ra/lib/perl/PKI/Base/Conf.pm b/base/ra/lib/perl/PKI/Base/Conf.pm
index 895ab28a3..895ab28a3 100755
--- a/pki/base/ra/lib/perl/PKI/Base/Conf.pm
+++ b/base/ra/lib/perl/PKI/Base/Conf.pm
diff --git a/pki/base/ra/lib/perl/PKI/Base/PinStore.pm b/base/ra/lib/perl/PKI/Base/PinStore.pm
index 437d259ff..437d259ff 100644
--- a/pki/base/ra/lib/perl/PKI/Base/PinStore.pm
+++ b/base/ra/lib/perl/PKI/Base/PinStore.pm
diff --git a/pki/base/ra/lib/perl/PKI/Base/Registry.pm b/base/ra/lib/perl/PKI/Base/Registry.pm
index a4fb83f28..a4fb83f28 100644
--- a/pki/base/ra/lib/perl/PKI/Base/Registry.pm
+++ b/base/ra/lib/perl/PKI/Base/Registry.pm
diff --git a/pki/base/ra/lib/perl/PKI/Base/TimeTool.pm b/base/ra/lib/perl/PKI/Base/TimeTool.pm
index 11f4be208..11f4be208 100755
--- a/pki/base/ra/lib/perl/PKI/Base/TimeTool.pm
+++ b/base/ra/lib/perl/PKI/Base/TimeTool.pm
diff --git a/pki/base/ra/lib/perl/PKI/Base/UserStore.pm b/base/ra/lib/perl/PKI/Base/UserStore.pm
index c05683792..c05683792 100644
--- a/pki/base/ra/lib/perl/PKI/Base/UserStore.pm
+++ b/base/ra/lib/perl/PKI/Base/UserStore.pm
diff --git a/pki/base/ra/lib/perl/PKI/Base/Util.pm b/base/ra/lib/perl/PKI/Base/Util.pm
index f01062e42..f01062e42 100755
--- a/pki/base/ra/lib/perl/PKI/Base/Util.pm
+++ b/base/ra/lib/perl/PKI/Base/Util.pm
diff --git a/pki/base/ra/lib/perl/PKI/Conn/CA.pm b/base/ra/lib/perl/PKI/Conn/CA.pm
index f3c8834ed..f3c8834ed 100644
--- a/pki/base/ra/lib/perl/PKI/Conn/CA.pm
+++ b/base/ra/lib/perl/PKI/Conn/CA.pm
diff --git a/pki/base/ra/lib/perl/PKI/RA/AdminAuthPanel.pm b/base/ra/lib/perl/PKI/RA/AdminAuthPanel.pm
index 656dc2d5e..656dc2d5e 100755
--- a/pki/base/ra/lib/perl/PKI/RA/AdminAuthPanel.pm
+++ b/base/ra/lib/perl/PKI/RA/AdminAuthPanel.pm
diff --git a/pki/base/ra/lib/perl/PKI/RA/AdminPanel.pm b/base/ra/lib/perl/PKI/RA/AdminPanel.pm
index a5538ef54..a5538ef54 100755
--- a/pki/base/ra/lib/perl/PKI/RA/AdminPanel.pm
+++ b/base/ra/lib/perl/PKI/RA/AdminPanel.pm
diff --git a/pki/base/ra/lib/perl/PKI/RA/AgentAuthPanel.pm b/base/ra/lib/perl/PKI/RA/AgentAuthPanel.pm
index 1ada5ad54..1ada5ad54 100755
--- a/pki/base/ra/lib/perl/PKI/RA/AgentAuthPanel.pm
+++ b/base/ra/lib/perl/PKI/RA/AgentAuthPanel.pm
diff --git a/pki/base/ra/lib/perl/PKI/RA/BasePanel.pm b/base/ra/lib/perl/PKI/RA/BasePanel.pm
index 5cb4d7697..5cb4d7697 100755
--- a/pki/base/ra/lib/perl/PKI/RA/BasePanel.pm
+++ b/base/ra/lib/perl/PKI/RA/BasePanel.pm
diff --git a/pki/base/ra/lib/perl/PKI/RA/CAInfoPanel.pm b/base/ra/lib/perl/PKI/RA/CAInfoPanel.pm
index 4cc65e5cf..4cc65e5cf 100755
--- a/pki/base/ra/lib/perl/PKI/RA/CAInfoPanel.pm
+++ b/base/ra/lib/perl/PKI/RA/CAInfoPanel.pm
diff --git a/pki/base/ra/lib/perl/PKI/RA/CertInfo.pm b/base/ra/lib/perl/PKI/RA/CertInfo.pm
index d1a8c3817..d1a8c3817 100755
--- a/pki/base/ra/lib/perl/PKI/RA/CertInfo.pm
+++ b/base/ra/lib/perl/PKI/RA/CertInfo.pm
diff --git a/pki/base/ra/lib/perl/PKI/RA/CertPrettyPrintPanel.pm b/base/ra/lib/perl/PKI/RA/CertPrettyPrintPanel.pm
index cf58d2327..cf58d2327 100755
--- a/pki/base/ra/lib/perl/PKI/RA/CertPrettyPrintPanel.pm
+++ b/base/ra/lib/perl/PKI/RA/CertPrettyPrintPanel.pm
diff --git a/pki/base/ra/lib/perl/PKI/RA/CertRequestPanel.pm b/base/ra/lib/perl/PKI/RA/CertRequestPanel.pm
index 51eb1d400..51eb1d400 100755
--- a/pki/base/ra/lib/perl/PKI/RA/CertRequestPanel.pm
+++ b/base/ra/lib/perl/PKI/RA/CertRequestPanel.pm
diff --git a/pki/base/ra/lib/perl/PKI/RA/Common.pm b/base/ra/lib/perl/PKI/RA/Common.pm
index 8deab8c6c..8deab8c6c 100755
--- a/pki/base/ra/lib/perl/PKI/RA/Common.pm
+++ b/base/ra/lib/perl/PKI/RA/Common.pm
diff --git a/pki/base/ra/lib/perl/PKI/RA/Config.pm b/base/ra/lib/perl/PKI/RA/Config.pm
index f1ace5b03..f1ace5b03 100755
--- a/pki/base/ra/lib/perl/PKI/RA/Config.pm
+++ b/base/ra/lib/perl/PKI/RA/Config.pm
diff --git a/pki/base/ra/lib/perl/PKI/RA/ConfigHSMLoginPanel.pm b/base/ra/lib/perl/PKI/RA/ConfigHSMLoginPanel.pm
index bf74890cc..bf74890cc 100755
--- a/pki/base/ra/lib/perl/PKI/RA/ConfigHSMLoginPanel.pm
+++ b/base/ra/lib/perl/PKI/RA/ConfigHSMLoginPanel.pm
diff --git a/pki/base/ra/lib/perl/PKI/RA/ConfigHSMPanel.pm b/base/ra/lib/perl/PKI/RA/ConfigHSMPanel.pm
index 095ed5879..095ed5879 100755
--- a/pki/base/ra/lib/perl/PKI/RA/ConfigHSMPanel.pm
+++ b/base/ra/lib/perl/PKI/RA/ConfigHSMPanel.pm
diff --git a/pki/base/ra/lib/perl/PKI/RA/DRMInfoPanel.pm b/base/ra/lib/perl/PKI/RA/DRMInfoPanel.pm
index fadd7727c..fadd7727c 100755
--- a/pki/base/ra/lib/perl/PKI/RA/DRMInfoPanel.pm
+++ b/base/ra/lib/perl/PKI/RA/DRMInfoPanel.pm
diff --git a/pki/base/ra/lib/perl/PKI/RA/DatabasePanel.pm b/base/ra/lib/perl/PKI/RA/DatabasePanel.pm
index e469e51f8..e469e51f8 100755
--- a/pki/base/ra/lib/perl/PKI/RA/DatabasePanel.pm
+++ b/base/ra/lib/perl/PKI/RA/DatabasePanel.pm
diff --git a/pki/base/ra/lib/perl/PKI/RA/DisplayCertChain2Panel.pm b/base/ra/lib/perl/PKI/RA/DisplayCertChain2Panel.pm
index 46c8a2902..46c8a2902 100755
--- a/pki/base/ra/lib/perl/PKI/RA/DisplayCertChain2Panel.pm
+++ b/base/ra/lib/perl/PKI/RA/DisplayCertChain2Panel.pm
diff --git a/pki/base/ra/lib/perl/PKI/RA/DisplayCertChainPanel.pm b/base/ra/lib/perl/PKI/RA/DisplayCertChainPanel.pm
index dd991a917..dd991a917 100755
--- a/pki/base/ra/lib/perl/PKI/RA/DisplayCertChainPanel.pm
+++ b/base/ra/lib/perl/PKI/RA/DisplayCertChainPanel.pm
diff --git a/pki/base/ra/lib/perl/PKI/RA/DonePanel.pm b/base/ra/lib/perl/PKI/RA/DonePanel.pm
index 4a32a8270..4a32a8270 100755
--- a/pki/base/ra/lib/perl/PKI/RA/DonePanel.pm
+++ b/base/ra/lib/perl/PKI/RA/DonePanel.pm
diff --git a/pki/base/ra/lib/perl/PKI/RA/GlobalVar.pm b/base/ra/lib/perl/PKI/RA/GlobalVar.pm
index 388a41349..388a41349 100755
--- a/pki/base/ra/lib/perl/PKI/RA/GlobalVar.pm
+++ b/base/ra/lib/perl/PKI/RA/GlobalVar.pm
diff --git a/pki/base/ra/lib/perl/PKI/RA/ImportAdminCertPanel.pm b/base/ra/lib/perl/PKI/RA/ImportAdminCertPanel.pm
index 9f9bef94a..9f9bef94a 100755
--- a/pki/base/ra/lib/perl/PKI/RA/ImportAdminCertPanel.pm
+++ b/base/ra/lib/perl/PKI/RA/ImportAdminCertPanel.pm
diff --git a/pki/base/ra/lib/perl/PKI/RA/Login.pm b/base/ra/lib/perl/PKI/RA/Login.pm
index d248e5481..d248e5481 100755
--- a/pki/base/ra/lib/perl/PKI/RA/Login.pm
+++ b/base/ra/lib/perl/PKI/RA/Login.pm
diff --git a/pki/base/ra/lib/perl/PKI/RA/LoginPanel.pm b/base/ra/lib/perl/PKI/RA/LoginPanel.pm
index 66f40acfe..66f40acfe 100755
--- a/pki/base/ra/lib/perl/PKI/RA/LoginPanel.pm
+++ b/base/ra/lib/perl/PKI/RA/LoginPanel.pm
diff --git a/pki/base/ra/lib/perl/PKI/RA/ModulePanel.pm b/base/ra/lib/perl/PKI/RA/ModulePanel.pm
index 87ce056bc..87ce056bc 100755
--- a/pki/base/ra/lib/perl/PKI/RA/ModulePanel.pm
+++ b/base/ra/lib/perl/PKI/RA/ModulePanel.pm
diff --git a/pki/base/ra/lib/perl/PKI/RA/Modutil.pm b/base/ra/lib/perl/PKI/RA/Modutil.pm
index 82c66e87d..82c66e87d 100755
--- a/pki/base/ra/lib/perl/PKI/RA/Modutil.pm
+++ b/base/ra/lib/perl/PKI/RA/Modutil.pm
diff --git a/pki/base/ra/lib/perl/PKI/RA/NamePanel.pm b/base/ra/lib/perl/PKI/RA/NamePanel.pm
index c30715aa2..c30715aa2 100755
--- a/pki/base/ra/lib/perl/PKI/RA/NamePanel.pm
+++ b/base/ra/lib/perl/PKI/RA/NamePanel.pm
diff --git a/pki/base/ra/lib/perl/PKI/RA/ReqCertInfo.pm b/base/ra/lib/perl/PKI/RA/ReqCertInfo.pm
index 51c22cd24..51c22cd24 100755
--- a/pki/base/ra/lib/perl/PKI/RA/ReqCertInfo.pm
+++ b/base/ra/lib/perl/PKI/RA/ReqCertInfo.pm
diff --git a/pki/base/ra/lib/perl/PKI/RA/SecurityDomainPanel.pm b/base/ra/lib/perl/PKI/RA/SecurityDomainPanel.pm
index 114b19ef0..114b19ef0 100755
--- a/pki/base/ra/lib/perl/PKI/RA/SecurityDomainPanel.pm
+++ b/base/ra/lib/perl/PKI/RA/SecurityDomainPanel.pm
diff --git a/pki/base/ra/lib/perl/PKI/RA/SizePanel.pm b/base/ra/lib/perl/PKI/RA/SizePanel.pm
index f55dc41e9..f55dc41e9 100755
--- a/pki/base/ra/lib/perl/PKI/RA/SizePanel.pm
+++ b/base/ra/lib/perl/PKI/RA/SizePanel.pm
diff --git a/pki/base/ra/lib/perl/PKI/RA/SubsystemTypePanel.pm b/base/ra/lib/perl/PKI/RA/SubsystemTypePanel.pm
index 3d946bca0..3d946bca0 100755
--- a/pki/base/ra/lib/perl/PKI/RA/SubsystemTypePanel.pm
+++ b/base/ra/lib/perl/PKI/RA/SubsystemTypePanel.pm
diff --git a/pki/base/ra/lib/perl/PKI/RA/TKSInfoPanel.pm b/base/ra/lib/perl/PKI/RA/TKSInfoPanel.pm
index ddf1124a9..ddf1124a9 100755
--- a/pki/base/ra/lib/perl/PKI/RA/TKSInfoPanel.pm
+++ b/base/ra/lib/perl/PKI/RA/TKSInfoPanel.pm
diff --git a/pki/base/ra/lib/perl/PKI/RA/WelcomePanel.pm b/base/ra/lib/perl/PKI/RA/WelcomePanel.pm
index c88c138be..c88c138be 100755
--- a/pki/base/ra/lib/perl/PKI/RA/WelcomePanel.pm
+++ b/base/ra/lib/perl/PKI/RA/WelcomePanel.pm
diff --git a/pki/base/ra/lib/perl/PKI/RA/wizard.pm b/base/ra/lib/perl/PKI/RA/wizard.pm
index 5fe1e7536..5fe1e7536 100755
--- a/pki/base/ra/lib/perl/PKI/RA/wizard.pm
+++ b/base/ra/lib/perl/PKI/RA/wizard.pm
diff --git a/pki/base/ra/lib/perl/PKI/Request/Plugin/AutoAssign.pm b/base/ra/lib/perl/PKI/Request/Plugin/AutoAssign.pm
index 671f2418d..671f2418d 100644
--- a/pki/base/ra/lib/perl/PKI/Request/Plugin/AutoAssign.pm
+++ b/base/ra/lib/perl/PKI/Request/Plugin/AutoAssign.pm
diff --git a/pki/base/ra/lib/perl/PKI/Request/Plugin/CreatePin.pm b/base/ra/lib/perl/PKI/Request/Plugin/CreatePin.pm
index b90096664..b90096664 100644
--- a/pki/base/ra/lib/perl/PKI/Request/Plugin/CreatePin.pm
+++ b/base/ra/lib/perl/PKI/Request/Plugin/CreatePin.pm
diff --git a/pki/base/ra/lib/perl/PKI/Request/Plugin/EmailNotification.pm b/base/ra/lib/perl/PKI/Request/Plugin/EmailNotification.pm
index 95274bfa7..95274bfa7 100644
--- a/pki/base/ra/lib/perl/PKI/Request/Plugin/EmailNotification.pm
+++ b/base/ra/lib/perl/PKI/Request/Plugin/EmailNotification.pm
diff --git a/pki/base/ra/lib/perl/PKI/Request/Plugin/RequestToCA.pm b/base/ra/lib/perl/PKI/Request/Plugin/RequestToCA.pm
index 1c5b7d6b2..1c5b7d6b2 100644
--- a/pki/base/ra/lib/perl/PKI/Request/Plugin/RequestToCA.pm
+++ b/base/ra/lib/perl/PKI/Request/Plugin/RequestToCA.pm
diff --git a/pki/base/ra/lib/perl/PKI/Request/Queue.pm b/base/ra/lib/perl/PKI/Request/Queue.pm
index dc8418d22..dc8418d22 100644
--- a/pki/base/ra/lib/perl/PKI/Request/Queue.pm
+++ b/base/ra/lib/perl/PKI/Request/Queue.pm
diff --git a/pki/base/ra/lib/perl/PKI/Service/Op.pm b/base/ra/lib/perl/PKI/Service/Op.pm
index 602f1a29f..602f1a29f 100644
--- a/pki/base/ra/lib/perl/PKI/Service/Op.pm
+++ b/base/ra/lib/perl/PKI/Service/Op.pm
diff --git a/pki/base/ra/lib/perl/Template/Velocity.pm b/base/ra/lib/perl/Template/Velocity.pm
index 848de65fd..848de65fd 100755
--- a/pki/base/ra/lib/perl/Template/Velocity.pm
+++ b/base/ra/lib/perl/Template/Velocity.pm
diff --git a/pki/base/ra/scripts/nss_pcache b/base/ra/scripts/nss_pcache
index bf978b48b..bf978b48b 100755
--- a/pki/base/ra/scripts/nss_pcache
+++ b/base/ra/scripts/nss_pcache
diff --git a/pki/base/ra/scripts/schema.sql b/base/ra/scripts/schema.sql
index 18fd8a39c..18fd8a39c 100644
--- a/pki/base/ra/scripts/schema.sql
+++ b/base/ra/scripts/schema.sql
diff --git a/pki/base/ra/setup/CMakeLists.txt b/base/ra/setup/CMakeLists.txt
index f5f069cdb..f5f069cdb 100644
--- a/pki/base/ra/setup/CMakeLists.txt
+++ b/base/ra/setup/CMakeLists.txt
diff --git a/pki/base/ra/setup/registry_instance b/base/ra/setup/registry_instance
index 64a73197f..64a73197f 100644
--- a/pki/base/ra/setup/registry_instance
+++ b/base/ra/setup/registry_instance
diff --git a/pki/base/scripts/enable_cvs_keywords_in_svn b/base/scripts/enable_cvs_keywords_in_svn
index fd14a885f..fd14a885f 100755
--- a/pki/base/scripts/enable_cvs_keywords_in_svn
+++ b/base/scripts/enable_cvs_keywords_in_svn
diff --git a/pki/base/scripts/pkicheck b/base/scripts/pkicheck
index 3ff548d3d..3ff548d3d 100755
--- a/pki/base/scripts/pkicheck
+++ b/base/scripts/pkicheck
diff --git a/pki/base/scripts/pkimanifest b/base/scripts/pkimanifest
index 31d443cfc..31d443cfc 100755
--- a/pki/base/scripts/pkimanifest
+++ b/base/scripts/pkimanifest
diff --git a/pki/base/selinux/CMakeLists.txt b/base/selinux/CMakeLists.txt
index a9ef0707f..a9ef0707f 100644
--- a/pki/base/selinux/CMakeLists.txt
+++ b/base/selinux/CMakeLists.txt
diff --git a/pki/base/selinux/LICENSE b/base/selinux/LICENSE
index e281f4362..e281f4362 100644
--- a/pki/base/selinux/LICENSE
+++ b/base/selinux/LICENSE
diff --git a/pki/base/selinux/src/CMakeLists.txt b/base/selinux/src/CMakeLists.txt
index 146ab1348..146ab1348 100644
--- a/pki/base/selinux/src/CMakeLists.txt
+++ b/base/selinux/src/CMakeLists.txt
diff --git a/pki/base/selinux/src/Makefile b/base/selinux/src/Makefile
index 201a448a9..201a448a9 100644
--- a/pki/base/selinux/src/Makefile
+++ b/base/selinux/src/Makefile
diff --git a/pki/base/selinux/src/pki.fc b/base/selinux/src/pki.fc
index 3a22d86a4..3a22d86a4 100644
--- a/pki/base/selinux/src/pki.fc
+++ b/base/selinux/src/pki.fc
diff --git a/pki/base/selinux/src/pki.if b/base/selinux/src/pki.if
index 0709176ea..0709176ea 100644
--- a/pki/base/selinux/src/pki.if
+++ b/base/selinux/src/pki.if
diff --git a/pki/base/selinux/src/pki.sh b/base/selinux/src/pki.sh
index bf95ba98c..bf95ba98c 100755
--- a/pki/base/selinux/src/pki.sh
+++ b/base/selinux/src/pki.sh
diff --git a/pki/base/selinux/src/pki.te b/base/selinux/src/pki.te
index 7f6e65738..7f6e65738 100644
--- a/pki/base/selinux/src/pki.te
+++ b/base/selinux/src/pki.te
diff --git a/pki/base/setup/CMakeLists.txt b/base/setup/CMakeLists.txt
index 2ed50ee62..2ed50ee62 100644
--- a/pki/base/setup/CMakeLists.txt
+++ b/base/setup/CMakeLists.txt
diff --git a/pki/base/setup/LICENSE b/base/setup/LICENSE
index e281f4362..e281f4362 100644
--- a/pki/base/setup/LICENSE
+++ b/base/setup/LICENSE
diff --git a/pki/base/setup/jars/resteasy-jettison-provider-2.3-RC1.jar b/base/setup/jars/resteasy-jettison-provider-2.3-RC1.jar
index da7106ddd..da7106ddd 100644
--- a/pki/base/setup/jars/resteasy-jettison-provider-2.3-RC1.jar
+++ b/base/setup/jars/resteasy-jettison-provider-2.3-RC1.jar
diff --git a/pki/base/setup/pki-setup-proxy b/base/setup/pki-setup-proxy
index 0222eab46..0222eab46 100755
--- a/pki/base/setup/pki-setup-proxy
+++ b/base/setup/pki-setup-proxy
diff --git a/pki/base/setup/pkicommon.pm b/base/setup/pkicommon.pm
index 6ce255303..6ce255303 100755
--- a/pki/base/setup/pkicommon.pm
+++ b/base/setup/pkicommon.pm
diff --git a/pki/base/setup/pkicreate b/base/setup/pkicreate
index edde86ecc..edde86ecc 100755
--- a/pki/base/setup/pkicreate
+++ b/base/setup/pkicreate
diff --git a/pki/base/setup/pkiremove b/base/setup/pkiremove
index dd9fbc7f9..dd9fbc7f9 100755
--- a/pki/base/setup/pkiremove
+++ b/base/setup/pkiremove
diff --git a/pki/base/setup/scripts/functions b/base/setup/scripts/functions
index 516bf32e2..516bf32e2 100644
--- a/pki/base/setup/scripts/functions
+++ b/base/setup/scripts/functions
diff --git a/pki/base/setup/scripts/pki_apache_initscript b/base/setup/scripts/pki_apache_initscript
index e51231065..e51231065 100755
--- a/pki/base/setup/scripts/pki_apache_initscript
+++ b/base/setup/scripts/pki_apache_initscript
diff --git a/pki/base/setup/scripts/pkicontrol b/base/setup/scripts/pkicontrol
index f9a279b07..f9a279b07 100755
--- a/pki/base/setup/scripts/pkicontrol
+++ b/base/setup/scripts/pkicontrol
diff --git a/pki/base/silent/CMakeLists.txt b/base/silent/CMakeLists.txt
index 8f71375dc..8f71375dc 100644
--- a/pki/base/silent/CMakeLists.txt
+++ b/base/silent/CMakeLists.txt
diff --git a/pki/base/silent/LICENSE b/base/silent/LICENSE
index e281f4362..e281f4362 100644
--- a/pki/base/silent/LICENSE
+++ b/base/silent/LICENSE
diff --git a/pki/base/silent/scripts/CMakeLists.txt b/base/silent/scripts/CMakeLists.txt
index df4dfc469..df4dfc469 100644
--- a/pki/base/silent/scripts/CMakeLists.txt
+++ b/base/silent/scripts/CMakeLists.txt
diff --git a/pki/base/silent/scripts/pkisilent b/base/silent/scripts/pkisilent
index c5be67855..c5be67855 100755
--- a/pki/base/silent/scripts/pkisilent
+++ b/base/silent/scripts/pkisilent
diff --git a/pki/base/silent/src/CMakeLists.txt b/base/silent/src/CMakeLists.txt
index a3e6034f8..a3e6034f8 100644
--- a/pki/base/silent/src/CMakeLists.txt
+++ b/base/silent/src/CMakeLists.txt
diff --git a/pki/base/silent/src/com/netscape/pkisilent/ConfigureCA.java b/base/silent/src/com/netscape/pkisilent/ConfigureCA.java
index 3c498febe..3c498febe 100644
--- a/pki/base/silent/src/com/netscape/pkisilent/ConfigureCA.java
+++ b/base/silent/src/com/netscape/pkisilent/ConfigureCA.java
diff --git a/pki/base/silent/src/com/netscape/pkisilent/ConfigureDRM.java b/base/silent/src/com/netscape/pkisilent/ConfigureDRM.java
index 7d548ddf3..7d548ddf3 100644
--- a/pki/base/silent/src/com/netscape/pkisilent/ConfigureDRM.java
+++ b/base/silent/src/com/netscape/pkisilent/ConfigureDRM.java
diff --git a/pki/base/silent/src/com/netscape/pkisilent/ConfigureOCSP.java b/base/silent/src/com/netscape/pkisilent/ConfigureOCSP.java
index 53c014b74..53c014b74 100644
--- a/pki/base/silent/src/com/netscape/pkisilent/ConfigureOCSP.java
+++ b/base/silent/src/com/netscape/pkisilent/ConfigureOCSP.java
diff --git a/pki/base/silent/src/com/netscape/pkisilent/ConfigureRA.java b/base/silent/src/com/netscape/pkisilent/ConfigureRA.java
index 3de70a067..3de70a067 100644
--- a/pki/base/silent/src/com/netscape/pkisilent/ConfigureRA.java
+++ b/base/silent/src/com/netscape/pkisilent/ConfigureRA.java
diff --git a/pki/base/silent/src/com/netscape/pkisilent/ConfigureSubCA.java b/base/silent/src/com/netscape/pkisilent/ConfigureSubCA.java
index 706827c74..706827c74 100644
--- a/pki/base/silent/src/com/netscape/pkisilent/ConfigureSubCA.java
+++ b/base/silent/src/com/netscape/pkisilent/ConfigureSubCA.java
diff --git a/pki/base/silent/src/com/netscape/pkisilent/ConfigureTKS.java b/base/silent/src/com/netscape/pkisilent/ConfigureTKS.java
index 760690888..760690888 100644
--- a/pki/base/silent/src/com/netscape/pkisilent/ConfigureTKS.java
+++ b/base/silent/src/com/netscape/pkisilent/ConfigureTKS.java
diff --git a/pki/base/silent/src/com/netscape/pkisilent/ConfigureTPS.java b/base/silent/src/com/netscape/pkisilent/ConfigureTPS.java
index 366fb57b6..366fb57b6 100644
--- a/pki/base/silent/src/com/netscape/pkisilent/ConfigureTPS.java
+++ b/base/silent/src/com/netscape/pkisilent/ConfigureTPS.java
diff --git a/pki/base/silent/src/com/netscape/pkisilent/PKISilent.java b/base/silent/src/com/netscape/pkisilent/PKISilent.java
index f90832481..f90832481 100644
--- a/pki/base/silent/src/com/netscape/pkisilent/PKISilent.java
+++ b/base/silent/src/com/netscape/pkisilent/PKISilent.java
diff --git a/pki/base/silent/src/com/netscape/pkisilent/argparser/ArgParseException.java b/base/silent/src/com/netscape/pkisilent/argparser/ArgParseException.java
index de3c58bd4..de3c58bd4 100644
--- a/pki/base/silent/src/com/netscape/pkisilent/argparser/ArgParseException.java
+++ b/base/silent/src/com/netscape/pkisilent/argparser/ArgParseException.java
diff --git a/pki/base/silent/src/com/netscape/pkisilent/argparser/ArgParser.java b/base/silent/src/com/netscape/pkisilent/argparser/ArgParser.java
index ed5f98b1d..ed5f98b1d 100755
--- a/pki/base/silent/src/com/netscape/pkisilent/argparser/ArgParser.java
+++ b/base/silent/src/com/netscape/pkisilent/argparser/ArgParser.java
diff --git a/pki/base/silent/src/com/netscape/pkisilent/argparser/ArgParserTest.java b/base/silent/src/com/netscape/pkisilent/argparser/ArgParserTest.java
index 9ddb80778..9ddb80778 100644
--- a/pki/base/silent/src/com/netscape/pkisilent/argparser/ArgParserTest.java
+++ b/base/silent/src/com/netscape/pkisilent/argparser/ArgParserTest.java
diff --git a/pki/base/silent/src/com/netscape/pkisilent/argparser/BooleanHolder.java b/base/silent/src/com/netscape/pkisilent/argparser/BooleanHolder.java
index ba10022b5..ba10022b5 100644
--- a/pki/base/silent/src/com/netscape/pkisilent/argparser/BooleanHolder.java
+++ b/base/silent/src/com/netscape/pkisilent/argparser/BooleanHolder.java
diff --git a/pki/base/silent/src/com/netscape/pkisilent/argparser/CharHolder.java b/base/silent/src/com/netscape/pkisilent/argparser/CharHolder.java
index 453cac8b2..453cac8b2 100644
--- a/pki/base/silent/src/com/netscape/pkisilent/argparser/CharHolder.java
+++ b/base/silent/src/com/netscape/pkisilent/argparser/CharHolder.java
diff --git a/pki/base/silent/src/com/netscape/pkisilent/argparser/DoubleHolder.java b/base/silent/src/com/netscape/pkisilent/argparser/DoubleHolder.java
index 13012a641..13012a641 100644
--- a/pki/base/silent/src/com/netscape/pkisilent/argparser/DoubleHolder.java
+++ b/base/silent/src/com/netscape/pkisilent/argparser/DoubleHolder.java
diff --git a/pki/base/silent/src/com/netscape/pkisilent/argparser/FloatHolder.java b/base/silent/src/com/netscape/pkisilent/argparser/FloatHolder.java
index b8474b535..b8474b535 100644
--- a/pki/base/silent/src/com/netscape/pkisilent/argparser/FloatHolder.java
+++ b/base/silent/src/com/netscape/pkisilent/argparser/FloatHolder.java
diff --git a/pki/base/silent/src/com/netscape/pkisilent/argparser/IntHolder.java b/base/silent/src/com/netscape/pkisilent/argparser/IntHolder.java
index a94ceea1e..a94ceea1e 100644
--- a/pki/base/silent/src/com/netscape/pkisilent/argparser/IntHolder.java
+++ b/base/silent/src/com/netscape/pkisilent/argparser/IntHolder.java
diff --git a/pki/base/silent/src/com/netscape/pkisilent/argparser/LongHolder.java b/base/silent/src/com/netscape/pkisilent/argparser/LongHolder.java
index 5656d8b86..5656d8b86 100644
--- a/pki/base/silent/src/com/netscape/pkisilent/argparser/LongHolder.java
+++ b/base/silent/src/com/netscape/pkisilent/argparser/LongHolder.java
diff --git a/pki/base/silent/src/com/netscape/pkisilent/argparser/ObjectHolder.java b/base/silent/src/com/netscape/pkisilent/argparser/ObjectHolder.java
index 70e050fde..70e050fde 100644
--- a/pki/base/silent/src/com/netscape/pkisilent/argparser/ObjectHolder.java
+++ b/base/silent/src/com/netscape/pkisilent/argparser/ObjectHolder.java
diff --git a/pki/base/silent/src/com/netscape/pkisilent/argparser/SimpleExample.java b/base/silent/src/com/netscape/pkisilent/argparser/SimpleExample.java
index 6970d318d..6970d318d 100644
--- a/pki/base/silent/src/com/netscape/pkisilent/argparser/SimpleExample.java
+++ b/base/silent/src/com/netscape/pkisilent/argparser/SimpleExample.java
diff --git a/pki/base/silent/src/com/netscape/pkisilent/argparser/StringHolder.java b/base/silent/src/com/netscape/pkisilent/argparser/StringHolder.java
index 937360346..937360346 100644
--- a/pki/base/silent/src/com/netscape/pkisilent/argparser/StringHolder.java
+++ b/base/silent/src/com/netscape/pkisilent/argparser/StringHolder.java
diff --git a/pki/base/silent/src/com/netscape/pkisilent/argparser/StringScanException.java b/base/silent/src/com/netscape/pkisilent/argparser/StringScanException.java
index bf3ea6dc3..bf3ea6dc3 100644
--- a/pki/base/silent/src/com/netscape/pkisilent/argparser/StringScanException.java
+++ b/base/silent/src/com/netscape/pkisilent/argparser/StringScanException.java
diff --git a/pki/base/silent/src/com/netscape/pkisilent/argparser/StringScanner.java b/base/silent/src/com/netscape/pkisilent/argparser/StringScanner.java
index 271dd0c62..271dd0c62 100644
--- a/pki/base/silent/src/com/netscape/pkisilent/argparser/StringScanner.java
+++ b/base/silent/src/com/netscape/pkisilent/argparser/StringScanner.java
diff --git a/pki/base/silent/src/com/netscape/pkisilent/common/BaseState.java b/base/silent/src/com/netscape/pkisilent/common/BaseState.java
index 0d5e9cfc6..0d5e9cfc6 100644
--- a/pki/base/silent/src/com/netscape/pkisilent/common/BaseState.java
+++ b/base/silent/src/com/netscape/pkisilent/common/BaseState.java
diff --git a/pki/base/silent/src/com/netscape/pkisilent/common/CMSConfig.java b/base/silent/src/com/netscape/pkisilent/common/CMSConfig.java
index 3e4f0bfa2..3e4f0bfa2 100644
--- a/pki/base/silent/src/com/netscape/pkisilent/common/CMSConfig.java
+++ b/base/silent/src/com/netscape/pkisilent/common/CMSConfig.java
diff --git a/pki/base/silent/src/com/netscape/pkisilent/common/CMSLDAP.java b/base/silent/src/com/netscape/pkisilent/common/CMSLDAP.java
index 91a273df6..91a273df6 100644
--- a/pki/base/silent/src/com/netscape/pkisilent/common/CMSLDAP.java
+++ b/base/silent/src/com/netscape/pkisilent/common/CMSLDAP.java
diff --git a/pki/base/silent/src/com/netscape/pkisilent/common/CMSProperties.java b/base/silent/src/com/netscape/pkisilent/common/CMSProperties.java
index a4ba55d29..a4ba55d29 100644
--- a/pki/base/silent/src/com/netscape/pkisilent/common/CMSProperties.java
+++ b/base/silent/src/com/netscape/pkisilent/common/CMSProperties.java
diff --git a/pki/base/silent/src/com/netscape/pkisilent/common/CMSTask.java b/base/silent/src/com/netscape/pkisilent/common/CMSTask.java
index 4b6c75ba3..4b6c75ba3 100644
--- a/pki/base/silent/src/com/netscape/pkisilent/common/CMSTask.java
+++ b/base/silent/src/com/netscape/pkisilent/common/CMSTask.java
diff --git a/pki/base/silent/src/com/netscape/pkisilent/common/CertificateRecord.java b/base/silent/src/com/netscape/pkisilent/common/CertificateRecord.java
index 9599eb6dd..9599eb6dd 100644
--- a/pki/base/silent/src/com/netscape/pkisilent/common/CertificateRecord.java
+++ b/base/silent/src/com/netscape/pkisilent/common/CertificateRecord.java
diff --git a/pki/base/silent/src/com/netscape/pkisilent/common/ComCrypto.java b/base/silent/src/com/netscape/pkisilent/common/ComCrypto.java
index d629030f2..d629030f2 100644
--- a/pki/base/silent/src/com/netscape/pkisilent/common/ComCrypto.java
+++ b/base/silent/src/com/netscape/pkisilent/common/ComCrypto.java
diff --git a/pki/base/silent/src/com/netscape/pkisilent/common/Con2Agent.java b/base/silent/src/com/netscape/pkisilent/common/Con2Agent.java
index 61305305e..61305305e 100644
--- a/pki/base/silent/src/com/netscape/pkisilent/common/Con2Agent.java
+++ b/base/silent/src/com/netscape/pkisilent/common/Con2Agent.java
diff --git a/pki/base/silent/src/com/netscape/pkisilent/common/DirEnroll.java b/base/silent/src/com/netscape/pkisilent/common/DirEnroll.java
index 019b75825..019b75825 100644
--- a/pki/base/silent/src/com/netscape/pkisilent/common/DirEnroll.java
+++ b/base/silent/src/com/netscape/pkisilent/common/DirEnroll.java
diff --git a/pki/base/silent/src/com/netscape/pkisilent/common/ParseXML.java b/base/silent/src/com/netscape/pkisilent/common/ParseXML.java
index de1b38172..de1b38172 100644
--- a/pki/base/silent/src/com/netscape/pkisilent/common/ParseXML.java
+++ b/base/silent/src/com/netscape/pkisilent/common/ParseXML.java
diff --git a/pki/base/silent/src/com/netscape/pkisilent/common/PostQuery.java b/base/silent/src/com/netscape/pkisilent/common/PostQuery.java
index 31fb07b3e..31fb07b3e 100644
--- a/pki/base/silent/src/com/netscape/pkisilent/common/PostQuery.java
+++ b/base/silent/src/com/netscape/pkisilent/common/PostQuery.java
diff --git a/pki/base/silent/src/com/netscape/pkisilent/common/Request.java b/base/silent/src/com/netscape/pkisilent/common/Request.java
index 3dffc929c..3dffc929c 100644
--- a/pki/base/silent/src/com/netscape/pkisilent/common/Request.java
+++ b/base/silent/src/com/netscape/pkisilent/common/Request.java
diff --git a/pki/base/silent/src/com/netscape/pkisilent/common/ServerInfo.java b/base/silent/src/com/netscape/pkisilent/common/ServerInfo.java
index f63456b4d..f63456b4d 100644
--- a/pki/base/silent/src/com/netscape/pkisilent/common/ServerInfo.java
+++ b/base/silent/src/com/netscape/pkisilent/common/ServerInfo.java
diff --git a/pki/base/silent/src/com/netscape/pkisilent/common/TestClient.java b/base/silent/src/com/netscape/pkisilent/common/TestClient.java
index 0e4ed9cdd..0e4ed9cdd 100644
--- a/pki/base/silent/src/com/netscape/pkisilent/common/TestClient.java
+++ b/base/silent/src/com/netscape/pkisilent/common/TestClient.java
diff --git a/pki/base/silent/src/com/netscape/pkisilent/common/UserEnroll.java b/base/silent/src/com/netscape/pkisilent/common/UserEnroll.java
index c55088bc6..c55088bc6 100644
--- a/pki/base/silent/src/com/netscape/pkisilent/common/UserEnroll.java
+++ b/base/silent/src/com/netscape/pkisilent/common/UserEnroll.java
diff --git a/pki/base/silent/src/com/netscape/pkisilent/common/Utilities.java b/base/silent/src/com/netscape/pkisilent/common/Utilities.java
index 3e5d6fb4c..3e5d6fb4c 100644
--- a/pki/base/silent/src/com/netscape/pkisilent/common/Utilities.java
+++ b/base/silent/src/com/netscape/pkisilent/common/Utilities.java
diff --git a/pki/base/silent/src/com/netscape/pkisilent/common/checkRequest.java b/base/silent/src/com/netscape/pkisilent/common/checkRequest.java
index c4599ffde..c4599ffde 100644
--- a/pki/base/silent/src/com/netscape/pkisilent/common/checkRequest.java
+++ b/base/silent/src/com/netscape/pkisilent/common/checkRequest.java
diff --git a/pki/base/silent/src/com/netscape/pkisilent/http/CertSelection.java b/base/silent/src/com/netscape/pkisilent/http/CertSelection.java
index ff541b6c6..ff541b6c6 100644
--- a/pki/base/silent/src/com/netscape/pkisilent/http/CertSelection.java
+++ b/base/silent/src/com/netscape/pkisilent/http/CertSelection.java
diff --git a/pki/base/silent/src/com/netscape/pkisilent/http/HTMLDocument.java b/base/silent/src/com/netscape/pkisilent/http/HTMLDocument.java
index e8de29081..e8de29081 100644
--- a/pki/base/silent/src/com/netscape/pkisilent/http/HTMLDocument.java
+++ b/base/silent/src/com/netscape/pkisilent/http/HTMLDocument.java
diff --git a/pki/base/silent/src/com/netscape/pkisilent/http/HTTPClient.java b/base/silent/src/com/netscape/pkisilent/http/HTTPClient.java
index f3980c0ed..f3980c0ed 100644
--- a/pki/base/silent/src/com/netscape/pkisilent/http/HTTPClient.java
+++ b/base/silent/src/com/netscape/pkisilent/http/HTTPClient.java
diff --git a/pki/base/silent/src/com/netscape/pkisilent/http/HTTPResponse.java b/base/silent/src/com/netscape/pkisilent/http/HTTPResponse.java
index 9ade1c133..9ade1c133 100644
--- a/pki/base/silent/src/com/netscape/pkisilent/http/HTTPResponse.java
+++ b/base/silent/src/com/netscape/pkisilent/http/HTTPResponse.java
diff --git a/pki/base/silent/templates/pki_silent.template b/base/silent/templates/pki_silent.template
index 93ff5849a..93ff5849a 100755
--- a/pki/base/silent/templates/pki_silent.template
+++ b/base/silent/templates/pki_silent.template
diff --git a/pki/base/silent/templates/subca_silent.template b/base/silent/templates/subca_silent.template
index 1475996d1..1475996d1 100755
--- a/pki/base/silent/templates/subca_silent.template
+++ b/base/silent/templates/subca_silent.template
diff --git a/pki/base/symkey/CMakeLists.txt b/base/symkey/CMakeLists.txt
index e994c0721..e994c0721 100644
--- a/pki/base/symkey/CMakeLists.txt
+++ b/base/symkey/CMakeLists.txt
diff --git a/pki/base/symkey/LICENSE b/base/symkey/LICENSE
index fbd2b7ff4..fbd2b7ff4 100644
--- a/pki/base/symkey/LICENSE
+++ b/base/symkey/LICENSE
diff --git a/pki/base/symkey/src/CMakeLists.txt b/base/symkey/src/CMakeLists.txt
index 599a7cb5a..599a7cb5a 100644
--- a/pki/base/symkey/src/CMakeLists.txt
+++ b/base/symkey/src/CMakeLists.txt
diff --git a/pki/base/symkey/src/com/netscape/symkey/Base.h b/base/symkey/src/com/netscape/symkey/Base.h
index cdcf72bcf..cdcf72bcf 100644
--- a/pki/base/symkey/src/com/netscape/symkey/Base.h
+++ b/base/symkey/src/com/netscape/symkey/Base.h
diff --git a/pki/base/symkey/src/com/netscape/symkey/Buffer.cpp b/base/symkey/src/com/netscape/symkey/Buffer.cpp
index 5c687c5f5..5c687c5f5 100644
--- a/pki/base/symkey/src/com/netscape/symkey/Buffer.cpp
+++ b/base/symkey/src/com/netscape/symkey/Buffer.cpp
diff --git a/pki/base/symkey/src/com/netscape/symkey/Buffer.h b/base/symkey/src/com/netscape/symkey/Buffer.h
index 2e0256d87..2e0256d87 100644
--- a/pki/base/symkey/src/com/netscape/symkey/Buffer.h
+++ b/base/symkey/src/com/netscape/symkey/Buffer.h
diff --git a/pki/base/symkey/src/com/netscape/symkey/CMakeLists.txt b/base/symkey/src/com/netscape/symkey/CMakeLists.txt
index 47d40a3f1..47d40a3f1 100644
--- a/pki/base/symkey/src/com/netscape/symkey/CMakeLists.txt
+++ b/base/symkey/src/com/netscape/symkey/CMakeLists.txt
diff --git a/pki/base/symkey/src/com/netscape/symkey/EncryptData.cpp b/base/symkey/src/com/netscape/symkey/EncryptData.cpp
index ccb817f7c..ccb817f7c 100644
--- a/pki/base/symkey/src/com/netscape/symkey/EncryptData.cpp
+++ b/base/symkey/src/com/netscape/symkey/EncryptData.cpp
diff --git a/pki/base/symkey/src/com/netscape/symkey/SessionKey.cpp b/base/symkey/src/com/netscape/symkey/SessionKey.cpp
index eb412f01a..eb412f01a 100644
--- a/pki/base/symkey/src/com/netscape/symkey/SessionKey.cpp
+++ b/base/symkey/src/com/netscape/symkey/SessionKey.cpp
diff --git a/pki/base/symkey/src/com/netscape/symkey/SessionKey.java b/base/symkey/src/com/netscape/symkey/SessionKey.java
index 47f9385f7..47f9385f7 100644
--- a/pki/base/symkey/src/com/netscape/symkey/SessionKey.java
+++ b/base/symkey/src/com/netscape/symkey/SessionKey.java
diff --git a/pki/base/symkey/src/com/netscape/symkey/SymKey.cpp b/base/symkey/src/com/netscape/symkey/SymKey.cpp
index c300d1ada..c300d1ada 100644
--- a/pki/base/symkey/src/com/netscape/symkey/SymKey.cpp
+++ b/base/symkey/src/com/netscape/symkey/SymKey.cpp
diff --git a/pki/base/symkey/src/com/netscape/symkey/SymKey.h b/base/symkey/src/com/netscape/symkey/SymKey.h
index 5a53d48c9..5a53d48c9 100644
--- a/pki/base/symkey/src/com/netscape/symkey/SymKey.h
+++ b/base/symkey/src/com/netscape/symkey/SymKey.h
diff --git a/pki/base/test/CMakeLists.txt b/base/test/CMakeLists.txt
index 9a4acceef..9a4acceef 100644
--- a/pki/base/test/CMakeLists.txt
+++ b/base/test/CMakeLists.txt
diff --git a/pki/base/test/src/CMakeLists.txt b/base/test/src/CMakeLists.txt
index 3631baa73..3631baa73 100644
--- a/pki/base/test/src/CMakeLists.txt
+++ b/base/test/src/CMakeLists.txt
diff --git a/pki/base/test/src/com/netscape/test/TestListener.java b/base/test/src/com/netscape/test/TestListener.java
index 96c4c9068..96c4c9068 100644
--- a/pki/base/test/src/com/netscape/test/TestListener.java
+++ b/base/test/src/com/netscape/test/TestListener.java
diff --git a/pki/base/test/src/com/netscape/test/TestRunner.java b/base/test/src/com/netscape/test/TestRunner.java
index 7eb4bfd3e..7eb4bfd3e 100644
--- a/pki/base/test/src/com/netscape/test/TestRunner.java
+++ b/base/test/src/com/netscape/test/TestRunner.java
diff --git a/pki/base/tks/CMakeLists.txt b/base/tks/CMakeLists.txt
index fd9246948..fd9246948 100644
--- a/pki/base/tks/CMakeLists.txt
+++ b/base/tks/CMakeLists.txt
diff --git a/pki/base/tks/LICENSE b/base/tks/LICENSE
index e281f4362..e281f4362 100644
--- a/pki/base/tks/LICENSE
+++ b/base/tks/LICENSE
diff --git a/pki/base/tks/setup/CMakeLists.txt b/base/tks/setup/CMakeLists.txt
index f5f069cdb..f5f069cdb 100644
--- a/pki/base/tks/setup/CMakeLists.txt
+++ b/base/tks/setup/CMakeLists.txt
diff --git a/pki/base/tks/setup/registry_instance b/base/tks/setup/registry_instance
index 3210b9131..3210b9131 100644
--- a/pki/base/tks/setup/registry_instance
+++ b/base/tks/setup/registry_instance
diff --git a/pki/base/tks/shared/conf/CMakeLists.txt b/base/tks/shared/conf/CMakeLists.txt
index e3cef5915..e3cef5915 100644
--- a/pki/base/tks/shared/conf/CMakeLists.txt
+++ b/base/tks/shared/conf/CMakeLists.txt
diff --git a/pki/base/tks/shared/conf/CS.cfg.in b/base/tks/shared/conf/CS.cfg.in
index 195201e4d..195201e4d 100644
--- a/pki/base/tks/shared/conf/CS.cfg.in
+++ b/base/tks/shared/conf/CS.cfg.in
diff --git a/pki/base/tks/shared/conf/acl.ldif b/base/tks/shared/conf/acl.ldif
index b38b5963f..b38b5963f 100644
--- a/pki/base/tks/shared/conf/acl.ldif
+++ b/base/tks/shared/conf/acl.ldif
diff --git a/pki/base/tks/shared/conf/catalina.policy b/base/tks/shared/conf/catalina.policy
index cf8302cd0..cf8302cd0 100644
--- a/pki/base/tks/shared/conf/catalina.policy
+++ b/base/tks/shared/conf/catalina.policy
diff --git a/pki/base/tks/shared/conf/catalina.properties b/base/tks/shared/conf/catalina.properties
index 70cb7c05e..70cb7c05e 100644
--- a/pki/base/tks/shared/conf/catalina.properties
+++ b/base/tks/shared/conf/catalina.properties
diff --git a/pki/base/tks/shared/conf/context.xml b/base/tks/shared/conf/context.xml
index 8b6fe4905..8b6fe4905 100644
--- a/pki/base/tks/shared/conf/context.xml
+++ b/base/tks/shared/conf/context.xml
diff --git a/pki/base/tks/shared/conf/database.ldif b/base/tks/shared/conf/database.ldif
index d3c5f9e68..d3c5f9e68 100644
--- a/pki/base/tks/shared/conf/database.ldif
+++ b/base/tks/shared/conf/database.ldif
diff --git a/pki/base/tks/shared/conf/db.ldif b/base/tks/shared/conf/db.ldif
index 6aaa310a9..6aaa310a9 100644
--- a/pki/base/tks/shared/conf/db.ldif
+++ b/base/tks/shared/conf/db.ldif
diff --git a/pki/base/tks/shared/conf/index.ldif b/base/tks/shared/conf/index.ldif
index 184187045..184187045 100644
--- a/pki/base/tks/shared/conf/index.ldif
+++ b/base/tks/shared/conf/index.ldif
diff --git a/pki/base/tks/shared/conf/jk2.manifest b/base/tks/shared/conf/jk2.manifest
index 986d7b874..986d7b874 100644
--- a/pki/base/tks/shared/conf/jk2.manifest
+++ b/base/tks/shared/conf/jk2.manifest
diff --git a/pki/base/tks/shared/conf/jk2.properties b/base/tks/shared/conf/jk2.properties
index 4d8e357f8..4d8e357f8 100644
--- a/pki/base/tks/shared/conf/jk2.properties
+++ b/base/tks/shared/conf/jk2.properties
diff --git a/pki/base/tks/shared/conf/jkconf.ant.xml b/base/tks/shared/conf/jkconf.ant.xml
index a4f498050..a4f498050 100644
--- a/pki/base/tks/shared/conf/jkconf.ant.xml
+++ b/base/tks/shared/conf/jkconf.ant.xml
diff --git a/pki/base/tks/shared/conf/jkconfig.manifest b/base/tks/shared/conf/jkconfig.manifest
index 3ba1f2e3e..3ba1f2e3e 100644
--- a/pki/base/tks/shared/conf/jkconfig.manifest
+++ b/base/tks/shared/conf/jkconfig.manifest
diff --git a/pki/base/tks/shared/conf/logging.properties b/base/tks/shared/conf/logging.properties
index 796cfc071..796cfc071 100644
--- a/pki/base/tks/shared/conf/logging.properties
+++ b/base/tks/shared/conf/logging.properties
diff --git a/pki/base/tks/shared/conf/manager.ldif b/base/tks/shared/conf/manager.ldif
index 52e486987..52e486987 100644
--- a/pki/base/tks/shared/conf/manager.ldif
+++ b/base/tks/shared/conf/manager.ldif
diff --git a/pki/base/tks/shared/conf/schema.ldif b/base/tks/shared/conf/schema.ldif
index 70578e21c..70578e21c 100644
--- a/pki/base/tks/shared/conf/schema.ldif
+++ b/base/tks/shared/conf/schema.ldif
diff --git a/pki/base/tks/shared/conf/server-minimal.xml b/base/tks/shared/conf/server-minimal.xml
index 0df50b528..0df50b528 100644
--- a/pki/base/tks/shared/conf/server-minimal.xml
+++ b/base/tks/shared/conf/server-minimal.xml
diff --git a/pki/base/tks/shared/conf/server.xml b/base/tks/shared/conf/server.xml
index 6217ce1d9..6217ce1d9 100644
--- a/pki/base/tks/shared/conf/server.xml
+++ b/base/tks/shared/conf/server.xml
diff --git a/pki/base/tks/shared/conf/serverCertNick.conf b/base/tks/shared/conf/serverCertNick.conf
index 2233ada52..2233ada52 100644
--- a/pki/base/tks/shared/conf/serverCertNick.conf
+++ b/base/tks/shared/conf/serverCertNick.conf
diff --git a/pki/base/tks/shared/conf/shm.manifest b/base/tks/shared/conf/shm.manifest
index 0505c085b..0505c085b 100644
--- a/pki/base/tks/shared/conf/shm.manifest
+++ b/base/tks/shared/conf/shm.manifest
diff --git a/pki/base/tks/shared/conf/tomcat-jk2.manifest b/base/tks/shared/conf/tomcat-jk2.manifest
index acfef4a90..acfef4a90 100644
--- a/pki/base/tks/shared/conf/tomcat-jk2.manifest
+++ b/base/tks/shared/conf/tomcat-jk2.manifest
diff --git a/pki/base/tks/shared/conf/tomcat-users.xml b/base/tks/shared/conf/tomcat-users.xml
index daa9260cc..daa9260cc 100644
--- a/pki/base/tks/shared/conf/tomcat-users.xml
+++ b/base/tks/shared/conf/tomcat-users.xml
diff --git a/pki/base/tks/shared/conf/tomcat6.conf b/base/tks/shared/conf/tomcat6.conf
index 2d7def5ec..2d7def5ec 100644
--- a/pki/base/tks/shared/conf/tomcat6.conf
+++ b/base/tks/shared/conf/tomcat6.conf
diff --git a/pki/base/tks/shared/conf/uriworkermap.properties b/base/tks/shared/conf/uriworkermap.properties
index c89dd82a6..c89dd82a6 100644
--- a/pki/base/tks/shared/conf/uriworkermap.properties
+++ b/base/tks/shared/conf/uriworkermap.properties
diff --git a/pki/base/tks/shared/conf/web.xml b/base/tks/shared/conf/web.xml
index 860a9c4af..860a9c4af 100644
--- a/pki/base/tks/shared/conf/web.xml
+++ b/base/tks/shared/conf/web.xml
diff --git a/pki/base/tks/shared/conf/workers.properties b/base/tks/shared/conf/workers.properties
index 2c39c6402..2c39c6402 100644
--- a/pki/base/tks/shared/conf/workers.properties
+++ b/base/tks/shared/conf/workers.properties
diff --git a/pki/base/tks/shared/conf/workers.properties.minimal b/base/tks/shared/conf/workers.properties.minimal
index 51980ac49..51980ac49 100644
--- a/pki/base/tks/shared/conf/workers.properties.minimal
+++ b/base/tks/shared/conf/workers.properties.minimal
diff --git a/pki/base/tks/shared/conf/workers2.properties b/base/tks/shared/conf/workers2.properties
index d24abd3a9..d24abd3a9 100644
--- a/pki/base/tks/shared/conf/workers2.properties
+++ b/base/tks/shared/conf/workers2.properties
diff --git a/pki/base/tks/shared/conf/workers2.properties.minimal b/base/tks/shared/conf/workers2.properties.minimal
index 4c440eb68..4c440eb68 100644
--- a/pki/base/tks/shared/conf/workers2.properties.minimal
+++ b/base/tks/shared/conf/workers2.properties.minimal
diff --git a/pki/base/tks/shared/etc/init.d/pki-tksd b/base/tks/shared/etc/init.d/pki-tksd
index 2b2fc4e82..2b2fc4e82 100755
--- a/pki/base/tks/shared/etc/init.d/pki-tksd
+++ b/base/tks/shared/etc/init.d/pki-tksd
diff --git a/pki/base/tks/shared/lib/systemd/system/pki-tksd.target b/base/tks/shared/lib/systemd/system/pki-tksd.target
index 3e2b89edd..3e2b89edd 100644
--- a/pki/base/tks/shared/lib/systemd/system/pki-tksd.target
+++ b/base/tks/shared/lib/systemd/system/pki-tksd.target
diff --git a/pki/base/tks/shared/lib/systemd/system/pki-tksd@.service b/base/tks/shared/lib/systemd/system/pki-tksd@.service
index d624eece4..d624eece4 100644
--- a/pki/base/tks/shared/lib/systemd/system/pki-tksd@.service
+++ b/base/tks/shared/lib/systemd/system/pki-tksd@.service
diff --git a/pki/base/tks/shared/webapps/ROOT/WEB-INF/web.xml b/base/tks/shared/webapps/ROOT/WEB-INF/web.xml
index 3ac8408f7..3ac8408f7 100644
--- a/pki/base/tks/shared/webapps/ROOT/WEB-INF/web.xml
+++ b/base/tks/shared/webapps/ROOT/WEB-INF/web.xml
diff --git a/pki/base/tks/shared/webapps/ROOT/index.jsp b/base/tks/shared/webapps/ROOT/index.jsp
index 4b2b3c60a..4b2b3c60a 100644
--- a/pki/base/tks/shared/webapps/ROOT/index.jsp
+++ b/base/tks/shared/webapps/ROOT/index.jsp
diff --git a/pki/base/tks/shared/webapps/tks/WEB-INF/velocity.properties b/base/tks/shared/webapps/tks/WEB-INF/velocity.properties
index 5cd0454cc..5cd0454cc 100644
--- a/pki/base/tks/shared/webapps/tks/WEB-INF/velocity.properties
+++ b/base/tks/shared/webapps/tks/WEB-INF/velocity.properties
diff --git a/pki/base/tks/shared/webapps/tks/WEB-INF/web.xml b/base/tks/shared/webapps/tks/WEB-INF/web.xml
index 28276fda0..28276fda0 100644
--- a/pki/base/tks/shared/webapps/tks/WEB-INF/web.xml
+++ b/base/tks/shared/webapps/tks/WEB-INF/web.xml
diff --git a/pki/base/tks/src/CMakeLists.txt b/base/tks/src/CMakeLists.txt
index 852ad7bf4..852ad7bf4 100644
--- a/pki/base/tks/src/CMakeLists.txt
+++ b/base/tks/src/CMakeLists.txt
diff --git a/pki/base/tks/src/com/netscape/tks/TKSAuthority.java b/base/tks/src/com/netscape/tks/TKSAuthority.java
index 1987659c4..1987659c4 100644
--- a/pki/base/tks/src/com/netscape/tks/TKSAuthority.java
+++ b/base/tks/src/com/netscape/tks/TKSAuthority.java
diff --git a/pki/base/tps/CMakeLists.txt b/base/tps/CMakeLists.txt
index 96d23fefa..96d23fefa 100644
--- a/pki/base/tps/CMakeLists.txt
+++ b/base/tps/CMakeLists.txt
diff --git a/pki/base/tps/LICENSE b/base/tps/LICENSE
index e2391a711..e2391a711 100644
--- a/pki/base/tps/LICENSE
+++ b/base/tps/LICENSE
diff --git a/pki/base/tps/apache/LICENSE-2.0 b/base/tps/apache/LICENSE-2.0
index 7b69c6227..7b69c6227 100644
--- a/pki/base/tps/apache/LICENSE-2.0
+++ b/base/tps/apache/LICENSE-2.0
diff --git a/pki/base/tps/apache/conf/httpd.conf b/base/tps/apache/conf/httpd.conf
index 878a4e655..878a4e655 100644
--- a/pki/base/tps/apache/conf/httpd.conf
+++ b/base/tps/apache/conf/httpd.conf
diff --git a/pki/base/tps/apache/conf/magic b/base/tps/apache/conf/magic
index 0de73361f..0de73361f 100644
--- a/pki/base/tps/apache/conf/magic
+++ b/base/tps/apache/conf/magic
diff --git a/pki/base/tps/apache/conf/mime.types b/base/tps/apache/conf/mime.types
index 3485692d1..3485692d1 100644
--- a/pki/base/tps/apache/conf/mime.types
+++ b/base/tps/apache/conf/mime.types
diff --git a/pki/base/tps/apache/conf/nss.conf b/base/tps/apache/conf/nss.conf
index 314df040d..314df040d 100644
--- a/pki/base/tps/apache/conf/nss.conf
+++ b/base/tps/apache/conf/nss.conf
diff --git a/pki/base/tps/apache/conf/perl.conf b/base/tps/apache/conf/perl.conf
index feb51e860..feb51e860 100644
--- a/pki/base/tps/apache/conf/perl.conf
+++ b/base/tps/apache/conf/perl.conf
diff --git a/pki/base/tps/apache/pki_instance_command_wrapper b/base/tps/apache/pki_instance_command_wrapper
index 913b37e4a..913b37e4a 100644
--- a/pki/base/tps/apache/pki_instance_command_wrapper
+++ b/base/tps/apache/pki_instance_command_wrapper
diff --git a/pki/base/tps/apache/pki_subsystem_command_wrapper b/base/tps/apache/pki_subsystem_command_wrapper
index 19cbf9dd9..19cbf9dd9 100644
--- a/pki/base/tps/apache/pki_subsystem_command_wrapper
+++ b/base/tps/apache/pki_subsystem_command_wrapper
diff --git a/pki/base/tps/apache/readme.html b/base/tps/apache/readme.html
index 3b741e6ae..3b741e6ae 100644
--- a/pki/base/tps/apache/readme.html
+++ b/base/tps/apache/readme.html
diff --git a/pki/base/tps/applets/1.2.4122DFB4.ijc b/base/tps/applets/1.2.4122DFB4.ijc
index 2a8ea0733..2a8ea0733 100644
--- a/pki/base/tps/applets/1.2.4122DFB4.ijc
+++ b/base/tps/applets/1.2.4122DFB4.ijc
diff --git a/pki/base/tps/applets/1.2.416DA155.ijc b/base/tps/applets/1.2.416DA155.ijc
index 21b0312a8..21b0312a8 100755
--- a/pki/base/tps/applets/1.2.416DA155.ijc
+++ b/base/tps/applets/1.2.416DA155.ijc
diff --git a/pki/base/tps/applets/1.3.42260AFA.ijc b/base/tps/applets/1.3.42260AFA.ijc
index f17f98281..f17f98281 100755
--- a/pki/base/tps/applets/1.3.42260AFA.ijc
+++ b/base/tps/applets/1.3.42260AFA.ijc
diff --git a/pki/base/tps/applets/1.3.4255CC01.ijc b/base/tps/applets/1.3.4255CC01.ijc
index 322fe86e2..322fe86e2 100644
--- a/pki/base/tps/applets/1.3.4255CC01.ijc
+++ b/base/tps/applets/1.3.4255CC01.ijc
diff --git a/pki/base/tps/applets/1.3.42659461.ijc b/base/tps/applets/1.3.42659461.ijc
index ccf8ba451..ccf8ba451 100755
--- a/pki/base/tps/applets/1.3.42659461.ijc
+++ b/base/tps/applets/1.3.42659461.ijc
diff --git a/pki/base/tps/applets/1.3.427BDDB8.ijc b/base/tps/applets/1.3.427BDDB8.ijc
index 4a633e8d3..4a633e8d3 100644
--- a/pki/base/tps/applets/1.3.427BDDB8.ijc
+++ b/base/tps/applets/1.3.427BDDB8.ijc
diff --git a/pki/base/tps/applets/1.3.44724DDE.ijc b/base/tps/applets/1.3.44724DDE.ijc
index e56705dff..e56705dff 100755
--- a/pki/base/tps/applets/1.3.44724DDE.ijc
+++ b/base/tps/applets/1.3.44724DDE.ijc
diff --git a/pki/base/tps/applets/1.3.45787308.ijc b/base/tps/applets/1.3.45787308.ijc
index 164c7e0cd..164c7e0cd 100755
--- a/pki/base/tps/applets/1.3.45787308.ijc
+++ b/base/tps/applets/1.3.45787308.ijc
diff --git a/pki/base/tps/applets/1.4.499dc06c.ijc b/base/tps/applets/1.4.499dc06c.ijc
index 388482123..388482123 100644
--- a/pki/base/tps/applets/1.4.499dc06c.ijc
+++ b/base/tps/applets/1.4.499dc06c.ijc
diff --git a/pki/base/tps/applets/1.4.4d40a449.ijc b/base/tps/applets/1.4.4d40a449.ijc
index bd716adb0..bd716adb0 100644
--- a/pki/base/tps/applets/1.4.4d40a449.ijc
+++ b/base/tps/applets/1.4.4d40a449.ijc
diff --git a/pki/base/tps/applets/3FD00877.ijc b/base/tps/applets/3FD00877.ijc
index 5e6624d5a..5e6624d5a 100644
--- a/pki/base/tps/applets/3FD00877.ijc
+++ b/base/tps/applets/3FD00877.ijc
diff --git a/pki/base/tps/applets/4003196C.ijc b/base/tps/applets/4003196C.ijc
index bed8a7900..bed8a7900 100644
--- a/pki/base/tps/applets/4003196C.ijc
+++ b/base/tps/applets/4003196C.ijc
diff --git a/pki/base/tps/applets/402428AD.ijc b/base/tps/applets/402428AD.ijc
index b91a64334..b91a64334 100644
--- a/pki/base/tps/applets/402428AD.ijc
+++ b/base/tps/applets/402428AD.ijc
diff --git a/pki/base/tps/applets/404E4697.ijc b/base/tps/applets/404E4697.ijc
index 9c927c0f0..9c927c0f0 100644
--- a/pki/base/tps/applets/404E4697.ijc
+++ b/base/tps/applets/404E4697.ijc
diff --git a/pki/base/tps/applets/4122DFB4.ijc b/base/tps/applets/4122DFB4.ijc
index 2a8ea0733..2a8ea0733 100644
--- a/pki/base/tps/applets/4122DFB4.ijc
+++ b/base/tps/applets/4122DFB4.ijc
diff --git a/pki/base/tps/applets/listappletdates b/base/tps/applets/listappletdates
index a9e5c49ca..a9e5c49ca 100755
--- a/pki/base/tps/applets/listappletdates
+++ b/base/tps/applets/listappletdates
diff --git a/pki/base/tps/applets/readme.txt b/base/tps/applets/readme.txt
index 9dd2a87ef..9dd2a87ef 100644
--- a/pki/base/tps/applets/readme.txt
+++ b/base/tps/applets/readme.txt
diff --git a/pki/base/tps/doc/CMakeLists.txt b/base/tps/doc/CMakeLists.txt
index 4cebbe1c9..4cebbe1c9 100644
--- a/pki/base/tps/doc/CMakeLists.txt
+++ b/base/tps/doc/CMakeLists.txt
diff --git a/pki/base/tps/doc/CS.cfg.in b/base/tps/doc/CS.cfg.in
index e712934c9..e712934c9 100644
--- a/pki/base/tps/doc/CS.cfg.in
+++ b/base/tps/doc/CS.cfg.in
diff --git a/pki/base/tps/etc/init.d/pki-tpsd b/base/tps/etc/init.d/pki-tpsd
index e5a213add..e5a213add 100755
--- a/pki/base/tps/etc/init.d/pki-tpsd
+++ b/base/tps/etc/init.d/pki-tpsd
diff --git a/pki/base/tps/forms/esc/cgi-bin/demo/enroll.cgi b/base/tps/forms/esc/cgi-bin/demo/enroll.cgi
index c0f4bcabf..c0f4bcabf 100755
--- a/pki/base/tps/forms/esc/cgi-bin/demo/enroll.cgi
+++ b/base/tps/forms/esc/cgi-bin/demo/enroll.cgi
diff --git a/pki/base/tps/forms/esc/cgi-bin/demo/index.cgi b/base/tps/forms/esc/cgi-bin/demo/index.cgi
index c9a1d21dd..c9a1d21dd 100755
--- a/pki/base/tps/forms/esc/cgi-bin/demo/index.cgi
+++ b/base/tps/forms/esc/cgi-bin/demo/index.cgi
diff --git a/pki/base/tps/forms/esc/cgi-bin/home/cachain.cgi b/base/tps/forms/esc/cgi-bin/home/cachain.cgi
index ddbf5e6ae..ddbf5e6ae 100755
--- a/pki/base/tps/forms/esc/cgi-bin/home/cachain.cgi
+++ b/base/tps/forms/esc/cgi-bin/home/cachain.cgi
diff --git a/pki/base/tps/forms/esc/cgi-bin/home/enroll.cgi b/base/tps/forms/esc/cgi-bin/home/enroll.cgi
index c0f4bcabf..c0f4bcabf 100755
--- a/pki/base/tps/forms/esc/cgi-bin/home/enroll.cgi
+++ b/base/tps/forms/esc/cgi-bin/home/enroll.cgi
diff --git a/pki/base/tps/forms/esc/cgi-bin/home/index.cgi b/base/tps/forms/esc/cgi-bin/home/index.cgi
index 1e54a8354..1e54a8354 100755
--- a/pki/base/tps/forms/esc/cgi-bin/home/index.cgi
+++ b/base/tps/forms/esc/cgi-bin/home/index.cgi
diff --git a/pki/base/tps/forms/esc/cgi-bin/so/enroll.cgi b/base/tps/forms/esc/cgi-bin/so/enroll.cgi
index 148cd78c0..148cd78c0 100755
--- a/pki/base/tps/forms/esc/cgi-bin/so/enroll.cgi
+++ b/base/tps/forms/esc/cgi-bin/so/enroll.cgi
diff --git a/pki/base/tps/forms/esc/cgi-bin/so/index.cgi b/base/tps/forms/esc/cgi-bin/so/index.cgi
index 7b3f2c68d..7b3f2c68d 100755
--- a/pki/base/tps/forms/esc/cgi-bin/so/index.cgi
+++ b/base/tps/forms/esc/cgi-bin/so/index.cgi
diff --git a/pki/base/tps/forms/esc/cgi-bin/sow/ajax-list.cgi b/base/tps/forms/esc/cgi-bin/sow/ajax-list.cgi
index 0f4ac094f..0f4ac094f 100755
--- a/pki/base/tps/forms/esc/cgi-bin/sow/ajax-list.cgi
+++ b/base/tps/forms/esc/cgi-bin/sow/ajax-list.cgi
diff --git a/pki/base/tps/forms/esc/cgi-bin/sow/cfg.pl b/base/tps/forms/esc/cgi-bin/sow/cfg.pl
index d616fa136..d616fa136 100755
--- a/pki/base/tps/forms/esc/cgi-bin/sow/cfg.pl
+++ b/base/tps/forms/esc/cgi-bin/sow/cfg.pl
diff --git a/pki/base/tps/forms/esc/cgi-bin/sow/enroll.cgi b/base/tps/forms/esc/cgi-bin/sow/enroll.cgi
index 8a6431e52..8a6431e52 100755
--- a/pki/base/tps/forms/esc/cgi-bin/sow/enroll.cgi
+++ b/base/tps/forms/esc/cgi-bin/sow/enroll.cgi
diff --git a/pki/base/tps/forms/esc/cgi-bin/sow/enroll_temp.cgi b/base/tps/forms/esc/cgi-bin/sow/enroll_temp.cgi
index 5817039a2..5817039a2 100755
--- a/pki/base/tps/forms/esc/cgi-bin/sow/enroll_temp.cgi
+++ b/base/tps/forms/esc/cgi-bin/sow/enroll_temp.cgi
diff --git a/pki/base/tps/forms/esc/cgi-bin/sow/format.cgi b/base/tps/forms/esc/cgi-bin/sow/format.cgi
index 9b310991d..9b310991d 100755
--- a/pki/base/tps/forms/esc/cgi-bin/sow/format.cgi
+++ b/base/tps/forms/esc/cgi-bin/sow/format.cgi
diff --git a/pki/base/tps/forms/esc/cgi-bin/sow/formatso.cgi b/base/tps/forms/esc/cgi-bin/sow/formatso.cgi
index d53129139..d53129139 100755
--- a/pki/base/tps/forms/esc/cgi-bin/sow/formatso.cgi
+++ b/base/tps/forms/esc/cgi-bin/sow/formatso.cgi
diff --git a/pki/base/tps/forms/esc/cgi-bin/sow/index.cgi b/base/tps/forms/esc/cgi-bin/sow/index.cgi
index 7f7a98869..7f7a98869 100755
--- a/pki/base/tps/forms/esc/cgi-bin/sow/index.cgi
+++ b/base/tps/forms/esc/cgi-bin/sow/index.cgi
diff --git a/pki/base/tps/forms/esc/cgi-bin/sow/is_agent.cgi b/base/tps/forms/esc/cgi-bin/sow/is_agent.cgi
index c6b6a87f7..c6b6a87f7 100755
--- a/pki/base/tps/forms/esc/cgi-bin/sow/is_agent.cgi
+++ b/base/tps/forms/esc/cgi-bin/sow/is_agent.cgi
diff --git a/pki/base/tps/forms/esc/cgi-bin/sow/is_user.cgi b/base/tps/forms/esc/cgi-bin/sow/is_user.cgi
index d7a551421..d7a551421 100755
--- a/pki/base/tps/forms/esc/cgi-bin/sow/is_user.cgi
+++ b/base/tps/forms/esc/cgi-bin/sow/is_user.cgi
diff --git a/pki/base/tps/forms/esc/cgi-bin/sow/main.cgi b/base/tps/forms/esc/cgi-bin/sow/main.cgi
index c6f65e42e..c6f65e42e 100755
--- a/pki/base/tps/forms/esc/cgi-bin/sow/main.cgi
+++ b/base/tps/forms/esc/cgi-bin/sow/main.cgi
diff --git a/pki/base/tps/forms/esc/cgi-bin/sow/noaccess.cgi b/base/tps/forms/esc/cgi-bin/sow/noaccess.cgi
index 17166bcb6..17166bcb6 100755
--- a/pki/base/tps/forms/esc/cgi-bin/sow/noaccess.cgi
+++ b/base/tps/forms/esc/cgi-bin/sow/noaccess.cgi
diff --git a/pki/base/tps/forms/esc/cgi-bin/sow/read.cgi b/base/tps/forms/esc/cgi-bin/sow/read.cgi
index 8a5793c2b..8a5793c2b 100755
--- a/pki/base/tps/forms/esc/cgi-bin/sow/read.cgi
+++ b/base/tps/forms/esc/cgi-bin/sow/read.cgi
diff --git a/pki/base/tps/forms/esc/cgi-bin/sow/read_temp.cgi b/base/tps/forms/esc/cgi-bin/sow/read_temp.cgi
index 31c6fd7e3..31c6fd7e3 100755
--- a/pki/base/tps/forms/esc/cgi-bin/sow/read_temp.cgi
+++ b/base/tps/forms/esc/cgi-bin/sow/read_temp.cgi
diff --git a/pki/base/tps/forms/esc/cgi-bin/sow/search.cgi b/base/tps/forms/esc/cgi-bin/sow/search.cgi
index e681ed100..e681ed100 100755
--- a/pki/base/tps/forms/esc/cgi-bin/sow/search.cgi
+++ b/base/tps/forms/esc/cgi-bin/sow/search.cgi
diff --git a/pki/base/tps/forms/esc/cgi-bin/sow/search_temp.cgi b/base/tps/forms/esc/cgi-bin/sow/search_temp.cgi
index 5d752a49d..5d752a49d 100755
--- a/pki/base/tps/forms/esc/cgi-bin/sow/search_temp.cgi
+++ b/base/tps/forms/esc/cgi-bin/sow/search_temp.cgi
diff --git a/pki/base/tps/forms/esc/cgi-bin/sow/seturl.cgi b/base/tps/forms/esc/cgi-bin/sow/seturl.cgi
index dfac46d8f..dfac46d8f 100755
--- a/pki/base/tps/forms/esc/cgi-bin/sow/seturl.cgi
+++ b/base/tps/forms/esc/cgi-bin/sow/seturl.cgi
diff --git a/pki/base/tps/forms/esc/cgi-bin/sow/welcome.cgi b/base/tps/forms/esc/cgi-bin/sow/welcome.cgi
index bc76dd3fa..bc76dd3fa 100755
--- a/pki/base/tps/forms/esc/cgi-bin/sow/welcome.cgi
+++ b/base/tps/forms/esc/cgi-bin/sow/welcome.cgi
diff --git a/pki/base/tps/forms/esc/esc.cgi b/base/tps/forms/esc/esc.cgi
index 70a93c0a0..70a93c0a0 100755
--- a/pki/base/tps/forms/esc/esc.cgi
+++ b/base/tps/forms/esc/esc.cgi
diff --git a/pki/base/tps/forms/esc/home.cgi b/base/tps/forms/esc/home.cgi
index 5fdf5ecf8..5fdf5ecf8 100755
--- a/pki/base/tps/forms/esc/home.cgi
+++ b/base/tps/forms/esc/home.cgi
diff --git a/pki/base/tps/forms/index.cgi b/base/tps/forms/index.cgi
index 0e643166b..0e643166b 100755
--- a/pki/base/tps/forms/index.cgi
+++ b/base/tps/forms/index.cgi
diff --git a/pki/base/tps/forms/index.html b/base/tps/forms/index.html
index b225251a1..b225251a1 100644
--- a/pki/base/tps/forms/index.html
+++ b/base/tps/forms/index.html
diff --git a/pki/base/tps/lib/perl/PKI/Base/Conf.pm b/base/tps/lib/perl/PKI/Base/Conf.pm
index 895ab28a3..895ab28a3 100755
--- a/pki/base/tps/lib/perl/PKI/Base/Conf.pm
+++ b/base/tps/lib/perl/PKI/Base/Conf.pm
diff --git a/pki/base/tps/lib/perl/PKI/Base/Registry.pm b/base/tps/lib/perl/PKI/Base/Registry.pm
index a4fb83f28..a4fb83f28 100755
--- a/pki/base/tps/lib/perl/PKI/Base/Registry.pm
+++ b/base/tps/lib/perl/PKI/Base/Registry.pm
diff --git a/pki/base/tps/lib/perl/PKI/Service/Op.pm b/base/tps/lib/perl/PKI/Service/Op.pm
index 9e2a63d4f..9e2a63d4f 100755
--- a/pki/base/tps/lib/perl/PKI/Service/Op.pm
+++ b/base/tps/lib/perl/PKI/Service/Op.pm
diff --git a/pki/base/tps/lib/perl/PKI/TPS/AdminAuthPanel.pm b/base/tps/lib/perl/PKI/TPS/AdminAuthPanel.pm
index caaf6c65f..caaf6c65f 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/AdminAuthPanel.pm
+++ b/base/tps/lib/perl/PKI/TPS/AdminAuthPanel.pm
diff --git a/pki/base/tps/lib/perl/PKI/TPS/AdminPanel.pm b/base/tps/lib/perl/PKI/TPS/AdminPanel.pm
index d62d611be..d62d611be 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/AdminPanel.pm
+++ b/base/tps/lib/perl/PKI/TPS/AdminPanel.pm
diff --git a/pki/base/tps/lib/perl/PKI/TPS/AgentAuthPanel.pm b/base/tps/lib/perl/PKI/TPS/AgentAuthPanel.pm
index a5130caa1..a5130caa1 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/AgentAuthPanel.pm
+++ b/base/tps/lib/perl/PKI/TPS/AgentAuthPanel.pm
diff --git a/pki/base/tps/lib/perl/PKI/TPS/AuthDBPanel.pm b/base/tps/lib/perl/PKI/TPS/AuthDBPanel.pm
index 2b189cd0c..2b189cd0c 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/AuthDBPanel.pm
+++ b/base/tps/lib/perl/PKI/TPS/AuthDBPanel.pm
diff --git a/pki/base/tps/lib/perl/PKI/TPS/BasePanel.pm b/base/tps/lib/perl/PKI/TPS/BasePanel.pm
index eecf99ff5..eecf99ff5 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/BasePanel.pm
+++ b/base/tps/lib/perl/PKI/TPS/BasePanel.pm
diff --git a/pki/base/tps/lib/perl/PKI/TPS/CAInfoPanel.pm b/base/tps/lib/perl/PKI/TPS/CAInfoPanel.pm
index 27d0a0048..27d0a0048 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/CAInfoPanel.pm
+++ b/base/tps/lib/perl/PKI/TPS/CAInfoPanel.pm
diff --git a/pki/base/tps/lib/perl/PKI/TPS/CertInfo.pm b/base/tps/lib/perl/PKI/TPS/CertInfo.pm
index da5377d4f..da5377d4f 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/CertInfo.pm
+++ b/base/tps/lib/perl/PKI/TPS/CertInfo.pm
diff --git a/pki/base/tps/lib/perl/PKI/TPS/CertPrettyPrintPanel.pm b/base/tps/lib/perl/PKI/TPS/CertPrettyPrintPanel.pm
index 200ef8d74..200ef8d74 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/CertPrettyPrintPanel.pm
+++ b/base/tps/lib/perl/PKI/TPS/CertPrettyPrintPanel.pm
diff --git a/pki/base/tps/lib/perl/PKI/TPS/CertRequestPanel.pm b/base/tps/lib/perl/PKI/TPS/CertRequestPanel.pm
index fb5d9ccda..fb5d9ccda 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/CertRequestPanel.pm
+++ b/base/tps/lib/perl/PKI/TPS/CertRequestPanel.pm
diff --git a/pki/base/tps/lib/perl/PKI/TPS/Common.pm b/base/tps/lib/perl/PKI/TPS/Common.pm
index c66942599..c66942599 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/Common.pm
+++ b/base/tps/lib/perl/PKI/TPS/Common.pm
diff --git a/pki/base/tps/lib/perl/PKI/TPS/Config.pm b/base/tps/lib/perl/PKI/TPS/Config.pm
index 7195dccd9..7195dccd9 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/Config.pm
+++ b/base/tps/lib/perl/PKI/TPS/Config.pm
diff --git a/pki/base/tps/lib/perl/PKI/TPS/ConfigHSMLoginPanel.pm b/base/tps/lib/perl/PKI/TPS/ConfigHSMLoginPanel.pm
index 5d36d3da3..5d36d3da3 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/ConfigHSMLoginPanel.pm
+++ b/base/tps/lib/perl/PKI/TPS/ConfigHSMLoginPanel.pm
diff --git a/pki/base/tps/lib/perl/PKI/TPS/ConfigHSMPanel.pm b/base/tps/lib/perl/PKI/TPS/ConfigHSMPanel.pm
index 06697a8c7..06697a8c7 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/ConfigHSMPanel.pm
+++ b/base/tps/lib/perl/PKI/TPS/ConfigHSMPanel.pm
diff --git a/pki/base/tps/lib/perl/PKI/TPS/DRMInfoPanel.pm b/base/tps/lib/perl/PKI/TPS/DRMInfoPanel.pm
index 1ccef670d..1ccef670d 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/DRMInfoPanel.pm
+++ b/base/tps/lib/perl/PKI/TPS/DRMInfoPanel.pm
diff --git a/pki/base/tps/lib/perl/PKI/TPS/DatabasePanel.pm b/base/tps/lib/perl/PKI/TPS/DatabasePanel.pm
index d8fee06e8..d8fee06e8 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/DatabasePanel.pm
+++ b/base/tps/lib/perl/PKI/TPS/DatabasePanel.pm
diff --git a/pki/base/tps/lib/perl/PKI/TPS/DisplayCertChain2Panel.pm b/base/tps/lib/perl/PKI/TPS/DisplayCertChain2Panel.pm
index 3a86ab0bd..3a86ab0bd 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/DisplayCertChain2Panel.pm
+++ b/base/tps/lib/perl/PKI/TPS/DisplayCertChain2Panel.pm
diff --git a/pki/base/tps/lib/perl/PKI/TPS/DisplayCertChainPanel.pm b/base/tps/lib/perl/PKI/TPS/DisplayCertChainPanel.pm
index 68b64a4b5..68b64a4b5 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/DisplayCertChainPanel.pm
+++ b/base/tps/lib/perl/PKI/TPS/DisplayCertChainPanel.pm
diff --git a/pki/base/tps/lib/perl/PKI/TPS/DonePanel.pm b/base/tps/lib/perl/PKI/TPS/DonePanel.pm
index 3d897fca9..3d897fca9 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/DonePanel.pm
+++ b/base/tps/lib/perl/PKI/TPS/DonePanel.pm
diff --git a/pki/base/tps/lib/perl/PKI/TPS/GlobalVar.pm b/base/tps/lib/perl/PKI/TPS/GlobalVar.pm
index 73e7b831a..73e7b831a 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/GlobalVar.pm
+++ b/base/tps/lib/perl/PKI/TPS/GlobalVar.pm
diff --git a/pki/base/tps/lib/perl/PKI/TPS/ImportAdminCertPanel.pm b/base/tps/lib/perl/PKI/TPS/ImportAdminCertPanel.pm
index dfec6ea80..dfec6ea80 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/ImportAdminCertPanel.pm
+++ b/base/tps/lib/perl/PKI/TPS/ImportAdminCertPanel.pm
diff --git a/pki/base/tps/lib/perl/PKI/TPS/Login.pm b/base/tps/lib/perl/PKI/TPS/Login.pm
index 01aa01f42..01aa01f42 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/Login.pm
+++ b/base/tps/lib/perl/PKI/TPS/Login.pm
diff --git a/pki/base/tps/lib/perl/PKI/TPS/LoginPanel.pm b/base/tps/lib/perl/PKI/TPS/LoginPanel.pm
index d6592d46e..d6592d46e 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/LoginPanel.pm
+++ b/base/tps/lib/perl/PKI/TPS/LoginPanel.pm
diff --git a/pki/base/tps/lib/perl/PKI/TPS/ModulePanel.pm b/base/tps/lib/perl/PKI/TPS/ModulePanel.pm
index 5e7089812..5e7089812 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/ModulePanel.pm
+++ b/base/tps/lib/perl/PKI/TPS/ModulePanel.pm
diff --git a/pki/base/tps/lib/perl/PKI/TPS/Modutil.pm b/base/tps/lib/perl/PKI/TPS/Modutil.pm
index 49c248c2e..49c248c2e 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/Modutil.pm
+++ b/base/tps/lib/perl/PKI/TPS/Modutil.pm
diff --git a/pki/base/tps/lib/perl/PKI/TPS/NamePanel.pm b/base/tps/lib/perl/PKI/TPS/NamePanel.pm
index a474d80b9..a474d80b9 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/NamePanel.pm
+++ b/base/tps/lib/perl/PKI/TPS/NamePanel.pm
diff --git a/pki/base/tps/lib/perl/PKI/TPS/ReqCertInfo.pm b/base/tps/lib/perl/PKI/TPS/ReqCertInfo.pm
index f2faee2c7..f2faee2c7 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/ReqCertInfo.pm
+++ b/base/tps/lib/perl/PKI/TPS/ReqCertInfo.pm
diff --git a/pki/base/tps/lib/perl/PKI/TPS/SecurityDomainPanel.pm b/base/tps/lib/perl/PKI/TPS/SecurityDomainPanel.pm
index 5301d1369..5301d1369 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/SecurityDomainPanel.pm
+++ b/base/tps/lib/perl/PKI/TPS/SecurityDomainPanel.pm
diff --git a/pki/base/tps/lib/perl/PKI/TPS/SizePanel.pm b/base/tps/lib/perl/PKI/TPS/SizePanel.pm
index 8ac49b68d..8ac49b68d 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/SizePanel.pm
+++ b/base/tps/lib/perl/PKI/TPS/SizePanel.pm
diff --git a/pki/base/tps/lib/perl/PKI/TPS/SubsystemTypePanel.pm b/base/tps/lib/perl/PKI/TPS/SubsystemTypePanel.pm
index 793849332..793849332 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/SubsystemTypePanel.pm
+++ b/base/tps/lib/perl/PKI/TPS/SubsystemTypePanel.pm
diff --git a/pki/base/tps/lib/perl/PKI/TPS/TKSInfoPanel.pm b/base/tps/lib/perl/PKI/TPS/TKSInfoPanel.pm
index 720093ac5..720093ac5 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/TKSInfoPanel.pm
+++ b/base/tps/lib/perl/PKI/TPS/TKSInfoPanel.pm
diff --git a/pki/base/tps/lib/perl/PKI/TPS/WelcomePanel.pm b/base/tps/lib/perl/PKI/TPS/WelcomePanel.pm
index a1c77e7cd..a1c77e7cd 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/WelcomePanel.pm
+++ b/base/tps/lib/perl/PKI/TPS/WelcomePanel.pm
diff --git a/pki/base/tps/lib/perl/PKI/TPS/wizard.pm b/base/tps/lib/perl/PKI/TPS/wizard.pm
index db8b26526..db8b26526 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/wizard.pm
+++ b/base/tps/lib/perl/PKI/TPS/wizard.pm
diff --git a/pki/base/tps/lib/perl/Template/Velocity.pm b/base/tps/lib/perl/Template/Velocity.pm
index ea5eb6d72..ea5eb6d72 100755
--- a/pki/base/tps/lib/perl/Template/Velocity.pm
+++ b/base/tps/lib/perl/Template/Velocity.pm
diff --git a/pki/base/tps/scripts/addAgents.ldif b/base/tps/scripts/addAgents.ldif
index d366bc8a7..d366bc8a7 100644
--- a/pki/base/tps/scripts/addAgents.ldif
+++ b/base/tps/scripts/addAgents.ldif
diff --git a/pki/base/tps/scripts/addIndexes.ldif b/base/tps/scripts/addIndexes.ldif
index 7a910be3e..7a910be3e 100644
--- a/pki/base/tps/scripts/addIndexes.ldif
+++ b/base/tps/scripts/addIndexes.ldif
diff --git a/pki/base/tps/scripts/addTokens.ldif b/base/tps/scripts/addTokens.ldif
index 9b8a99e27..9b8a99e27 100644
--- a/pki/base/tps/scripts/addTokens.ldif
+++ b/base/tps/scripts/addTokens.ldif
diff --git a/pki/base/tps/scripts/addVLVIndexes.ldif b/base/tps/scripts/addVLVIndexes.ldif
index 9dc86ece1..9dc86ece1 100644
--- a/pki/base/tps/scripts/addVLVIndexes.ldif
+++ b/base/tps/scripts/addVLVIndexes.ldif
diff --git a/pki/base/tps/scripts/database.ldif b/base/tps/scripts/database.ldif
index 706a3327e..706a3327e 100644
--- a/pki/base/tps/scripts/database.ldif
+++ b/base/tps/scripts/database.ldif
diff --git a/pki/base/tps/scripts/nss_pcache b/base/tps/scripts/nss_pcache
index f87d7bbf6..f87d7bbf6 100755
--- a/pki/base/tps/scripts/nss_pcache
+++ b/base/tps/scripts/nss_pcache
diff --git a/pki/base/tps/scripts/schemaMods.ldif b/base/tps/scripts/schemaMods.ldif
index fd7b09331..fd7b09331 100644
--- a/pki/base/tps/scripts/schemaMods.ldif
+++ b/base/tps/scripts/schemaMods.ldif
diff --git a/pki/base/tps/scripts/vlvtasks.ldif b/base/tps/scripts/vlvtasks.ldif
index b6b4bb762..b6b4bb762 100644
--- a/pki/base/tps/scripts/vlvtasks.ldif
+++ b/base/tps/scripts/vlvtasks.ldif
diff --git a/pki/base/tps/setup/CMakeLists.txt b/base/tps/setup/CMakeLists.txt
index f5f069cdb..f5f069cdb 100644
--- a/pki/base/tps/setup/CMakeLists.txt
+++ b/base/tps/setup/CMakeLists.txt
diff --git a/pki/base/tps/setup/create.pl b/base/tps/setup/create.pl
index e8da7d859..e8da7d859 100755
--- a/pki/base/tps/setup/create.pl
+++ b/base/tps/setup/create.pl
diff --git a/pki/base/tps/setup/registry_instance b/base/tps/setup/registry_instance
index cb1c4b344..cb1c4b344 100644
--- a/pki/base/tps/setup/registry_instance
+++ b/base/tps/setup/registry_instance
diff --git a/pki/base/tps/src/CMakeLists.txt b/base/tps/src/CMakeLists.txt
index 5f588663c..5f588663c 100644
--- a/pki/base/tps/src/CMakeLists.txt
+++ b/base/tps/src/CMakeLists.txt
diff --git a/pki/base/tps/src/apdu/APDU.cpp b/base/tps/src/apdu/APDU.cpp
index 1ae729cc5..1ae729cc5 100644
--- a/pki/base/tps/src/apdu/APDU.cpp
+++ b/base/tps/src/apdu/APDU.cpp
diff --git a/pki/base/tps/src/apdu/APDU_Response.cpp b/base/tps/src/apdu/APDU_Response.cpp
index fac9b1ff4..fac9b1ff4 100644
--- a/pki/base/tps/src/apdu/APDU_Response.cpp
+++ b/base/tps/src/apdu/APDU_Response.cpp
diff --git a/pki/base/tps/src/apdu/Create_Object_APDU.cpp b/base/tps/src/apdu/Create_Object_APDU.cpp
index 2da9f20d3..2da9f20d3 100644
--- a/pki/base/tps/src/apdu/Create_Object_APDU.cpp
+++ b/base/tps/src/apdu/Create_Object_APDU.cpp
diff --git a/pki/base/tps/src/apdu/Create_Pin_APDU.cpp b/base/tps/src/apdu/Create_Pin_APDU.cpp
index db2ad3d0a..db2ad3d0a 100644
--- a/pki/base/tps/src/apdu/Create_Pin_APDU.cpp
+++ b/base/tps/src/apdu/Create_Pin_APDU.cpp
diff --git a/pki/base/tps/src/apdu/Delete_File_APDU.cpp b/base/tps/src/apdu/Delete_File_APDU.cpp
index 2306f0255..2306f0255 100644
--- a/pki/base/tps/src/apdu/Delete_File_APDU.cpp
+++ b/base/tps/src/apdu/Delete_File_APDU.cpp
diff --git a/pki/base/tps/src/apdu/External_Authenticate_APDU.cpp b/base/tps/src/apdu/External_Authenticate_APDU.cpp
index 32c414584..32c414584 100644
--- a/pki/base/tps/src/apdu/External_Authenticate_APDU.cpp
+++ b/base/tps/src/apdu/External_Authenticate_APDU.cpp
diff --git a/pki/base/tps/src/apdu/Format_Muscle_Applet_APDU.cpp b/base/tps/src/apdu/Format_Muscle_Applet_APDU.cpp
index dff95b8cd..dff95b8cd 100644
--- a/pki/base/tps/src/apdu/Format_Muscle_Applet_APDU.cpp
+++ b/base/tps/src/apdu/Format_Muscle_Applet_APDU.cpp
diff --git a/pki/base/tps/src/apdu/Generate_Key_APDU.cpp b/base/tps/src/apdu/Generate_Key_APDU.cpp
index 7d78b5513..7d78b5513 100644
--- a/pki/base/tps/src/apdu/Generate_Key_APDU.cpp
+++ b/base/tps/src/apdu/Generate_Key_APDU.cpp
diff --git a/pki/base/tps/src/apdu/Get_Data_APDU.cpp b/base/tps/src/apdu/Get_Data_APDU.cpp
index 1cb4d9a5b..1cb4d9a5b 100644
--- a/pki/base/tps/src/apdu/Get_Data_APDU.cpp
+++ b/base/tps/src/apdu/Get_Data_APDU.cpp
diff --git a/pki/base/tps/src/apdu/Get_IssuerInfo_APDU.cpp b/base/tps/src/apdu/Get_IssuerInfo_APDU.cpp
index c83d920df..c83d920df 100644
--- a/pki/base/tps/src/apdu/Get_IssuerInfo_APDU.cpp
+++ b/base/tps/src/apdu/Get_IssuerInfo_APDU.cpp
diff --git a/pki/base/tps/src/apdu/Get_Status_APDU.cpp b/base/tps/src/apdu/Get_Status_APDU.cpp
index dcf7c9fac..dcf7c9fac 100644
--- a/pki/base/tps/src/apdu/Get_Status_APDU.cpp
+++ b/base/tps/src/apdu/Get_Status_APDU.cpp
diff --git a/pki/base/tps/src/apdu/Get_Version_APDU.cpp b/base/tps/src/apdu/Get_Version_APDU.cpp
index eb7e53728..eb7e53728 100644
--- a/pki/base/tps/src/apdu/Get_Version_APDU.cpp
+++ b/base/tps/src/apdu/Get_Version_APDU.cpp
diff --git a/pki/base/tps/src/apdu/Import_Key_APDU.cpp b/base/tps/src/apdu/Import_Key_APDU.cpp
index 18c6c886f..18c6c886f 100644
--- a/pki/base/tps/src/apdu/Import_Key_APDU.cpp
+++ b/base/tps/src/apdu/Import_Key_APDU.cpp
diff --git a/pki/base/tps/src/apdu/Import_Key_Enc_APDU.cpp b/base/tps/src/apdu/Import_Key_Enc_APDU.cpp
index 6df161157..6df161157 100644
--- a/pki/base/tps/src/apdu/Import_Key_Enc_APDU.cpp
+++ b/base/tps/src/apdu/Import_Key_Enc_APDU.cpp
diff --git a/pki/base/tps/src/apdu/Initialize_Update_APDU.cpp b/base/tps/src/apdu/Initialize_Update_APDU.cpp
index a87091122..a87091122 100644
--- a/pki/base/tps/src/apdu/Initialize_Update_APDU.cpp
+++ b/base/tps/src/apdu/Initialize_Update_APDU.cpp
diff --git a/pki/base/tps/src/apdu/Install_Applet_APDU.cpp b/base/tps/src/apdu/Install_Applet_APDU.cpp
index 0a6b9b7c1..0a6b9b7c1 100644
--- a/pki/base/tps/src/apdu/Install_Applet_APDU.cpp
+++ b/base/tps/src/apdu/Install_Applet_APDU.cpp
diff --git a/pki/base/tps/src/apdu/Install_Load_APDU.cpp b/base/tps/src/apdu/Install_Load_APDU.cpp
index 6169538e5..6169538e5 100644
--- a/pki/base/tps/src/apdu/Install_Load_APDU.cpp
+++ b/base/tps/src/apdu/Install_Load_APDU.cpp
diff --git a/pki/base/tps/src/apdu/Lifecycle_APDU.cpp b/base/tps/src/apdu/Lifecycle_APDU.cpp
index e7236147e..e7236147e 100644
--- a/pki/base/tps/src/apdu/Lifecycle_APDU.cpp
+++ b/base/tps/src/apdu/Lifecycle_APDU.cpp
diff --git a/pki/base/tps/src/apdu/List_Objects_APDU.cpp b/base/tps/src/apdu/List_Objects_APDU.cpp
index 86ae570d9..86ae570d9 100644
--- a/pki/base/tps/src/apdu/List_Objects_APDU.cpp
+++ b/base/tps/src/apdu/List_Objects_APDU.cpp
diff --git a/pki/base/tps/src/apdu/List_Pins_APDU.cpp b/base/tps/src/apdu/List_Pins_APDU.cpp
index 218072f21..218072f21 100644
--- a/pki/base/tps/src/apdu/List_Pins_APDU.cpp
+++ b/base/tps/src/apdu/List_Pins_APDU.cpp
diff --git a/pki/base/tps/src/apdu/Load_File_APDU.cpp b/base/tps/src/apdu/Load_File_APDU.cpp
index c41f0ec73..c41f0ec73 100644
--- a/pki/base/tps/src/apdu/Load_File_APDU.cpp
+++ b/base/tps/src/apdu/Load_File_APDU.cpp
diff --git a/pki/base/tps/src/apdu/Put_Key_APDU.cpp b/base/tps/src/apdu/Put_Key_APDU.cpp
index 0a061394f..0a061394f 100644
--- a/pki/base/tps/src/apdu/Put_Key_APDU.cpp
+++ b/base/tps/src/apdu/Put_Key_APDU.cpp
diff --git a/pki/base/tps/src/apdu/Read_Buffer_APDU.cpp b/base/tps/src/apdu/Read_Buffer_APDU.cpp
index 22f23fe1f..22f23fe1f 100644
--- a/pki/base/tps/src/apdu/Read_Buffer_APDU.cpp
+++ b/base/tps/src/apdu/Read_Buffer_APDU.cpp
diff --git a/pki/base/tps/src/apdu/Read_Object_APDU.cpp b/base/tps/src/apdu/Read_Object_APDU.cpp
index 21722d331..21722d331 100644
--- a/pki/base/tps/src/apdu/Read_Object_APDU.cpp
+++ b/base/tps/src/apdu/Read_Object_APDU.cpp
diff --git a/pki/base/tps/src/apdu/Select_APDU.cpp b/base/tps/src/apdu/Select_APDU.cpp
index 4f5917b29..4f5917b29 100644
--- a/pki/base/tps/src/apdu/Select_APDU.cpp
+++ b/base/tps/src/apdu/Select_APDU.cpp
diff --git a/pki/base/tps/src/apdu/Set_IssuerInfo_APDU.cpp b/base/tps/src/apdu/Set_IssuerInfo_APDU.cpp
index 77b1d0f8d..77b1d0f8d 100644
--- a/pki/base/tps/src/apdu/Set_IssuerInfo_APDU.cpp
+++ b/base/tps/src/apdu/Set_IssuerInfo_APDU.cpp
diff --git a/pki/base/tps/src/apdu/Set_Pin_APDU.cpp b/base/tps/src/apdu/Set_Pin_APDU.cpp
index 3faaa89ed..3faaa89ed 100644
--- a/pki/base/tps/src/apdu/Set_Pin_APDU.cpp
+++ b/base/tps/src/apdu/Set_Pin_APDU.cpp
diff --git a/pki/base/tps/src/apdu/Unblock_Pin_APDU.cpp b/base/tps/src/apdu/Unblock_Pin_APDU.cpp
index c580dc9f2..c580dc9f2 100644
--- a/pki/base/tps/src/apdu/Unblock_Pin_APDU.cpp
+++ b/base/tps/src/apdu/Unblock_Pin_APDU.cpp
diff --git a/pki/base/tps/src/apdu/Write_Object_APDU.cpp b/base/tps/src/apdu/Write_Object_APDU.cpp
index 958ee4384..958ee4384 100644
--- a/pki/base/tps/src/apdu/Write_Object_APDU.cpp
+++ b/base/tps/src/apdu/Write_Object_APDU.cpp
diff --git a/pki/base/tps/src/authentication/CMakeLists.txt b/base/tps/src/authentication/CMakeLists.txt
index ba8ca07dc..ba8ca07dc 100644
--- a/pki/base/tps/src/authentication/CMakeLists.txt
+++ b/base/tps/src/authentication/CMakeLists.txt
diff --git a/pki/base/tps/src/authentication/LDAP_Authentication.cpp b/base/tps/src/authentication/LDAP_Authentication.cpp
index 3e073dfff..3e073dfff 100644
--- a/pki/base/tps/src/authentication/LDAP_Authentication.cpp
+++ b/base/tps/src/authentication/LDAP_Authentication.cpp
diff --git a/pki/base/tps/src/channel/Channel.cpp b/base/tps/src/channel/Channel.cpp
index 6b77d3a19..6b77d3a19 100644
--- a/pki/base/tps/src/channel/Channel.cpp
+++ b/base/tps/src/channel/Channel.cpp
diff --git a/pki/base/tps/src/channel/Secure_Channel.cpp b/base/tps/src/channel/Secure_Channel.cpp
index 50b24ae99..50b24ae99 100644
--- a/pki/base/tps/src/channel/Secure_Channel.cpp
+++ b/base/tps/src/channel/Secure_Channel.cpp
diff --git a/pki/base/tps/src/cms/CertEnroll.cpp b/base/tps/src/cms/CertEnroll.cpp
index 89990d021..89990d021 100644
--- a/pki/base/tps/src/cms/CertEnroll.cpp
+++ b/base/tps/src/cms/CertEnroll.cpp
diff --git a/pki/base/tps/src/cms/ConnectionInfo.cpp b/base/tps/src/cms/ConnectionInfo.cpp
index 3ab503c5d..3ab503c5d 100644
--- a/pki/base/tps/src/cms/ConnectionInfo.cpp
+++ b/base/tps/src/cms/ConnectionInfo.cpp
diff --git a/pki/base/tps/src/cms/HttpConnection.cpp b/base/tps/src/cms/HttpConnection.cpp
index 89f773557..89f773557 100644
--- a/pki/base/tps/src/cms/HttpConnection.cpp
+++ b/base/tps/src/cms/HttpConnection.cpp
diff --git a/pki/base/tps/src/engine/RA.cpp b/base/tps/src/engine/RA.cpp
index 862b9e105..862b9e105 100644
--- a/pki/base/tps/src/engine/RA.cpp
+++ b/base/tps/src/engine/RA.cpp
diff --git a/pki/base/tps/src/httpClient/Cache.cpp b/base/tps/src/httpClient/Cache.cpp
index 2ea628f8c..2ea628f8c 100644
--- a/pki/base/tps/src/httpClient/Cache.cpp
+++ b/base/tps/src/httpClient/Cache.cpp
diff --git a/pki/base/tps/src/httpClient/engine.cpp b/base/tps/src/httpClient/engine.cpp
index 621a37244..621a37244 100644
--- a/pki/base/tps/src/httpClient/engine.cpp
+++ b/base/tps/src/httpClient/engine.cpp
diff --git a/pki/base/tps/src/httpClient/http.cpp b/base/tps/src/httpClient/http.cpp
index 60ca48bf5..60ca48bf5 100644
--- a/pki/base/tps/src/httpClient/http.cpp
+++ b/base/tps/src/httpClient/http.cpp
diff --git a/pki/base/tps/src/httpClient/httpClient.cpp b/base/tps/src/httpClient/httpClient.cpp
index 7f4e9fff3..7f4e9fff3 100644
--- a/pki/base/tps/src/httpClient/httpClient.cpp
+++ b/base/tps/src/httpClient/httpClient.cpp
diff --git a/pki/base/tps/src/httpClient/nscperror.cpp b/base/tps/src/httpClient/nscperror.cpp
index 38c722de2..38c722de2 100644
--- a/pki/base/tps/src/httpClient/nscperror.cpp
+++ b/base/tps/src/httpClient/nscperror.cpp
diff --git a/pki/base/tps/src/httpClient/request.cpp b/base/tps/src/httpClient/request.cpp
index 629f74821..629f74821 100644
--- a/pki/base/tps/src/httpClient/request.cpp
+++ b/base/tps/src/httpClient/request.cpp
diff --git a/pki/base/tps/src/httpClient/response.cpp b/base/tps/src/httpClient/response.cpp
index 89b900492..89b900492 100644
--- a/pki/base/tps/src/httpClient/response.cpp
+++ b/base/tps/src/httpClient/response.cpp
diff --git a/pki/base/tps/src/include/apdu/APDU.h b/base/tps/src/include/apdu/APDU.h
index e0f778a19..e0f778a19 100644
--- a/pki/base/tps/src/include/apdu/APDU.h
+++ b/base/tps/src/include/apdu/APDU.h
diff --git a/pki/base/tps/src/include/apdu/APDU_Response.h b/base/tps/src/include/apdu/APDU_Response.h
index 0d5c62b9d..0d5c62b9d 100644
--- a/pki/base/tps/src/include/apdu/APDU_Response.h
+++ b/base/tps/src/include/apdu/APDU_Response.h
diff --git a/pki/base/tps/src/include/apdu/Create_Object_APDU.h b/base/tps/src/include/apdu/Create_Object_APDU.h
index 7433e7ceb..7433e7ceb 100644
--- a/pki/base/tps/src/include/apdu/Create_Object_APDU.h
+++ b/base/tps/src/include/apdu/Create_Object_APDU.h
diff --git a/pki/base/tps/src/include/apdu/Create_Pin_APDU.h b/base/tps/src/include/apdu/Create_Pin_APDU.h
index 7f666467d..7f666467d 100644
--- a/pki/base/tps/src/include/apdu/Create_Pin_APDU.h
+++ b/base/tps/src/include/apdu/Create_Pin_APDU.h
diff --git a/pki/base/tps/src/include/apdu/Delete_File_APDU.h b/base/tps/src/include/apdu/Delete_File_APDU.h
index 9e2eeeeb2..9e2eeeeb2 100644
--- a/pki/base/tps/src/include/apdu/Delete_File_APDU.h
+++ b/base/tps/src/include/apdu/Delete_File_APDU.h
diff --git a/pki/base/tps/src/include/apdu/External_Authenticate_APDU.h b/base/tps/src/include/apdu/External_Authenticate_APDU.h
index ff9a6bee7..ff9a6bee7 100644
--- a/pki/base/tps/src/include/apdu/External_Authenticate_APDU.h
+++ b/base/tps/src/include/apdu/External_Authenticate_APDU.h
diff --git a/pki/base/tps/src/include/apdu/Format_Muscle_Applet_APDU.h b/base/tps/src/include/apdu/Format_Muscle_Applet_APDU.h
index b7fbbbea1..b7fbbbea1 100644
--- a/pki/base/tps/src/include/apdu/Format_Muscle_Applet_APDU.h
+++ b/base/tps/src/include/apdu/Format_Muscle_Applet_APDU.h
diff --git a/pki/base/tps/src/include/apdu/Generate_Key_APDU.h b/base/tps/src/include/apdu/Generate_Key_APDU.h
index d245b8336..d245b8336 100644
--- a/pki/base/tps/src/include/apdu/Generate_Key_APDU.h
+++ b/base/tps/src/include/apdu/Generate_Key_APDU.h
diff --git a/pki/base/tps/src/include/apdu/Get_Data_APDU.h b/base/tps/src/include/apdu/Get_Data_APDU.h
index a4f78634d..a4f78634d 100644
--- a/pki/base/tps/src/include/apdu/Get_Data_APDU.h
+++ b/base/tps/src/include/apdu/Get_Data_APDU.h
diff --git a/pki/base/tps/src/include/apdu/Get_IssuerInfo_APDU.h b/base/tps/src/include/apdu/Get_IssuerInfo_APDU.h
index 075acc6d9..075acc6d9 100644
--- a/pki/base/tps/src/include/apdu/Get_IssuerInfo_APDU.h
+++ b/base/tps/src/include/apdu/Get_IssuerInfo_APDU.h
diff --git a/pki/base/tps/src/include/apdu/Get_Status_APDU.h b/base/tps/src/include/apdu/Get_Status_APDU.h
index 5d047bf16..5d047bf16 100644
--- a/pki/base/tps/src/include/apdu/Get_Status_APDU.h
+++ b/base/tps/src/include/apdu/Get_Status_APDU.h
diff --git a/pki/base/tps/src/include/apdu/Get_Version_APDU.h b/base/tps/src/include/apdu/Get_Version_APDU.h
index 8b6ff3c33..8b6ff3c33 100644
--- a/pki/base/tps/src/include/apdu/Get_Version_APDU.h
+++ b/base/tps/src/include/apdu/Get_Version_APDU.h
diff --git a/pki/base/tps/src/include/apdu/Import_Key_APDU.h b/base/tps/src/include/apdu/Import_Key_APDU.h
index e00d97081..e00d97081 100644
--- a/pki/base/tps/src/include/apdu/Import_Key_APDU.h
+++ b/base/tps/src/include/apdu/Import_Key_APDU.h
diff --git a/pki/base/tps/src/include/apdu/Import_Key_Enc_APDU.h b/base/tps/src/include/apdu/Import_Key_Enc_APDU.h
index bcc974987..bcc974987 100644
--- a/pki/base/tps/src/include/apdu/Import_Key_Enc_APDU.h
+++ b/base/tps/src/include/apdu/Import_Key_Enc_APDU.h
diff --git a/pki/base/tps/src/include/apdu/Initialize_Update_APDU.h b/base/tps/src/include/apdu/Initialize_Update_APDU.h
index 8e20d77ab..8e20d77ab 100644
--- a/pki/base/tps/src/include/apdu/Initialize_Update_APDU.h
+++ b/base/tps/src/include/apdu/Initialize_Update_APDU.h
diff --git a/pki/base/tps/src/include/apdu/Install_Applet_APDU.h b/base/tps/src/include/apdu/Install_Applet_APDU.h
index 08b799a64..08b799a64 100644
--- a/pki/base/tps/src/include/apdu/Install_Applet_APDU.h
+++ b/base/tps/src/include/apdu/Install_Applet_APDU.h
diff --git a/pki/base/tps/src/include/apdu/Install_Load_APDU.h b/base/tps/src/include/apdu/Install_Load_APDU.h
index 7d0ff9761..7d0ff9761 100644
--- a/pki/base/tps/src/include/apdu/Install_Load_APDU.h
+++ b/base/tps/src/include/apdu/Install_Load_APDU.h
diff --git a/pki/base/tps/src/include/apdu/Lifecycle_APDU.h b/base/tps/src/include/apdu/Lifecycle_APDU.h
index a3adaf9c4..a3adaf9c4 100644
--- a/pki/base/tps/src/include/apdu/Lifecycle_APDU.h
+++ b/base/tps/src/include/apdu/Lifecycle_APDU.h
diff --git a/pki/base/tps/src/include/apdu/List_Objects_APDU.h b/base/tps/src/include/apdu/List_Objects_APDU.h
index 7d5b45bff..7d5b45bff 100644
--- a/pki/base/tps/src/include/apdu/List_Objects_APDU.h
+++ b/base/tps/src/include/apdu/List_Objects_APDU.h
diff --git a/pki/base/tps/src/include/apdu/List_Pins_APDU.h b/base/tps/src/include/apdu/List_Pins_APDU.h
index 04d1102c9..04d1102c9 100644
--- a/pki/base/tps/src/include/apdu/List_Pins_APDU.h
+++ b/base/tps/src/include/apdu/List_Pins_APDU.h
diff --git a/pki/base/tps/src/include/apdu/Load_File_APDU.h b/base/tps/src/include/apdu/Load_File_APDU.h
index ae5f57445..ae5f57445 100644
--- a/pki/base/tps/src/include/apdu/Load_File_APDU.h
+++ b/base/tps/src/include/apdu/Load_File_APDU.h
diff --git a/pki/base/tps/src/include/apdu/Put_Key_APDU.h b/base/tps/src/include/apdu/Put_Key_APDU.h
index 63aa54599..63aa54599 100644
--- a/pki/base/tps/src/include/apdu/Put_Key_APDU.h
+++ b/base/tps/src/include/apdu/Put_Key_APDU.h
diff --git a/pki/base/tps/src/include/apdu/Read_Buffer_APDU.h b/base/tps/src/include/apdu/Read_Buffer_APDU.h
index 3c94b564d..3c94b564d 100644
--- a/pki/base/tps/src/include/apdu/Read_Buffer_APDU.h
+++ b/base/tps/src/include/apdu/Read_Buffer_APDU.h
diff --git a/pki/base/tps/src/include/apdu/Read_Object_APDU.h b/base/tps/src/include/apdu/Read_Object_APDU.h
index e2357acdd..e2357acdd 100644
--- a/pki/base/tps/src/include/apdu/Read_Object_APDU.h
+++ b/base/tps/src/include/apdu/Read_Object_APDU.h
diff --git a/pki/base/tps/src/include/apdu/Select_APDU.h b/base/tps/src/include/apdu/Select_APDU.h
index 92c1c8ee8..92c1c8ee8 100644
--- a/pki/base/tps/src/include/apdu/Select_APDU.h
+++ b/base/tps/src/include/apdu/Select_APDU.h
diff --git a/pki/base/tps/src/include/apdu/Set_IssuerInfo_APDU.h b/base/tps/src/include/apdu/Set_IssuerInfo_APDU.h
index 2507fdc97..2507fdc97 100644
--- a/pki/base/tps/src/include/apdu/Set_IssuerInfo_APDU.h
+++ b/base/tps/src/include/apdu/Set_IssuerInfo_APDU.h
diff --git a/pki/base/tps/src/include/apdu/Set_Pin_APDU.h b/base/tps/src/include/apdu/Set_Pin_APDU.h
index f649147a1..f649147a1 100644
--- a/pki/base/tps/src/include/apdu/Set_Pin_APDU.h
+++ b/base/tps/src/include/apdu/Set_Pin_APDU.h
diff --git a/pki/base/tps/src/include/apdu/Unblock_Pin_APDU.h b/base/tps/src/include/apdu/Unblock_Pin_APDU.h
index 583e7ae7d..583e7ae7d 100644
--- a/pki/base/tps/src/include/apdu/Unblock_Pin_APDU.h
+++ b/base/tps/src/include/apdu/Unblock_Pin_APDU.h
diff --git a/pki/base/tps/src/include/apdu/Write_Object_APDU.h b/base/tps/src/include/apdu/Write_Object_APDU.h
index 670cd6bbd..670cd6bbd 100644
--- a/pki/base/tps/src/include/apdu/Write_Object_APDU.h
+++ b/base/tps/src/include/apdu/Write_Object_APDU.h
diff --git a/pki/base/tps/src/include/authentication/AuthParams.h b/base/tps/src/include/authentication/AuthParams.h
index e0d39a249..e0d39a249 100644
--- a/pki/base/tps/src/include/authentication/AuthParams.h
+++ b/base/tps/src/include/authentication/AuthParams.h
diff --git a/pki/base/tps/src/include/authentication/Authentication.h b/base/tps/src/include/authentication/Authentication.h
index ae2b0c6fb..ae2b0c6fb 100644
--- a/pki/base/tps/src/include/authentication/Authentication.h
+++ b/base/tps/src/include/authentication/Authentication.h
diff --git a/pki/base/tps/src/include/authentication/LDAP_Authentication.h b/base/tps/src/include/authentication/LDAP_Authentication.h
index 2a8c0a7d5..2a8c0a7d5 100644
--- a/pki/base/tps/src/include/authentication/LDAP_Authentication.h
+++ b/base/tps/src/include/authentication/LDAP_Authentication.h
diff --git a/pki/base/tps/src/include/channel/Channel.h b/base/tps/src/include/channel/Channel.h
index a49af8bf1..a49af8bf1 100644
--- a/pki/base/tps/src/include/channel/Channel.h
+++ b/base/tps/src/include/channel/Channel.h
diff --git a/pki/base/tps/src/include/channel/Secure_Channel.h b/base/tps/src/include/channel/Secure_Channel.h
index bac072407..bac072407 100644
--- a/pki/base/tps/src/include/channel/Secure_Channel.h
+++ b/base/tps/src/include/channel/Secure_Channel.h
diff --git a/pki/base/tps/src/include/cms/CertEnroll.h b/base/tps/src/include/cms/CertEnroll.h
index 442e28e8c..442e28e8c 100644
--- a/pki/base/tps/src/include/cms/CertEnroll.h
+++ b/base/tps/src/include/cms/CertEnroll.h
diff --git a/pki/base/tps/src/include/cms/ConnectionInfo.h b/base/tps/src/include/cms/ConnectionInfo.h
index 07e9c3a73..07e9c3a73 100644
--- a/pki/base/tps/src/include/cms/ConnectionInfo.h
+++ b/base/tps/src/include/cms/ConnectionInfo.h
diff --git a/pki/base/tps/src/include/cms/HttpConnection.h b/base/tps/src/include/cms/HttpConnection.h
index da9d3a7fd..da9d3a7fd 100644
--- a/pki/base/tps/src/include/cms/HttpConnection.h
+++ b/base/tps/src/include/cms/HttpConnection.h
diff --git a/pki/base/tps/src/include/engine/RA.h b/base/tps/src/include/engine/RA.h
index 9e7db9857..9e7db9857 100644
--- a/pki/base/tps/src/include/engine/RA.h
+++ b/base/tps/src/include/engine/RA.h
diff --git a/pki/base/tps/src/include/engine/audit.h b/base/tps/src/include/engine/audit.h
index f8b50de37..f8b50de37 100644
--- a/pki/base/tps/src/include/engine/audit.h
+++ b/base/tps/src/include/engine/audit.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/AccessLogger.h b/base/tps/src/include/httpClient/httpc/AccessLogger.h
index 2b600d7e6..2b600d7e6 100644
--- a/pki/base/tps/src/include/httpClient/httpc/AccessLogger.h
+++ b/base/tps/src/include/httpClient/httpc/AccessLogger.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/Auth.h b/base/tps/src/include/httpClient/httpc/Auth.h
index 72a5f77ee..72a5f77ee 100644
--- a/pki/base/tps/src/include/httpClient/httpc/Auth.h
+++ b/base/tps/src/include/httpClient/httpc/Auth.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/ByteBuffer.h b/base/tps/src/include/httpClient/httpc/ByteBuffer.h
index cd5568c35..cd5568c35 100644
--- a/pki/base/tps/src/include/httpClient/httpc/ByteBuffer.h
+++ b/base/tps/src/include/httpClient/httpc/ByteBuffer.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/CERTUtil.h b/base/tps/src/include/httpClient/httpc/CERTUtil.h
index 1f26efbb8..1f26efbb8 100644
--- a/pki/base/tps/src/include/httpClient/httpc/CERTUtil.h
+++ b/base/tps/src/include/httpClient/httpc/CERTUtil.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/Cache.h b/base/tps/src/include/httpClient/httpc/Cache.h
index bc68f04df..bc68f04df 100644
--- a/pki/base/tps/src/include/httpClient/httpc/Cache.h
+++ b/base/tps/src/include/httpClient/httpc/Cache.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/Connection.h b/base/tps/src/include/httpClient/httpc/Connection.h
index 5619d0dff..5619d0dff 100644
--- a/pki/base/tps/src/include/httpClient/httpc/Connection.h
+++ b/base/tps/src/include/httpClient/httpc/Connection.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/ConnectionListener.h b/base/tps/src/include/httpClient/httpc/ConnectionListener.h
index 0b55900b3..0b55900b3 100644
--- a/pki/base/tps/src/include/httpClient/httpc/ConnectionListener.h
+++ b/base/tps/src/include/httpClient/httpc/ConnectionListener.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/DebugLogger.h b/base/tps/src/include/httpClient/httpc/DebugLogger.h
index 37c7971c0..37c7971c0 100644
--- a/pki/base/tps/src/include/httpClient/httpc/DebugLogger.h
+++ b/base/tps/src/include/httpClient/httpc/DebugLogger.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/Defines.h b/base/tps/src/include/httpClient/httpc/Defines.h
index 90af8e3d0..90af8e3d0 100644
--- a/pki/base/tps/src/include/httpClient/httpc/Defines.h
+++ b/base/tps/src/include/httpClient/httpc/Defines.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/ErrorLogger.h b/base/tps/src/include/httpClient/httpc/ErrorLogger.h
index df2617b06..df2617b06 100644
--- a/pki/base/tps/src/include/httpClient/httpc/ErrorLogger.h
+++ b/base/tps/src/include/httpClient/httpc/ErrorLogger.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/Iterator.h b/base/tps/src/include/httpClient/httpc/Iterator.h
index 9b15a93e2..9b15a93e2 100644
--- a/pki/base/tps/src/include/httpClient/httpc/Iterator.h
+++ b/base/tps/src/include/httpClient/httpc/Iterator.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/LogRotationTask.h b/base/tps/src/include/httpClient/httpc/LogRotationTask.h
index eed098b6b..eed098b6b 100644
--- a/pki/base/tps/src/include/httpClient/httpc/LogRotationTask.h
+++ b/base/tps/src/include/httpClient/httpc/LogRotationTask.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/Logger.h b/base/tps/src/include/httpClient/httpc/Logger.h
index b41d5dfbf..b41d5dfbf 100644
--- a/pki/base/tps/src/include/httpClient/httpc/Logger.h
+++ b/base/tps/src/include/httpClient/httpc/Logger.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/NSPRerrs.h b/base/tps/src/include/httpClient/httpc/NSPRerrs.h
index 2e131fd7a..2e131fd7a 100644
--- a/pki/base/tps/src/include/httpClient/httpc/NSPRerrs.h
+++ b/base/tps/src/include/httpClient/httpc/NSPRerrs.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/PSBuddy.h b/base/tps/src/include/httpClient/httpc/PSBuddy.h
index 4d84b8727..4d84b8727 100644
--- a/pki/base/tps/src/include/httpClient/httpc/PSBuddy.h
+++ b/base/tps/src/include/httpClient/httpc/PSBuddy.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/PSBuddyCache.h b/base/tps/src/include/httpClient/httpc/PSBuddyCache.h
index 3c880074b..3c880074b 100644
--- a/pki/base/tps/src/include/httpClient/httpc/PSBuddyCache.h
+++ b/base/tps/src/include/httpClient/httpc/PSBuddyCache.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/PSBuddyList.h b/base/tps/src/include/httpClient/httpc/PSBuddyList.h
index 49155a8a5..49155a8a5 100644
--- a/pki/base/tps/src/include/httpClient/httpc/PSBuddyList.h
+++ b/base/tps/src/include/httpClient/httpc/PSBuddyList.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/PSBuddyListener.h b/base/tps/src/include/httpClient/httpc/PSBuddyListener.h
index 87e701373..87e701373 100644
--- a/pki/base/tps/src/include/httpClient/httpc/PSBuddyListener.h
+++ b/base/tps/src/include/httpClient/httpc/PSBuddyListener.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/PSBuddyService.h b/base/tps/src/include/httpClient/httpc/PSBuddyService.h
index 2556420e9..2556420e9 100644
--- a/pki/base/tps/src/include/httpClient/httpc/PSBuddyService.h
+++ b/base/tps/src/include/httpClient/httpc/PSBuddyService.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/PSCertExtension.h b/base/tps/src/include/httpClient/httpc/PSCertExtension.h
index f528a54b4..f528a54b4 100644
--- a/pki/base/tps/src/include/httpClient/httpc/PSCertExtension.h
+++ b/base/tps/src/include/httpClient/httpc/PSCertExtension.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/PSCommonLib.h b/base/tps/src/include/httpClient/httpc/PSCommonLib.h
index 09903b38f..09903b38f 100644
--- a/pki/base/tps/src/include/httpClient/httpc/PSCommonLib.h
+++ b/base/tps/src/include/httpClient/httpc/PSCommonLib.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/PSConfig.h b/base/tps/src/include/httpClient/httpc/PSConfig.h
index 897def3c9..897def3c9 100644
--- a/pki/base/tps/src/include/httpClient/httpc/PSConfig.h
+++ b/base/tps/src/include/httpClient/httpc/PSConfig.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/PSConfigManager.h b/base/tps/src/include/httpClient/httpc/PSConfigManager.h
index d2f5d3335..d2f5d3335 100644
--- a/pki/base/tps/src/include/httpClient/httpc/PSConfigManager.h
+++ b/base/tps/src/include/httpClient/httpc/PSConfigManager.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/PSConfigReader.h b/base/tps/src/include/httpClient/httpc/PSConfigReader.h
index a507a26dc..a507a26dc 100644
--- a/pki/base/tps/src/include/httpClient/httpc/PSConfigReader.h
+++ b/base/tps/src/include/httpClient/httpc/PSConfigReader.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/PSCrypt.h b/base/tps/src/include/httpClient/httpc/PSCrypt.h
index bfd05788d..bfd05788d 100644
--- a/pki/base/tps/src/include/httpClient/httpc/PSCrypt.h
+++ b/base/tps/src/include/httpClient/httpc/PSCrypt.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/PSDataSourceListener.h b/base/tps/src/include/httpClient/httpc/PSDataSourceListener.h
index 36842904d..36842904d 100644
--- a/pki/base/tps/src/include/httpClient/httpc/PSDataSourceListener.h
+++ b/base/tps/src/include/httpClient/httpc/PSDataSourceListener.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/PSDataSourceManager.h b/base/tps/src/include/httpClient/httpc/PSDataSourceManager.h
index 1b0662b69..1b0662b69 100644
--- a/pki/base/tps/src/include/httpClient/httpc/PSDataSourceManager.h
+++ b/base/tps/src/include/httpClient/httpc/PSDataSourceManager.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/PSGroup.h b/base/tps/src/include/httpClient/httpc/PSGroup.h
index 8427c39c3..8427c39c3 100644
--- a/pki/base/tps/src/include/httpClient/httpc/PSGroup.h
+++ b/base/tps/src/include/httpClient/httpc/PSGroup.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/PSGroupCache.h b/base/tps/src/include/httpClient/httpc/PSGroupCache.h
index 6807e50e4..6807e50e4 100644
--- a/pki/base/tps/src/include/httpClient/httpc/PSGroupCache.h
+++ b/base/tps/src/include/httpClient/httpc/PSGroupCache.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/PSHelper.h b/base/tps/src/include/httpClient/httpc/PSHelper.h
index 7b9240b1b..7b9240b1b 100644
--- a/pki/base/tps/src/include/httpClient/httpc/PSHelper.h
+++ b/base/tps/src/include/httpClient/httpc/PSHelper.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/PSListener.h b/base/tps/src/include/httpClient/httpc/PSListener.h
index 1d85a9912..1d85a9912 100644
--- a/pki/base/tps/src/include/httpClient/httpc/PSListener.h
+++ b/base/tps/src/include/httpClient/httpc/PSListener.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/PSPRUtil.h b/base/tps/src/include/httpClient/httpc/PSPRUtil.h
index f3b104cc0..f3b104cc0 100644
--- a/pki/base/tps/src/include/httpClient/httpc/PSPRUtil.h
+++ b/base/tps/src/include/httpClient/httpc/PSPRUtil.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/PSPlugin.h b/base/tps/src/include/httpClient/httpc/PSPlugin.h
index f6655591e..f6655591e 100644
--- a/pki/base/tps/src/include/httpClient/httpc/PSPlugin.h
+++ b/base/tps/src/include/httpClient/httpc/PSPlugin.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/PSPluginManager.h b/base/tps/src/include/httpClient/httpc/PSPluginManager.h
index 7ea12829a..7ea12829a 100644
--- a/pki/base/tps/src/include/httpClient/httpc/PSPluginManager.h
+++ b/base/tps/src/include/httpClient/httpc/PSPluginManager.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/PSServer.h b/base/tps/src/include/httpClient/httpc/PSServer.h
index 86d2ca326..86d2ca326 100644
--- a/pki/base/tps/src/include/httpClient/httpc/PSServer.h
+++ b/base/tps/src/include/httpClient/httpc/PSServer.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/PSServerLib.h b/base/tps/src/include/httpClient/httpc/PSServerLib.h
index 079134230..079134230 100644
--- a/pki/base/tps/src/include/httpClient/httpc/PSServerLib.h
+++ b/base/tps/src/include/httpClient/httpc/PSServerLib.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/PSServerListener.h b/base/tps/src/include/httpClient/httpc/PSServerListener.h
index 152fbf58f..152fbf58f 100644
--- a/pki/base/tps/src/include/httpClient/httpc/PSServerListener.h
+++ b/base/tps/src/include/httpClient/httpc/PSServerListener.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/PSServerManager.h b/base/tps/src/include/httpClient/httpc/PSServerManager.h
index 6597ad605..6597ad605 100644
--- a/pki/base/tps/src/include/httpClient/httpc/PSServerManager.h
+++ b/base/tps/src/include/httpClient/httpc/PSServerManager.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/PSServiceListener.h b/base/tps/src/include/httpClient/httpc/PSServiceListener.h
index 358f0c295..358f0c295 100644
--- a/pki/base/tps/src/include/httpClient/httpc/PSServiceListener.h
+++ b/base/tps/src/include/httpClient/httpc/PSServiceListener.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/PSServiceManager.h b/base/tps/src/include/httpClient/httpc/PSServiceManager.h
index 1fd755c14..1fd755c14 100644
--- a/pki/base/tps/src/include/httpClient/httpc/PSServiceManager.h
+++ b/base/tps/src/include/httpClient/httpc/PSServiceManager.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/PSUser.h b/base/tps/src/include/httpClient/httpc/PSUser.h
index a66c4e32f..a66c4e32f 100644
--- a/pki/base/tps/src/include/httpClient/httpc/PSUser.h
+++ b/base/tps/src/include/httpClient/httpc/PSUser.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/PSWaspLib.h b/base/tps/src/include/httpClient/httpc/PSWaspLib.h
index 8fdea6bcc..8fdea6bcc 100644
--- a/pki/base/tps/src/include/httpClient/httpc/PSWaspLib.h
+++ b/base/tps/src/include/httpClient/httpc/PSWaspLib.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/Pool.h b/base/tps/src/include/httpClient/httpc/Pool.h
index 074b36b3b..074b36b3b 100644
--- a/pki/base/tps/src/include/httpClient/httpc/Pool.h
+++ b/base/tps/src/include/httpClient/httpc/Pool.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/PresenceManager.h b/base/tps/src/include/httpClient/httpc/PresenceManager.h
index f7f4f753f..f7f4f753f 100644
--- a/pki/base/tps/src/include/httpClient/httpc/PresenceManager.h
+++ b/base/tps/src/include/httpClient/httpc/PresenceManager.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/PresenceServer.h b/base/tps/src/include/httpClient/httpc/PresenceServer.h
index 1a9b259e9..1a9b259e9 100644
--- a/pki/base/tps/src/include/httpClient/httpc/PresenceServer.h
+++ b/base/tps/src/include/httpClient/httpc/PresenceServer.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/PresenceServerImpl.h b/base/tps/src/include/httpClient/httpc/PresenceServerImpl.h
index 8c07b9140..8c07b9140 100644
--- a/pki/base/tps/src/include/httpClient/httpc/PresenceServerImpl.h
+++ b/base/tps/src/include/httpClient/httpc/PresenceServerImpl.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/SECerrs.h b/base/tps/src/include/httpClient/httpc/SECerrs.h
index d7495ff28..d7495ff28 100644
--- a/pki/base/tps/src/include/httpClient/httpc/SECerrs.h
+++ b/base/tps/src/include/httpClient/httpc/SECerrs.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/SSLServerSocket.h b/base/tps/src/include/httpClient/httpc/SSLServerSocket.h
index a059d7279..a059d7279 100644
--- a/pki/base/tps/src/include/httpClient/httpc/SSLServerSocket.h
+++ b/base/tps/src/include/httpClient/httpc/SSLServerSocket.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/SSLSocket.h b/base/tps/src/include/httpClient/httpc/SSLSocket.h
index 14d647c60..14d647c60 100644
--- a/pki/base/tps/src/include/httpClient/httpc/SSLSocket.h
+++ b/base/tps/src/include/httpClient/httpc/SSLSocket.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/SSLerrs.h b/base/tps/src/include/httpClient/httpc/SSLerrs.h
index 818da3e87..818da3e87 100644
--- a/pki/base/tps/src/include/httpClient/httpc/SSLerrs.h
+++ b/base/tps/src/include/httpClient/httpc/SSLerrs.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/ScheduledTask.h b/base/tps/src/include/httpClient/httpc/ScheduledTask.h
index cbb99ab61..cbb99ab61 100644
--- a/pki/base/tps/src/include/httpClient/httpc/ScheduledTask.h
+++ b/base/tps/src/include/httpClient/httpc/ScheduledTask.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/Scheduler.h b/base/tps/src/include/httpClient/httpc/Scheduler.h
index a0e77ffb4..a0e77ffb4 100644
--- a/pki/base/tps/src/include/httpClient/httpc/Scheduler.h
+++ b/base/tps/src/include/httpClient/httpc/Scheduler.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/SecurityHeaders.h b/base/tps/src/include/httpClient/httpc/SecurityHeaders.h
index a54ecb1a2..a54ecb1a2 100644
--- a/pki/base/tps/src/include/httpClient/httpc/SecurityHeaders.h
+++ b/base/tps/src/include/httpClient/httpc/SecurityHeaders.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/ServerConnection.h b/base/tps/src/include/httpClient/httpc/ServerConnection.h
index bc33aa216..bc33aa216 100644
--- a/pki/base/tps/src/include/httpClient/httpc/ServerConnection.h
+++ b/base/tps/src/include/httpClient/httpc/ServerConnection.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/ServerHeaderProcessor.h b/base/tps/src/include/httpClient/httpc/ServerHeaderProcessor.h
index 213d3b13b..213d3b13b 100644
--- a/pki/base/tps/src/include/httpClient/httpc/ServerHeaderProcessor.h
+++ b/base/tps/src/include/httpClient/httpc/ServerHeaderProcessor.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/ServerSocket.h b/base/tps/src/include/httpClient/httpc/ServerSocket.h
index 3cec2444a..3cec2444a 100644
--- a/pki/base/tps/src/include/httpClient/httpc/ServerSocket.h
+++ b/base/tps/src/include/httpClient/httpc/ServerSocket.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/Socket.h b/base/tps/src/include/httpClient/httpc/Socket.h
index c2ef4afd4..c2ef4afd4 100644
--- a/pki/base/tps/src/include/httpClient/httpc/Socket.h
+++ b/base/tps/src/include/httpClient/httpc/Socket.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/SocketINC.h b/base/tps/src/include/httpClient/httpc/SocketINC.h
index 43b36c9a0..43b36c9a0 100644
--- a/pki/base/tps/src/include/httpClient/httpc/SocketINC.h
+++ b/base/tps/src/include/httpClient/httpc/SocketINC.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/SocketLib.h b/base/tps/src/include/httpClient/httpc/SocketLib.h
index 5a00b2ecb..5a00b2ecb 100644
--- a/pki/base/tps/src/include/httpClient/httpc/SocketLib.h
+++ b/base/tps/src/include/httpClient/httpc/SocketLib.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/StringList.h b/base/tps/src/include/httpClient/httpc/StringList.h
index 80cd61dd6..80cd61dd6 100644
--- a/pki/base/tps/src/include/httpClient/httpc/StringList.h
+++ b/base/tps/src/include/httpClient/httpc/StringList.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/StringUtil.h b/base/tps/src/include/httpClient/httpc/StringUtil.h
index 5c8955d37..5c8955d37 100644
--- a/pki/base/tps/src/include/httpClient/httpc/StringUtil.h
+++ b/base/tps/src/include/httpClient/httpc/StringUtil.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/TaskList.h b/base/tps/src/include/httpClient/httpc/TaskList.h
index 779d27ead..779d27ead 100644
--- a/pki/base/tps/src/include/httpClient/httpc/TaskList.h
+++ b/base/tps/src/include/httpClient/httpc/TaskList.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/ThreadPool.h b/base/tps/src/include/httpClient/httpc/ThreadPool.h
index 389d42606..389d42606 100644
--- a/pki/base/tps/src/include/httpClient/httpc/ThreadPool.h
+++ b/base/tps/src/include/httpClient/httpc/ThreadPool.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/URLUtil.h b/base/tps/src/include/httpClient/httpc/URLUtil.h
index 379986999..379986999 100644
--- a/pki/base/tps/src/include/httpClient/httpc/URLUtil.h
+++ b/base/tps/src/include/httpClient/httpc/URLUtil.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/engine.h b/base/tps/src/include/httpClient/httpc/engine.h
index 9a57b024e..9a57b024e 100644
--- a/pki/base/tps/src/include/httpClient/httpc/engine.h
+++ b/base/tps/src/include/httpClient/httpc/engine.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/http.h b/base/tps/src/include/httpClient/httpc/http.h
index 0dccfddbd..0dccfddbd 100644
--- a/pki/base/tps/src/include/httpClient/httpc/http.h
+++ b/base/tps/src/include/httpClient/httpc/http.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/request.h b/base/tps/src/include/httpClient/httpc/request.h
index 0399732ef..0399732ef 100644
--- a/pki/base/tps/src/include/httpClient/httpc/request.h
+++ b/base/tps/src/include/httpClient/httpc/request.h
diff --git a/pki/base/tps/src/include/httpClient/httpc/response.h b/base/tps/src/include/httpClient/httpc/response.h
index 5c45d574c..5c45d574c 100644
--- a/pki/base/tps/src/include/httpClient/httpc/response.h
+++ b/base/tps/src/include/httpClient/httpc/response.h
diff --git a/pki/base/tps/src/include/main/AttributeSpec.h b/base/tps/src/include/main/AttributeSpec.h
index 3aa0655b5..3aa0655b5 100644
--- a/pki/base/tps/src/include/main/AttributeSpec.h
+++ b/base/tps/src/include/main/AttributeSpec.h
diff --git a/pki/base/tps/src/include/main/AuthenticationEntry.h b/base/tps/src/include/main/AuthenticationEntry.h
index e4ec0715c..e4ec0715c 100644
--- a/pki/base/tps/src/include/main/AuthenticationEntry.h
+++ b/base/tps/src/include/main/AuthenticationEntry.h
diff --git a/pki/base/tps/src/include/main/Base.h b/base/tps/src/include/main/Base.h
index 3c5260178..3c5260178 100644
--- a/pki/base/tps/src/include/main/Base.h
+++ b/base/tps/src/include/main/Base.h
diff --git a/pki/base/tps/src/include/main/Buffer.h b/base/tps/src/include/main/Buffer.h
index 4fa7af6df..4fa7af6df 100644
--- a/pki/base/tps/src/include/main/Buffer.h
+++ b/base/tps/src/include/main/Buffer.h
diff --git a/pki/base/tps/src/include/main/ConfigStore.h b/base/tps/src/include/main/ConfigStore.h
index d34e0ce7b..d34e0ce7b 100644
--- a/pki/base/tps/src/include/main/ConfigStore.h
+++ b/base/tps/src/include/main/ConfigStore.h
diff --git a/pki/base/tps/src/include/main/LogFile.h b/base/tps/src/include/main/LogFile.h
index 663929eb2..663929eb2 100644
--- a/pki/base/tps/src/include/main/LogFile.h
+++ b/base/tps/src/include/main/LogFile.h
diff --git a/pki/base/tps/src/include/main/Login.h b/base/tps/src/include/main/Login.h
index 81a22870e..81a22870e 100644
--- a/pki/base/tps/src/include/main/Login.h
+++ b/base/tps/src/include/main/Login.h
diff --git a/pki/base/tps/src/include/main/Memory.h b/base/tps/src/include/main/Memory.h
index ca9608466..ca9608466 100644
--- a/pki/base/tps/src/include/main/Memory.h
+++ b/base/tps/src/include/main/Memory.h
diff --git a/pki/base/tps/src/include/main/MemoryMgr.h b/base/tps/src/include/main/MemoryMgr.h
index 7e2f71dc1..7e2f71dc1 100644
--- a/pki/base/tps/src/include/main/MemoryMgr.h
+++ b/base/tps/src/include/main/MemoryMgr.h
diff --git a/pki/base/tps/src/include/main/NameValueSet.h b/base/tps/src/include/main/NameValueSet.h
index 6c9055a59..6c9055a59 100644
--- a/pki/base/tps/src/include/main/NameValueSet.h
+++ b/base/tps/src/include/main/NameValueSet.h
diff --git a/pki/base/tps/src/include/main/ObjectSpec.h b/base/tps/src/include/main/ObjectSpec.h
index 3b0bee72c..3b0bee72c 100644
--- a/pki/base/tps/src/include/main/ObjectSpec.h
+++ b/base/tps/src/include/main/ObjectSpec.h
diff --git a/pki/base/tps/src/include/main/PKCS11Obj.h b/base/tps/src/include/main/PKCS11Obj.h
index ef3fca964..ef3fca964 100644
--- a/pki/base/tps/src/include/main/PKCS11Obj.h
+++ b/base/tps/src/include/main/PKCS11Obj.h
diff --git a/pki/base/tps/src/include/main/PublishEntry.h b/base/tps/src/include/main/PublishEntry.h
index 05d5939a4..05d5939a4 100644
--- a/pki/base/tps/src/include/main/PublishEntry.h
+++ b/base/tps/src/include/main/PublishEntry.h
diff --git a/pki/base/tps/src/include/main/RA_Context.h b/base/tps/src/include/main/RA_Context.h
index e313f45fd..e313f45fd 100644
--- a/pki/base/tps/src/include/main/RA_Context.h
+++ b/base/tps/src/include/main/RA_Context.h
diff --git a/pki/base/tps/src/include/main/RA_Msg.h b/base/tps/src/include/main/RA_Msg.h
index d94063b00..d94063b00 100644
--- a/pki/base/tps/src/include/main/RA_Msg.h
+++ b/base/tps/src/include/main/RA_Msg.h
diff --git a/pki/base/tps/src/include/main/RA_Session.h b/base/tps/src/include/main/RA_Session.h
index 520a94b6a..520a94b6a 100644
--- a/pki/base/tps/src/include/main/RA_Session.h
+++ b/base/tps/src/include/main/RA_Session.h
diff --git a/pki/base/tps/src/include/main/RA_pblock.h b/base/tps/src/include/main/RA_pblock.h
index 685dc321b..685dc321b 100644
--- a/pki/base/tps/src/include/main/RA_pblock.h
+++ b/base/tps/src/include/main/RA_pblock.h
diff --git a/pki/base/tps/src/include/main/RollingLogFile.h b/base/tps/src/include/main/RollingLogFile.h
index 63239b94b..63239b94b 100644
--- a/pki/base/tps/src/include/main/RollingLogFile.h
+++ b/base/tps/src/include/main/RollingLogFile.h
diff --git a/pki/base/tps/src/include/main/SecureId.h b/base/tps/src/include/main/SecureId.h
index fd7e6a158..fd7e6a158 100644
--- a/pki/base/tps/src/include/main/SecureId.h
+++ b/base/tps/src/include/main/SecureId.h
diff --git a/pki/base/tps/src/include/main/Util.h b/base/tps/src/include/main/Util.h
index c4d670483..c4d670483 100644
--- a/pki/base/tps/src/include/main/Util.h
+++ b/base/tps/src/include/main/Util.h
diff --git a/pki/base/tps/src/include/modules/tps/AP_Context.h b/base/tps/src/include/modules/tps/AP_Context.h
index 4faca55ac..4faca55ac 100644
--- a/pki/base/tps/src/include/modules/tps/AP_Context.h
+++ b/base/tps/src/include/modules/tps/AP_Context.h
diff --git a/pki/base/tps/src/include/modules/tps/AP_Session.h b/base/tps/src/include/modules/tps/AP_Session.h
index 832166a1b..832166a1b 100644
--- a/pki/base/tps/src/include/modules/tps/AP_Session.h
+++ b/base/tps/src/include/modules/tps/AP_Session.h
diff --git a/pki/base/tps/src/include/msg/RA_ASQ_Request_Msg.h b/base/tps/src/include/msg/RA_ASQ_Request_Msg.h
index 15f8bd7a4..15f8bd7a4 100644
--- a/pki/base/tps/src/include/msg/RA_ASQ_Request_Msg.h
+++ b/base/tps/src/include/msg/RA_ASQ_Request_Msg.h
diff --git a/pki/base/tps/src/include/msg/RA_ASQ_Response_Msg.h b/base/tps/src/include/msg/RA_ASQ_Response_Msg.h
index 3614e443f..3614e443f 100644
--- a/pki/base/tps/src/include/msg/RA_ASQ_Response_Msg.h
+++ b/base/tps/src/include/msg/RA_ASQ_Response_Msg.h
diff --git a/pki/base/tps/src/include/msg/RA_Begin_Op_Msg.h b/base/tps/src/include/msg/RA_Begin_Op_Msg.h
index 48a61a659..48a61a659 100644
--- a/pki/base/tps/src/include/msg/RA_Begin_Op_Msg.h
+++ b/base/tps/src/include/msg/RA_Begin_Op_Msg.h
diff --git a/pki/base/tps/src/include/msg/RA_End_Op_Msg.h b/base/tps/src/include/msg/RA_End_Op_Msg.h
index fe396f05b..fe396f05b 100644
--- a/pki/base/tps/src/include/msg/RA_End_Op_Msg.h
+++ b/base/tps/src/include/msg/RA_End_Op_Msg.h
diff --git a/pki/base/tps/src/include/msg/RA_Extended_Login_Request_Msg.h b/base/tps/src/include/msg/RA_Extended_Login_Request_Msg.h
index fdfceedcf..fdfceedcf 100644
--- a/pki/base/tps/src/include/msg/RA_Extended_Login_Request_Msg.h
+++ b/base/tps/src/include/msg/RA_Extended_Login_Request_Msg.h
diff --git a/pki/base/tps/src/include/msg/RA_Extended_Login_Response_Msg.h b/base/tps/src/include/msg/RA_Extended_Login_Response_Msg.h
index 37da9feb3..37da9feb3 100644
--- a/pki/base/tps/src/include/msg/RA_Extended_Login_Response_Msg.h
+++ b/base/tps/src/include/msg/RA_Extended_Login_Response_Msg.h
diff --git a/pki/base/tps/src/include/msg/RA_Login_Request_Msg.h b/base/tps/src/include/msg/RA_Login_Request_Msg.h
index 01a7a5acd..01a7a5acd 100644
--- a/pki/base/tps/src/include/msg/RA_Login_Request_Msg.h
+++ b/base/tps/src/include/msg/RA_Login_Request_Msg.h
diff --git a/pki/base/tps/src/include/msg/RA_Login_Response_Msg.h b/base/tps/src/include/msg/RA_Login_Response_Msg.h
index dcc9e3530..dcc9e3530 100644
--- a/pki/base/tps/src/include/msg/RA_Login_Response_Msg.h
+++ b/base/tps/src/include/msg/RA_Login_Response_Msg.h
diff --git a/pki/base/tps/src/include/msg/RA_New_Pin_Request_Msg.h b/base/tps/src/include/msg/RA_New_Pin_Request_Msg.h
index 8ebf16259..8ebf16259 100644
--- a/pki/base/tps/src/include/msg/RA_New_Pin_Request_Msg.h
+++ b/base/tps/src/include/msg/RA_New_Pin_Request_Msg.h
diff --git a/pki/base/tps/src/include/msg/RA_New_Pin_Response_Msg.h b/base/tps/src/include/msg/RA_New_Pin_Response_Msg.h
index f062adcf0..f062adcf0 100644
--- a/pki/base/tps/src/include/msg/RA_New_Pin_Response_Msg.h
+++ b/base/tps/src/include/msg/RA_New_Pin_Response_Msg.h
diff --git a/pki/base/tps/src/include/msg/RA_SecureId_Request_Msg.h b/base/tps/src/include/msg/RA_SecureId_Request_Msg.h
index 132e04c22..132e04c22 100644
--- a/pki/base/tps/src/include/msg/RA_SecureId_Request_Msg.h
+++ b/base/tps/src/include/msg/RA_SecureId_Request_Msg.h
diff --git a/pki/base/tps/src/include/msg/RA_SecureId_Response_Msg.h b/base/tps/src/include/msg/RA_SecureId_Response_Msg.h
index 279e07475..279e07475 100644
--- a/pki/base/tps/src/include/msg/RA_SecureId_Response_Msg.h
+++ b/base/tps/src/include/msg/RA_SecureId_Response_Msg.h
diff --git a/pki/base/tps/src/include/msg/RA_Status_Update_Request_Msg.h b/base/tps/src/include/msg/RA_Status_Update_Request_Msg.h
index bdc037c97..bdc037c97 100644
--- a/pki/base/tps/src/include/msg/RA_Status_Update_Request_Msg.h
+++ b/base/tps/src/include/msg/RA_Status_Update_Request_Msg.h
diff --git a/pki/base/tps/src/include/msg/RA_Status_Update_Response_Msg.h b/base/tps/src/include/msg/RA_Status_Update_Response_Msg.h
index c5a13eaa4..c5a13eaa4 100644
--- a/pki/base/tps/src/include/msg/RA_Status_Update_Response_Msg.h
+++ b/base/tps/src/include/msg/RA_Status_Update_Response_Msg.h
diff --git a/pki/base/tps/src/include/msg/RA_Token_PDU_Request_Msg.h b/base/tps/src/include/msg/RA_Token_PDU_Request_Msg.h
index bcbdfc7fc..bcbdfc7fc 100644
--- a/pki/base/tps/src/include/msg/RA_Token_PDU_Request_Msg.h
+++ b/base/tps/src/include/msg/RA_Token_PDU_Request_Msg.h
diff --git a/pki/base/tps/src/include/msg/RA_Token_PDU_Response_Msg.h b/base/tps/src/include/msg/RA_Token_PDU_Response_Msg.h
index e7c2d538f..e7c2d538f 100644
--- a/pki/base/tps/src/include/msg/RA_Token_PDU_Response_Msg.h
+++ b/base/tps/src/include/msg/RA_Token_PDU_Response_Msg.h
diff --git a/pki/base/tps/src/include/processor/RA_Enroll_Processor.h b/base/tps/src/include/processor/RA_Enroll_Processor.h
index b78d33f36..b78d33f36 100644
--- a/pki/base/tps/src/include/processor/RA_Enroll_Processor.h
+++ b/base/tps/src/include/processor/RA_Enroll_Processor.h
diff --git a/pki/base/tps/src/include/processor/RA_Format_Processor.h b/base/tps/src/include/processor/RA_Format_Processor.h
index 836c89080..836c89080 100644
--- a/pki/base/tps/src/include/processor/RA_Format_Processor.h
+++ b/base/tps/src/include/processor/RA_Format_Processor.h
diff --git a/pki/base/tps/src/include/processor/RA_Pin_Reset_Processor.h b/base/tps/src/include/processor/RA_Pin_Reset_Processor.h
index a3d511865..a3d511865 100644
--- a/pki/base/tps/src/include/processor/RA_Pin_Reset_Processor.h
+++ b/base/tps/src/include/processor/RA_Pin_Reset_Processor.h
diff --git a/pki/base/tps/src/include/processor/RA_Processor.h b/base/tps/src/include/processor/RA_Processor.h
index 74e869a52..74e869a52 100644
--- a/pki/base/tps/src/include/processor/RA_Processor.h
+++ b/base/tps/src/include/processor/RA_Processor.h
diff --git a/pki/base/tps/src/include/processor/RA_Renew_Processor.h b/base/tps/src/include/processor/RA_Renew_Processor.h
index bb8710a74..bb8710a74 100644
--- a/pki/base/tps/src/include/processor/RA_Renew_Processor.h
+++ b/base/tps/src/include/processor/RA_Renew_Processor.h
diff --git a/pki/base/tps/src/include/processor/RA_Unblock_Processor.h b/base/tps/src/include/processor/RA_Unblock_Processor.h
index ae28ea593..ae28ea593 100644
--- a/pki/base/tps/src/include/processor/RA_Unblock_Processor.h
+++ b/base/tps/src/include/processor/RA_Unblock_Processor.h
diff --git a/pki/base/tps/src/include/publisher/IConnector.h b/base/tps/src/include/publisher/IConnector.h
index 9a5caa70e..9a5caa70e 100644
--- a/pki/base/tps/src/include/publisher/IConnector.h
+++ b/base/tps/src/include/publisher/IConnector.h
diff --git a/pki/base/tps/src/include/publisher/IPublish_Data.h b/base/tps/src/include/publisher/IPublish_Data.h
index 50b7e3247..50b7e3247 100644
--- a/pki/base/tps/src/include/publisher/IPublish_Data.h
+++ b/base/tps/src/include/publisher/IPublish_Data.h
diff --git a/pki/base/tps/src/include/publisher/IPublisher.h b/base/tps/src/include/publisher/IPublisher.h
index 56a1b7357..56a1b7357 100644
--- a/pki/base/tps/src/include/publisher/IPublisher.h
+++ b/base/tps/src/include/publisher/IPublisher.h
diff --git a/pki/base/tps/src/include/publisher/NetkeyPublisher.h b/base/tps/src/include/publisher/NetkeyPublisher.h
index 05cf4d191..05cf4d191 100644
--- a/pki/base/tps/src/include/publisher/NetkeyPublisher.h
+++ b/base/tps/src/include/publisher/NetkeyPublisher.h
diff --git a/pki/base/tps/src/include/selftests/SelfTest.h b/base/tps/src/include/selftests/SelfTest.h
index c52f62f23..c52f62f23 100644
--- a/pki/base/tps/src/include/selftests/SelfTest.h
+++ b/base/tps/src/include/selftests/SelfTest.h
diff --git a/pki/base/tps/src/include/selftests/TPSPresence.h b/base/tps/src/include/selftests/TPSPresence.h
index 114f4ae57..114f4ae57 100644
--- a/pki/base/tps/src/include/selftests/TPSPresence.h
+++ b/base/tps/src/include/selftests/TPSPresence.h
diff --git a/pki/base/tps/src/include/selftests/TPSSystemCertsVerification.h b/base/tps/src/include/selftests/TPSSystemCertsVerification.h
index 40a4d3fd4..40a4d3fd4 100644
--- a/pki/base/tps/src/include/selftests/TPSSystemCertsVerification.h
+++ b/base/tps/src/include/selftests/TPSSystemCertsVerification.h
diff --git a/pki/base/tps/src/include/selftests/TPSValidity.h b/base/tps/src/include/selftests/TPSValidity.h
index 548052a83..548052a83 100644
--- a/pki/base/tps/src/include/selftests/TPSValidity.h
+++ b/base/tps/src/include/selftests/TPSValidity.h
diff --git a/pki/base/tps/src/include/service/NK_Context.h b/base/tps/src/include/service/NK_Context.h
index e5ed59992..e5ed59992 100644
--- a/pki/base/tps/src/include/service/NK_Context.h
+++ b/base/tps/src/include/service/NK_Context.h
diff --git a/pki/base/tps/src/include/service/NK_Session.h b/base/tps/src/include/service/NK_Session.h
index 55cd19439..55cd19439 100644
--- a/pki/base/tps/src/include/service/NK_Session.h
+++ b/base/tps/src/include/service/NK_Session.h
diff --git a/pki/base/tps/src/include/tus/tus_db.h b/base/tps/src/include/tus/tus_db.h
index b1c7ebe86..b1c7ebe86 100644
--- a/pki/base/tps/src/include/tus/tus_db.h
+++ b/base/tps/src/include/tus/tus_db.h
diff --git a/pki/base/tps/src/main/AttributeSpec.cpp b/base/tps/src/main/AttributeSpec.cpp
index 23c2cd978..23c2cd978 100644
--- a/pki/base/tps/src/main/AttributeSpec.cpp
+++ b/base/tps/src/main/AttributeSpec.cpp
diff --git a/pki/base/tps/src/main/AuthParams.cpp b/base/tps/src/main/AuthParams.cpp
index 3a124252e..3a124252e 100644
--- a/pki/base/tps/src/main/AuthParams.cpp
+++ b/base/tps/src/main/AuthParams.cpp
diff --git a/pki/base/tps/src/main/Authentication.cpp b/base/tps/src/main/Authentication.cpp
index 34ab76f0a..34ab76f0a 100644
--- a/pki/base/tps/src/main/Authentication.cpp
+++ b/base/tps/src/main/Authentication.cpp
diff --git a/pki/base/tps/src/main/AuthenticationEntry.cpp b/base/tps/src/main/AuthenticationEntry.cpp
index eb7f75419..eb7f75419 100644
--- a/pki/base/tps/src/main/AuthenticationEntry.cpp
+++ b/base/tps/src/main/AuthenticationEntry.cpp
diff --git a/pki/base/tps/src/main/Buffer.cpp b/base/tps/src/main/Buffer.cpp
index 2a547feea..2a547feea 100644
--- a/pki/base/tps/src/main/Buffer.cpp
+++ b/base/tps/src/main/Buffer.cpp
diff --git a/pki/base/tps/src/main/ConfigStore.cpp b/base/tps/src/main/ConfigStore.cpp
index e526b4039..e526b4039 100644
--- a/pki/base/tps/src/main/ConfigStore.cpp
+++ b/base/tps/src/main/ConfigStore.cpp
diff --git a/pki/base/tps/src/main/LogFile.cpp b/base/tps/src/main/LogFile.cpp
index d908ca0c5..d908ca0c5 100644
--- a/pki/base/tps/src/main/LogFile.cpp
+++ b/base/tps/src/main/LogFile.cpp
diff --git a/pki/base/tps/src/main/Login.cpp b/base/tps/src/main/Login.cpp
index 116ac7769..116ac7769 100644
--- a/pki/base/tps/src/main/Login.cpp
+++ b/base/tps/src/main/Login.cpp
diff --git a/pki/base/tps/src/main/Memory.cpp b/base/tps/src/main/Memory.cpp
index 1ee5027d0..1ee5027d0 100644
--- a/pki/base/tps/src/main/Memory.cpp
+++ b/base/tps/src/main/Memory.cpp
diff --git a/pki/base/tps/src/main/NameValueSet.cpp b/base/tps/src/main/NameValueSet.cpp
index bd95a8e4a..bd95a8e4a 100644
--- a/pki/base/tps/src/main/NameValueSet.cpp
+++ b/base/tps/src/main/NameValueSet.cpp
diff --git a/pki/base/tps/src/main/ObjectSpec.cpp b/base/tps/src/main/ObjectSpec.cpp
index 2896a85f0..2896a85f0 100644
--- a/pki/base/tps/src/main/ObjectSpec.cpp
+++ b/base/tps/src/main/ObjectSpec.cpp
diff --git a/pki/base/tps/src/main/PKCS11Obj.cpp b/base/tps/src/main/PKCS11Obj.cpp
index 061dc7a91..061dc7a91 100644
--- a/pki/base/tps/src/main/PKCS11Obj.cpp
+++ b/base/tps/src/main/PKCS11Obj.cpp
diff --git a/pki/base/tps/src/main/RA_Context.cpp b/base/tps/src/main/RA_Context.cpp
index e3a66cdbb..e3a66cdbb 100644
--- a/pki/base/tps/src/main/RA_Context.cpp
+++ b/base/tps/src/main/RA_Context.cpp
diff --git a/pki/base/tps/src/main/RA_Msg.cpp b/base/tps/src/main/RA_Msg.cpp
index d54db69fb..d54db69fb 100644
--- a/pki/base/tps/src/main/RA_Msg.cpp
+++ b/base/tps/src/main/RA_Msg.cpp
diff --git a/pki/base/tps/src/main/RA_Session.cpp b/base/tps/src/main/RA_Session.cpp
index 57f7e4efa..57f7e4efa 100644
--- a/pki/base/tps/src/main/RA_Session.cpp
+++ b/base/tps/src/main/RA_Session.cpp
diff --git a/pki/base/tps/src/main/RA_pblock.cpp b/base/tps/src/main/RA_pblock.cpp
index e59e4c7f1..e59e4c7f1 100644
--- a/pki/base/tps/src/main/RA_pblock.cpp
+++ b/base/tps/src/main/RA_pblock.cpp
diff --git a/pki/base/tps/src/main/RollingLogFile.cpp b/base/tps/src/main/RollingLogFile.cpp
index 692a94334..692a94334 100644
--- a/pki/base/tps/src/main/RollingLogFile.cpp
+++ b/base/tps/src/main/RollingLogFile.cpp
diff --git a/pki/base/tps/src/main/SecureId.cpp b/base/tps/src/main/SecureId.cpp
index 46394100e..46394100e 100644
--- a/pki/base/tps/src/main/SecureId.cpp
+++ b/base/tps/src/main/SecureId.cpp
diff --git a/pki/base/tps/src/main/Util.cpp b/base/tps/src/main/Util.cpp
index 2849121e4..2849121e4 100644
--- a/pki/base/tps/src/main/Util.cpp
+++ b/base/tps/src/main/Util.cpp
diff --git a/pki/base/tps/src/modules/CMakeLists.txt b/base/tps/src/modules/CMakeLists.txt
index b72b73c0c..b72b73c0c 100644
--- a/pki/base/tps/src/modules/CMakeLists.txt
+++ b/base/tps/src/modules/CMakeLists.txt
diff --git a/pki/base/tps/src/modules/tokendb/CMakeLists.txt b/base/tps/src/modules/tokendb/CMakeLists.txt
index 7b6edae91..7b6edae91 100644
--- a/pki/base/tps/src/modules/tokendb/CMakeLists.txt
+++ b/base/tps/src/modules/tokendb/CMakeLists.txt
diff --git a/pki/base/tps/src/modules/tokendb/mod_tokendb.cpp b/base/tps/src/modules/tokendb/mod_tokendb.cpp
index 3e411c99a..3e411c99a 100644
--- a/pki/base/tps/src/modules/tokendb/mod_tokendb.cpp
+++ b/base/tps/src/modules/tokendb/mod_tokendb.cpp
diff --git a/pki/base/tps/src/modules/tps/AP_Context.cpp b/base/tps/src/modules/tps/AP_Context.cpp
index cde314254..cde314254 100644
--- a/pki/base/tps/src/modules/tps/AP_Context.cpp
+++ b/base/tps/src/modules/tps/AP_Context.cpp
diff --git a/pki/base/tps/src/modules/tps/AP_Session.cpp b/base/tps/src/modules/tps/AP_Session.cpp
index 36f455355..36f455355 100644
--- a/pki/base/tps/src/modules/tps/AP_Session.cpp
+++ b/base/tps/src/modules/tps/AP_Session.cpp
diff --git a/pki/base/tps/src/modules/tps/CMakeLists.txt b/base/tps/src/modules/tps/CMakeLists.txt
index 275d8b30a..275d8b30a 100644
--- a/pki/base/tps/src/modules/tps/CMakeLists.txt
+++ b/base/tps/src/modules/tps/CMakeLists.txt
diff --git a/pki/base/tps/src/modules/tps/mod_tps.cpp b/base/tps/src/modules/tps/mod_tps.cpp
index dc6cc95f9..dc6cc95f9 100644
--- a/pki/base/tps/src/modules/tps/mod_tps.cpp
+++ b/base/tps/src/modules/tps/mod_tps.cpp
diff --git a/pki/base/tps/src/msg/RA_ASQ_Request_Msg.cpp b/base/tps/src/msg/RA_ASQ_Request_Msg.cpp
index 112c42152..112c42152 100644
--- a/pki/base/tps/src/msg/RA_ASQ_Request_Msg.cpp
+++ b/base/tps/src/msg/RA_ASQ_Request_Msg.cpp
diff --git a/pki/base/tps/src/msg/RA_ASQ_Response_Msg.cpp b/base/tps/src/msg/RA_ASQ_Response_Msg.cpp
index 5e480c1f1..5e480c1f1 100644
--- a/pki/base/tps/src/msg/RA_ASQ_Response_Msg.cpp
+++ b/base/tps/src/msg/RA_ASQ_Response_Msg.cpp
diff --git a/pki/base/tps/src/msg/RA_Begin_Op_Msg.cpp b/base/tps/src/msg/RA_Begin_Op_Msg.cpp
index 44d568bd9..44d568bd9 100644
--- a/pki/base/tps/src/msg/RA_Begin_Op_Msg.cpp
+++ b/base/tps/src/msg/RA_Begin_Op_Msg.cpp
diff --git a/pki/base/tps/src/msg/RA_End_Op_Msg.cpp b/base/tps/src/msg/RA_End_Op_Msg.cpp
index 232122d49..232122d49 100644
--- a/pki/base/tps/src/msg/RA_End_Op_Msg.cpp
+++ b/base/tps/src/msg/RA_End_Op_Msg.cpp
diff --git a/pki/base/tps/src/msg/RA_Extended_Login_Request_Msg.cpp b/base/tps/src/msg/RA_Extended_Login_Request_Msg.cpp
index 9da2f6d8f..9da2f6d8f 100644
--- a/pki/base/tps/src/msg/RA_Extended_Login_Request_Msg.cpp
+++ b/base/tps/src/msg/RA_Extended_Login_Request_Msg.cpp
diff --git a/pki/base/tps/src/msg/RA_Extended_Login_Response_Msg.cpp b/base/tps/src/msg/RA_Extended_Login_Response_Msg.cpp
index f1d66b558..f1d66b558 100644
--- a/pki/base/tps/src/msg/RA_Extended_Login_Response_Msg.cpp
+++ b/base/tps/src/msg/RA_Extended_Login_Response_Msg.cpp
diff --git a/pki/base/tps/src/msg/RA_Login_Request_Msg.cpp b/base/tps/src/msg/RA_Login_Request_Msg.cpp
index 7bad331d7..7bad331d7 100644
--- a/pki/base/tps/src/msg/RA_Login_Request_Msg.cpp
+++ b/base/tps/src/msg/RA_Login_Request_Msg.cpp
diff --git a/pki/base/tps/src/msg/RA_Login_Response_Msg.cpp b/base/tps/src/msg/RA_Login_Response_Msg.cpp
index 67d796e6e..67d796e6e 100644
--- a/pki/base/tps/src/msg/RA_Login_Response_Msg.cpp
+++ b/base/tps/src/msg/RA_Login_Response_Msg.cpp
diff --git a/pki/base/tps/src/msg/RA_New_Pin_Request_Msg.cpp b/base/tps/src/msg/RA_New_Pin_Request_Msg.cpp
index 71889359e..71889359e 100644
--- a/pki/base/tps/src/msg/RA_New_Pin_Request_Msg.cpp
+++ b/base/tps/src/msg/RA_New_Pin_Request_Msg.cpp
diff --git a/pki/base/tps/src/msg/RA_New_Pin_Response_Msg.cpp b/base/tps/src/msg/RA_New_Pin_Response_Msg.cpp
index 69b63f934..69b63f934 100644
--- a/pki/base/tps/src/msg/RA_New_Pin_Response_Msg.cpp
+++ b/base/tps/src/msg/RA_New_Pin_Response_Msg.cpp
diff --git a/pki/base/tps/src/msg/RA_SecureId_Request_Msg.cpp b/base/tps/src/msg/RA_SecureId_Request_Msg.cpp
index 064461225..064461225 100644
--- a/pki/base/tps/src/msg/RA_SecureId_Request_Msg.cpp
+++ b/base/tps/src/msg/RA_SecureId_Request_Msg.cpp
diff --git a/pki/base/tps/src/msg/RA_SecureId_Response_Msg.cpp b/base/tps/src/msg/RA_SecureId_Response_Msg.cpp
index ff4191a61..ff4191a61 100644
--- a/pki/base/tps/src/msg/RA_SecureId_Response_Msg.cpp
+++ b/base/tps/src/msg/RA_SecureId_Response_Msg.cpp
diff --git a/pki/base/tps/src/msg/RA_Status_Update_Request_Msg.cpp b/base/tps/src/msg/RA_Status_Update_Request_Msg.cpp
index 7bb0baefc..7bb0baefc 100644
--- a/pki/base/tps/src/msg/RA_Status_Update_Request_Msg.cpp
+++ b/base/tps/src/msg/RA_Status_Update_Request_Msg.cpp
diff --git a/pki/base/tps/src/msg/RA_Status_Update_Response_Msg.cpp b/base/tps/src/msg/RA_Status_Update_Response_Msg.cpp
index 6053c9af6..6053c9af6 100644
--- a/pki/base/tps/src/msg/RA_Status_Update_Response_Msg.cpp
+++ b/base/tps/src/msg/RA_Status_Update_Response_Msg.cpp
diff --git a/pki/base/tps/src/msg/RA_Token_PDU_Request_Msg.cpp b/base/tps/src/msg/RA_Token_PDU_Request_Msg.cpp
index 34b3d584b..34b3d584b 100644
--- a/pki/base/tps/src/msg/RA_Token_PDU_Request_Msg.cpp
+++ b/base/tps/src/msg/RA_Token_PDU_Request_Msg.cpp
diff --git a/pki/base/tps/src/msg/RA_Token_PDU_Response_Msg.cpp b/base/tps/src/msg/RA_Token_PDU_Response_Msg.cpp
index 41b11388c..41b11388c 100644
--- a/pki/base/tps/src/msg/RA_Token_PDU_Response_Msg.cpp
+++ b/base/tps/src/msg/RA_Token_PDU_Response_Msg.cpp
diff --git a/pki/base/tps/src/processor/RA_Enroll_Processor.cpp b/base/tps/src/processor/RA_Enroll_Processor.cpp
index d88d84087..d88d84087 100644
--- a/pki/base/tps/src/processor/RA_Enroll_Processor.cpp
+++ b/base/tps/src/processor/RA_Enroll_Processor.cpp
diff --git a/pki/base/tps/src/processor/RA_Format_Processor.cpp b/base/tps/src/processor/RA_Format_Processor.cpp
index b09a7495b..b09a7495b 100644
--- a/pki/base/tps/src/processor/RA_Format_Processor.cpp
+++ b/base/tps/src/processor/RA_Format_Processor.cpp
diff --git a/pki/base/tps/src/processor/RA_Pin_Reset_Processor.cpp b/base/tps/src/processor/RA_Pin_Reset_Processor.cpp
index b776b55a4..b776b55a4 100644
--- a/pki/base/tps/src/processor/RA_Pin_Reset_Processor.cpp
+++ b/base/tps/src/processor/RA_Pin_Reset_Processor.cpp
diff --git a/pki/base/tps/src/processor/RA_Processor.cpp b/base/tps/src/processor/RA_Processor.cpp
index a9947555b..a9947555b 100644
--- a/pki/base/tps/src/processor/RA_Processor.cpp
+++ b/base/tps/src/processor/RA_Processor.cpp
diff --git a/pki/base/tps/src/processor/RA_Renew_Processor.cpp b/base/tps/src/processor/RA_Renew_Processor.cpp
index 5caa329b4..5caa329b4 100644
--- a/pki/base/tps/src/processor/RA_Renew_Processor.cpp
+++ b/base/tps/src/processor/RA_Renew_Processor.cpp
diff --git a/pki/base/tps/src/processor/RA_Unblock_Processor.cpp b/base/tps/src/processor/RA_Unblock_Processor.cpp
index 0bdbcfa2b..0bdbcfa2b 100644
--- a/pki/base/tps/src/processor/RA_Unblock_Processor.cpp
+++ b/base/tps/src/processor/RA_Unblock_Processor.cpp
diff --git a/pki/base/tps/src/selftests/SelfTest.cpp b/base/tps/src/selftests/SelfTest.cpp
index 71266d581..71266d581 100644
--- a/pki/base/tps/src/selftests/SelfTest.cpp
+++ b/base/tps/src/selftests/SelfTest.cpp
diff --git a/pki/base/tps/src/selftests/TPSPresence.cpp b/base/tps/src/selftests/TPSPresence.cpp
index 7f37fd0fb..7f37fd0fb 100644
--- a/pki/base/tps/src/selftests/TPSPresence.cpp
+++ b/base/tps/src/selftests/TPSPresence.cpp
diff --git a/pki/base/tps/src/selftests/TPSSystemCertsVerification.cpp b/base/tps/src/selftests/TPSSystemCertsVerification.cpp
index a89d18d04..a89d18d04 100644
--- a/pki/base/tps/src/selftests/TPSSystemCertsVerification.cpp
+++ b/base/tps/src/selftests/TPSSystemCertsVerification.cpp
diff --git a/pki/base/tps/src/selftests/TPSValidity.cpp b/base/tps/src/selftests/TPSValidity.cpp
index e70263e80..e70263e80 100644
--- a/pki/base/tps/src/selftests/TPSValidity.cpp
+++ b/base/tps/src/selftests/TPSValidity.cpp
diff --git a/pki/base/tps/src/test/Test_ConfigStore.cfg b/base/tps/src/test/Test_ConfigStore.cfg
index 60f8e8675..60f8e8675 100644
--- a/pki/base/tps/src/test/Test_ConfigStore.cfg
+++ b/base/tps/src/test/Test_ConfigStore.cfg
diff --git a/pki/base/tps/src/test/Test_ConfigStore.cpp b/base/tps/src/test/Test_ConfigStore.cpp
index d81a67b03..d81a67b03 100644
--- a/pki/base/tps/src/test/Test_ConfigStore.cpp
+++ b/base/tps/src/test/Test_ConfigStore.cpp
diff --git a/pki/base/tps/src/tus/CMakeLists.txt b/base/tps/src/tus/CMakeLists.txt
index 3148d9e59..3148d9e59 100644
--- a/pki/base/tps/src/tus/CMakeLists.txt
+++ b/base/tps/src/tus/CMakeLists.txt
diff --git a/pki/base/tps/src/tus/tus_db.c b/base/tps/src/tus/tus_db.c
index c865bc371..c865bc371 100644
--- a/pki/base/tps/src/tus/tus_db.c
+++ b/base/tps/src/tus/tus_db.c
diff --git a/pki/base/tps/stubs/modules/nss/mod_nss_stub.c b/base/tps/stubs/modules/nss/mod_nss_stub.c
index b47fa0edb..b47fa0edb 100644
--- a/pki/base/tps/stubs/modules/nss/mod_nss_stub.c
+++ b/base/tps/stubs/modules/nss/mod_nss_stub.c
diff --git a/pki/base/tps/tools/CMakeLists.txt b/base/tps/tools/CMakeLists.txt
index 6ed05c43d..6ed05c43d 100644
--- a/pki/base/tps/tools/CMakeLists.txt
+++ b/base/tps/tools/CMakeLists.txt
diff --git a/pki/base/tps/tools/raclient/CMakeLists.txt b/base/tps/tools/raclient/CMakeLists.txt
index 8f01b34d8..8f01b34d8 100644
--- a/pki/base/tps/tools/raclient/CMakeLists.txt
+++ b/base/tps/tools/raclient/CMakeLists.txt
diff --git a/pki/base/tps/tools/raclient/RA_Client.cpp b/base/tps/tools/raclient/RA_Client.cpp
index c2a610e33..c2a610e33 100644
--- a/pki/base/tps/tools/raclient/RA_Client.cpp
+++ b/base/tps/tools/raclient/RA_Client.cpp
diff --git a/pki/base/tps/tools/raclient/RA_Client.h b/base/tps/tools/raclient/RA_Client.h
index 6ab2ecf97..6ab2ecf97 100644
--- a/pki/base/tps/tools/raclient/RA_Client.h
+++ b/base/tps/tools/raclient/RA_Client.h
diff --git a/pki/base/tps/tools/raclient/RA_Conn.cpp b/base/tps/tools/raclient/RA_Conn.cpp
index 17a3ed34f..17a3ed34f 100644
--- a/pki/base/tps/tools/raclient/RA_Conn.cpp
+++ b/base/tps/tools/raclient/RA_Conn.cpp
diff --git a/pki/base/tps/tools/raclient/RA_Conn.h b/base/tps/tools/raclient/RA_Conn.h
index 307166eaf..307166eaf 100644
--- a/pki/base/tps/tools/raclient/RA_Conn.h
+++ b/base/tps/tools/raclient/RA_Conn.h
diff --git a/pki/base/tps/tools/raclient/RA_Token.cpp b/base/tps/tools/raclient/RA_Token.cpp
index 069d6c23c..069d6c23c 100644
--- a/pki/base/tps/tools/raclient/RA_Token.cpp
+++ b/base/tps/tools/raclient/RA_Token.cpp
diff --git a/pki/base/tps/tools/raclient/RA_Token.h b/base/tps/tools/raclient/RA_Token.h
index bf92e4e89..bf92e4e89 100644
--- a/pki/base/tps/tools/raclient/RA_Token.h
+++ b/base/tps/tools/raclient/RA_Token.h
diff --git a/pki/base/tps/tools/raclient/enroll.tps b/base/tps/tools/raclient/enroll.tps
index 08e40b6e1..08e40b6e1 100644
--- a/pki/base/tps/tools/raclient/enroll.tps
+++ b/base/tps/tools/raclient/enroll.tps
diff --git a/pki/base/tps/tools/raclient/enroll1.test b/base/tps/tools/raclient/enroll1.test
index fdd54f704..fdd54f704 100644
--- a/pki/base/tps/tools/raclient/enroll1.test
+++ b/base/tps/tools/raclient/enroll1.test
diff --git a/pki/base/tps/tools/raclient/format.tps b/base/tps/tools/raclient/format.tps
index f087a2d25..f087a2d25 100644
--- a/pki/base/tps/tools/raclient/format.tps
+++ b/base/tps/tools/raclient/format.tps
diff --git a/pki/base/tps/tools/raclient/nt_enroll.test b/base/tps/tools/raclient/nt_enroll.test
index f4faf18fe..f4faf18fe 100644
--- a/pki/base/tps/tools/raclient/nt_enroll.test
+++ b/base/tps/tools/raclient/nt_enroll.test
diff --git a/pki/base/tps/tools/raclient/readme.txt b/base/tps/tools/raclient/readme.txt
index 8997544ac..8997544ac 100644
--- a/pki/base/tps/tools/raclient/readme.txt
+++ b/base/tps/tools/raclient/readme.txt
diff --git a/pki/base/tps/tools/raclient/reset_pin.tps b/base/tps/tools/raclient/reset_pin.tps
index 1a81fd2a7..1a81fd2a7 100644
--- a/pki/base/tps/tools/raclient/reset_pin.tps
+++ b/base/tps/tools/raclient/reset_pin.tps
diff --git a/pki/base/tps/tools/raclient/reset_pin1.test b/base/tps/tools/raclient/reset_pin1.test
index 2169e7ce2..2169e7ce2 100644
--- a/pki/base/tps/tools/raclient/reset_pin1.test
+++ b/base/tps/tools/raclient/reset_pin1.test
diff --git a/pki/base/tps/tools/raclient/reset_pin2.test b/base/tps/tools/raclient/reset_pin2.test
index 77b5d20d2..77b5d20d2 100644
--- a/pki/base/tps/tools/raclient/reset_pin2.test
+++ b/base/tps/tools/raclient/reset_pin2.test
diff --git a/pki/base/tps/tools/tus/add.c b/base/tps/tools/tus/add.c
index f88ae9753..f88ae9753 100644
--- a/pki/base/tps/tools/tus/add.c
+++ b/base/tps/tools/tus/add.c
diff --git a/pki/base/tps/tools/tus/test.c b/base/tps/tools/tus/test.c
index a307d1ccc..a307d1ccc 100644
--- a/pki/base/tps/tools/tus/test.c
+++ b/base/tps/tools/tus/test.c
diff --git a/pki/base/tps/ui/perl/Velocity.pm b/base/tps/ui/perl/Velocity.pm
index f5f45431f..f5f45431f 100755
--- a/pki/base/tps/ui/perl/Velocity.pm
+++ b/base/tps/ui/perl/Velocity.pm
diff --git a/pki/base/tps/wrappers/tpsclient.in b/base/tps/wrappers/tpsclient.in
index 5f2f6b3f5..5f2f6b3f5 100755
--- a/pki/base/tps/wrappers/tpsclient.in
+++ b/base/tps/wrappers/tpsclient.in
diff --git a/pki/base/util/CMakeLists.txt b/base/util/CMakeLists.txt
index b8600ba4c..b8600ba4c 100644
--- a/pki/base/util/CMakeLists.txt
+++ b/base/util/CMakeLists.txt
diff --git a/pki/base/util/LICENSE b/base/util/LICENSE
index e281f4362..e281f4362 100644
--- a/pki/base/util/LICENSE
+++ b/base/util/LICENSE
diff --git a/pki/base/util/src/CMakeLists.txt b/base/util/src/CMakeLists.txt
index 592e3b59b..592e3b59b 100644
--- a/pki/base/util/src/CMakeLists.txt
+++ b/base/util/src/CMakeLists.txt
diff --git a/pki/base/util/src/com/netscape/cmsutil/crypto/CryptoUtil.java b/base/util/src/com/netscape/cmsutil/crypto/CryptoUtil.java
index bf8a9cfc1..bf8a9cfc1 100644
--- a/pki/base/util/src/com/netscape/cmsutil/crypto/CryptoUtil.java
+++ b/base/util/src/com/netscape/cmsutil/crypto/CryptoUtil.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/crypto/Module.java b/base/util/src/com/netscape/cmsutil/crypto/Module.java
index bf4a7fe73..bf4a7fe73 100644
--- a/pki/base/util/src/com/netscape/cmsutil/crypto/Module.java
+++ b/base/util/src/com/netscape/cmsutil/crypto/Module.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/crypto/Token.java b/base/util/src/com/netscape/cmsutil/crypto/Token.java
index c6f5a5e3c..c6f5a5e3c 100644
--- a/pki/base/util/src/com/netscape/cmsutil/crypto/Token.java
+++ b/base/util/src/com/netscape/cmsutil/crypto/Token.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/http/ConnectAsync.java b/base/util/src/com/netscape/cmsutil/http/ConnectAsync.java
index ca230ca21..ca230ca21 100644
--- a/pki/base/util/src/com/netscape/cmsutil/http/ConnectAsync.java
+++ b/base/util/src/com/netscape/cmsutil/http/ConnectAsync.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/http/Http.java b/base/util/src/com/netscape/cmsutil/http/Http.java
index 2cda7fd12..2cda7fd12 100644
--- a/pki/base/util/src/com/netscape/cmsutil/http/Http.java
+++ b/base/util/src/com/netscape/cmsutil/http/Http.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/http/HttpClient.java b/base/util/src/com/netscape/cmsutil/http/HttpClient.java
index 438c70c23..438c70c23 100644
--- a/pki/base/util/src/com/netscape/cmsutil/http/HttpClient.java
+++ b/base/util/src/com/netscape/cmsutil/http/HttpClient.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/http/HttpEofException.java b/base/util/src/com/netscape/cmsutil/http/HttpEofException.java
index 824b9ea2a..824b9ea2a 100644
--- a/pki/base/util/src/com/netscape/cmsutil/http/HttpEofException.java
+++ b/base/util/src/com/netscape/cmsutil/http/HttpEofException.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/http/HttpMessage.java b/base/util/src/com/netscape/cmsutil/http/HttpMessage.java
index badec5930..badec5930 100644
--- a/pki/base/util/src/com/netscape/cmsutil/http/HttpMessage.java
+++ b/base/util/src/com/netscape/cmsutil/http/HttpMessage.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/http/HttpProtocolException.java b/base/util/src/com/netscape/cmsutil/http/HttpProtocolException.java
index b5ceb1d7f..b5ceb1d7f 100644
--- a/pki/base/util/src/com/netscape/cmsutil/http/HttpProtocolException.java
+++ b/base/util/src/com/netscape/cmsutil/http/HttpProtocolException.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/http/HttpRequest.java b/base/util/src/com/netscape/cmsutil/http/HttpRequest.java
index 9024dabf0..9024dabf0 100644
--- a/pki/base/util/src/com/netscape/cmsutil/http/HttpRequest.java
+++ b/base/util/src/com/netscape/cmsutil/http/HttpRequest.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/http/HttpResponse.java b/base/util/src/com/netscape/cmsutil/http/HttpResponse.java
index 7ac7e2f69..7ac7e2f69 100644
--- a/pki/base/util/src/com/netscape/cmsutil/http/HttpResponse.java
+++ b/base/util/src/com/netscape/cmsutil/http/HttpResponse.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/http/JssSSLSocketFactory.java b/base/util/src/com/netscape/cmsutil/http/JssSSLSocketFactory.java
index c2013a5d2..c2013a5d2 100644
--- a/pki/base/util/src/com/netscape/cmsutil/http/JssSSLSocketFactory.java
+++ b/base/util/src/com/netscape/cmsutil/http/JssSSLSocketFactory.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/ldap/LDAPUtil.java b/base/util/src/com/netscape/cmsutil/ldap/LDAPUtil.java
index e821db67a..e821db67a 100644
--- a/pki/base/util/src/com/netscape/cmsutil/ldap/LDAPUtil.java
+++ b/base/util/src/com/netscape/cmsutil/ldap/LDAPUtil.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/net/ISocketFactory.java b/base/util/src/com/netscape/cmsutil/net/ISocketFactory.java
index 18f6cac88..18f6cac88 100644
--- a/pki/base/util/src/com/netscape/cmsutil/net/ISocketFactory.java
+++ b/base/util/src/com/netscape/cmsutil/net/ISocketFactory.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/ocsp/BasicOCSPResponse.java b/base/util/src/com/netscape/cmsutil/ocsp/BasicOCSPResponse.java
index 11ae7f152..11ae7f152 100644
--- a/pki/base/util/src/com/netscape/cmsutil/ocsp/BasicOCSPResponse.java
+++ b/base/util/src/com/netscape/cmsutil/ocsp/BasicOCSPResponse.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/ocsp/CertID.java b/base/util/src/com/netscape/cmsutil/ocsp/CertID.java
index b6979c784..b6979c784 100644
--- a/pki/base/util/src/com/netscape/cmsutil/ocsp/CertID.java
+++ b/base/util/src/com/netscape/cmsutil/ocsp/CertID.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/ocsp/CertStatus.java b/base/util/src/com/netscape/cmsutil/ocsp/CertStatus.java
index a90eb215f..a90eb215f 100644
--- a/pki/base/util/src/com/netscape/cmsutil/ocsp/CertStatus.java
+++ b/base/util/src/com/netscape/cmsutil/ocsp/CertStatus.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/ocsp/GoodInfo.java b/base/util/src/com/netscape/cmsutil/ocsp/GoodInfo.java
index fa7387260..fa7387260 100644
--- a/pki/base/util/src/com/netscape/cmsutil/ocsp/GoodInfo.java
+++ b/base/util/src/com/netscape/cmsutil/ocsp/GoodInfo.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/ocsp/KeyHashID.java b/base/util/src/com/netscape/cmsutil/ocsp/KeyHashID.java
index 358fb0ebd..358fb0ebd 100644
--- a/pki/base/util/src/com/netscape/cmsutil/ocsp/KeyHashID.java
+++ b/base/util/src/com/netscape/cmsutil/ocsp/KeyHashID.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/ocsp/NameID.java b/base/util/src/com/netscape/cmsutil/ocsp/NameID.java
index 529ededbb..529ededbb 100644
--- a/pki/base/util/src/com/netscape/cmsutil/ocsp/NameID.java
+++ b/base/util/src/com/netscape/cmsutil/ocsp/NameID.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/ocsp/OCSPRequest.java b/base/util/src/com/netscape/cmsutil/ocsp/OCSPRequest.java
index 963bdc832..963bdc832 100644
--- a/pki/base/util/src/com/netscape/cmsutil/ocsp/OCSPRequest.java
+++ b/base/util/src/com/netscape/cmsutil/ocsp/OCSPRequest.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/ocsp/OCSPResponse.java b/base/util/src/com/netscape/cmsutil/ocsp/OCSPResponse.java
index 6696cd9dc..6696cd9dc 100644
--- a/pki/base/util/src/com/netscape/cmsutil/ocsp/OCSPResponse.java
+++ b/base/util/src/com/netscape/cmsutil/ocsp/OCSPResponse.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/ocsp/OCSPResponseStatus.java b/base/util/src/com/netscape/cmsutil/ocsp/OCSPResponseStatus.java
index 38ca881c2..38ca881c2 100644
--- a/pki/base/util/src/com/netscape/cmsutil/ocsp/OCSPResponseStatus.java
+++ b/base/util/src/com/netscape/cmsutil/ocsp/OCSPResponseStatus.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/ocsp/Request.java b/base/util/src/com/netscape/cmsutil/ocsp/Request.java
index 85c97de22..85c97de22 100644
--- a/pki/base/util/src/com/netscape/cmsutil/ocsp/Request.java
+++ b/base/util/src/com/netscape/cmsutil/ocsp/Request.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/ocsp/ResponderID.java b/base/util/src/com/netscape/cmsutil/ocsp/ResponderID.java
index 02e30de05..02e30de05 100644
--- a/pki/base/util/src/com/netscape/cmsutil/ocsp/ResponderID.java
+++ b/base/util/src/com/netscape/cmsutil/ocsp/ResponderID.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/ocsp/Response.java b/base/util/src/com/netscape/cmsutil/ocsp/Response.java
index 0d363e811..0d363e811 100644
--- a/pki/base/util/src/com/netscape/cmsutil/ocsp/Response.java
+++ b/base/util/src/com/netscape/cmsutil/ocsp/Response.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/ocsp/ResponseBytes.java b/base/util/src/com/netscape/cmsutil/ocsp/ResponseBytes.java
index c5d461148..c5d461148 100644
--- a/pki/base/util/src/com/netscape/cmsutil/ocsp/ResponseBytes.java
+++ b/base/util/src/com/netscape/cmsutil/ocsp/ResponseBytes.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/ocsp/ResponseData.java b/base/util/src/com/netscape/cmsutil/ocsp/ResponseData.java
index 1b28cf134..1b28cf134 100644
--- a/pki/base/util/src/com/netscape/cmsutil/ocsp/ResponseData.java
+++ b/base/util/src/com/netscape/cmsutil/ocsp/ResponseData.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/ocsp/RevokedInfo.java b/base/util/src/com/netscape/cmsutil/ocsp/RevokedInfo.java
index 9b0b2d186..9b0b2d186 100644
--- a/pki/base/util/src/com/netscape/cmsutil/ocsp/RevokedInfo.java
+++ b/base/util/src/com/netscape/cmsutil/ocsp/RevokedInfo.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/ocsp/Signature.java b/base/util/src/com/netscape/cmsutil/ocsp/Signature.java
index b9b192aee..b9b192aee 100644
--- a/pki/base/util/src/com/netscape/cmsutil/ocsp/Signature.java
+++ b/base/util/src/com/netscape/cmsutil/ocsp/Signature.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/ocsp/SingleResponse.java b/base/util/src/com/netscape/cmsutil/ocsp/SingleResponse.java
index ab54e5019..ab54e5019 100644
--- a/pki/base/util/src/com/netscape/cmsutil/ocsp/SingleResponse.java
+++ b/base/util/src/com/netscape/cmsutil/ocsp/SingleResponse.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/ocsp/TBSRequest.java b/base/util/src/com/netscape/cmsutil/ocsp/TBSRequest.java
index b7f706edb..b7f706edb 100644
--- a/pki/base/util/src/com/netscape/cmsutil/ocsp/TBSRequest.java
+++ b/base/util/src/com/netscape/cmsutil/ocsp/TBSRequest.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/ocsp/UnknownInfo.java b/base/util/src/com/netscape/cmsutil/ocsp/UnknownInfo.java
index 1fe4ea743..1fe4ea743 100644
--- a/pki/base/util/src/com/netscape/cmsutil/ocsp/UnknownInfo.java
+++ b/base/util/src/com/netscape/cmsutil/ocsp/UnknownInfo.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/password/IPasswordReader.java b/base/util/src/com/netscape/cmsutil/password/IPasswordReader.java
index 759e9e777..759e9e777 100644
--- a/pki/base/util/src/com/netscape/cmsutil/password/IPasswordReader.java
+++ b/base/util/src/com/netscape/cmsutil/password/IPasswordReader.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/password/IPasswordStore.java b/base/util/src/com/netscape/cmsutil/password/IPasswordStore.java
index 49b2610fa..49b2610fa 100644
--- a/pki/base/util/src/com/netscape/cmsutil/password/IPasswordStore.java
+++ b/base/util/src/com/netscape/cmsutil/password/IPasswordStore.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/password/IPasswordWriter.java b/base/util/src/com/netscape/cmsutil/password/IPasswordWriter.java
index c9f9691e7..c9f9691e7 100644
--- a/pki/base/util/src/com/netscape/cmsutil/password/IPasswordWriter.java
+++ b/base/util/src/com/netscape/cmsutil/password/IPasswordWriter.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/password/PlainPasswordFile.java b/base/util/src/com/netscape/cmsutil/password/PlainPasswordFile.java
index eb43607f0..eb43607f0 100644
--- a/pki/base/util/src/com/netscape/cmsutil/password/PlainPasswordFile.java
+++ b/base/util/src/com/netscape/cmsutil/password/PlainPasswordFile.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/password/PlainPasswordReader.java b/base/util/src/com/netscape/cmsutil/password/PlainPasswordReader.java
index 68724a9f6..68724a9f6 100644
--- a/pki/base/util/src/com/netscape/cmsutil/password/PlainPasswordReader.java
+++ b/base/util/src/com/netscape/cmsutil/password/PlainPasswordReader.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/password/PlainPasswordWriter.java b/base/util/src/com/netscape/cmsutil/password/PlainPasswordWriter.java
index 3ceac4bd6..3ceac4bd6 100644
--- a/pki/base/util/src/com/netscape/cmsutil/password/PlainPasswordWriter.java
+++ b/base/util/src/com/netscape/cmsutil/password/PlainPasswordWriter.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/AccessAccept.java b/base/util/src/com/netscape/cmsutil/radius/AccessAccept.java
index 4824c885f..4824c885f 100644
--- a/pki/base/util/src/com/netscape/cmsutil/radius/AccessAccept.java
+++ b/base/util/src/com/netscape/cmsutil/radius/AccessAccept.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/AccessChallenge.java b/base/util/src/com/netscape/cmsutil/radius/AccessChallenge.java
index c06f809b1..c06f809b1 100644
--- a/pki/base/util/src/com/netscape/cmsutil/radius/AccessChallenge.java
+++ b/base/util/src/com/netscape/cmsutil/radius/AccessChallenge.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/AccessReject.java b/base/util/src/com/netscape/cmsutil/radius/AccessReject.java
index 5f32ef349..5f32ef349 100644
--- a/pki/base/util/src/com/netscape/cmsutil/radius/AccessReject.java
+++ b/base/util/src/com/netscape/cmsutil/radius/AccessReject.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/AccessRequest.java b/base/util/src/com/netscape/cmsutil/radius/AccessRequest.java
index 7856b0cc8..7856b0cc8 100644
--- a/pki/base/util/src/com/netscape/cmsutil/radius/AccessRequest.java
+++ b/base/util/src/com/netscape/cmsutil/radius/AccessRequest.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/Attribute.java b/base/util/src/com/netscape/cmsutil/radius/Attribute.java
index 5e79816e4..5e79816e4 100644
--- a/pki/base/util/src/com/netscape/cmsutil/radius/Attribute.java
+++ b/base/util/src/com/netscape/cmsutil/radius/Attribute.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/AttributeFactory.java b/base/util/src/com/netscape/cmsutil/radius/AttributeFactory.java
index 021c06720..021c06720 100644
--- a/pki/base/util/src/com/netscape/cmsutil/radius/AttributeFactory.java
+++ b/base/util/src/com/netscape/cmsutil/radius/AttributeFactory.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/AttributeSet.java b/base/util/src/com/netscape/cmsutil/radius/AttributeSet.java
index d6974d371..d6974d371 100644
--- a/pki/base/util/src/com/netscape/cmsutil/radius/AttributeSet.java
+++ b/base/util/src/com/netscape/cmsutil/radius/AttributeSet.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/Authenticator.java b/base/util/src/com/netscape/cmsutil/radius/Authenticator.java
index 008af489a..008af489a 100644
--- a/pki/base/util/src/com/netscape/cmsutil/radius/Authenticator.java
+++ b/base/util/src/com/netscape/cmsutil/radius/Authenticator.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/CHAPChallengeAttribute.java b/base/util/src/com/netscape/cmsutil/radius/CHAPChallengeAttribute.java
index cd715a031..cd715a031 100644
--- a/pki/base/util/src/com/netscape/cmsutil/radius/CHAPChallengeAttribute.java
+++ b/base/util/src/com/netscape/cmsutil/radius/CHAPChallengeAttribute.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/CHAPPasswordAttribute.java b/base/util/src/com/netscape/cmsutil/radius/CHAPPasswordAttribute.java
index 3f0ef1793..3f0ef1793 100644
--- a/pki/base/util/src/com/netscape/cmsutil/radius/CHAPPasswordAttribute.java
+++ b/base/util/src/com/netscape/cmsutil/radius/CHAPPasswordAttribute.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/CallbackIdAttribute.java b/base/util/src/com/netscape/cmsutil/radius/CallbackIdAttribute.java
index 5fd806003..5fd806003 100644
--- a/pki/base/util/src/com/netscape/cmsutil/radius/CallbackIdAttribute.java
+++ b/base/util/src/com/netscape/cmsutil/radius/CallbackIdAttribute.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/CallbackNumberAttribute.java b/base/util/src/com/netscape/cmsutil/radius/CallbackNumberAttribute.java
index d6e45cecd..d6e45cecd 100644
--- a/pki/base/util/src/com/netscape/cmsutil/radius/CallbackNumberAttribute.java
+++ b/base/util/src/com/netscape/cmsutil/radius/CallbackNumberAttribute.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/CallerStationIdAttribute.java b/base/util/src/com/netscape/cmsutil/radius/CallerStationIdAttribute.java
index 3b5eec804..3b5eec804 100644
--- a/pki/base/util/src/com/netscape/cmsutil/radius/CallerStationIdAttribute.java
+++ b/base/util/src/com/netscape/cmsutil/radius/CallerStationIdAttribute.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/CallingStationIdAttribute.java b/base/util/src/com/netscape/cmsutil/radius/CallingStationIdAttribute.java
index 9a57f8089..9a57f8089 100644
--- a/pki/base/util/src/com/netscape/cmsutil/radius/CallingStationIdAttribute.java
+++ b/base/util/src/com/netscape/cmsutil/radius/CallingStationIdAttribute.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/ChallengeException.java b/base/util/src/com/netscape/cmsutil/radius/ChallengeException.java
index 972f7f084..972f7f084 100644
--- a/pki/base/util/src/com/netscape/cmsutil/radius/ChallengeException.java
+++ b/base/util/src/com/netscape/cmsutil/radius/ChallengeException.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/FilterIdAttribute.java b/base/util/src/com/netscape/cmsutil/radius/FilterIdAttribute.java
index 879d7d5c7..879d7d5c7 100644
--- a/pki/base/util/src/com/netscape/cmsutil/radius/FilterIdAttribute.java
+++ b/base/util/src/com/netscape/cmsutil/radius/FilterIdAttribute.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/FramedAppleTalkLinkAttribute.java b/base/util/src/com/netscape/cmsutil/radius/FramedAppleTalkLinkAttribute.java
index 05273780f..05273780f 100644
--- a/pki/base/util/src/com/netscape/cmsutil/radius/FramedAppleTalkLinkAttribute.java
+++ b/base/util/src/com/netscape/cmsutil/radius/FramedAppleTalkLinkAttribute.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/FramedAppleTalkNetworkAttribute.java b/base/util/src/com/netscape/cmsutil/radius/FramedAppleTalkNetworkAttribute.java
index cea0d936a..cea0d936a 100644
--- a/pki/base/util/src/com/netscape/cmsutil/radius/FramedAppleTalkNetworkAttribute.java
+++ b/base/util/src/com/netscape/cmsutil/radius/FramedAppleTalkNetworkAttribute.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/FramedAppleTalkZoneAttribute.java b/base/util/src/com/netscape/cmsutil/radius/FramedAppleTalkZoneAttribute.java
index 54ee47c45..54ee47c45 100644
--- a/pki/base/util/src/com/netscape/cmsutil/radius/FramedAppleTalkZoneAttribute.java
+++ b/base/util/src/com/netscape/cmsutil/radius/FramedAppleTalkZoneAttribute.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/FramedCompressionAttribute.java b/base/util/src/com/netscape/cmsutil/radius/FramedCompressionAttribute.java
index b57c030b5..b57c030b5 100644
--- a/pki/base/util/src/com/netscape/cmsutil/radius/FramedCompressionAttribute.java
+++ b/base/util/src/com/netscape/cmsutil/radius/FramedCompressionAttribute.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/FramedIPAddressAttribute.java b/base/util/src/com/netscape/cmsutil/radius/FramedIPAddressAttribute.java
index 2f66ee8c2..2f66ee8c2 100644
--- a/pki/base/util/src/com/netscape/cmsutil/radius/FramedIPAddressAttribute.java
+++ b/base/util/src/com/netscape/cmsutil/radius/FramedIPAddressAttribute.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/FramedIPNetmaskAttribute.java b/base/util/src/com/netscape/cmsutil/radius/FramedIPNetmaskAttribute.java
index f8e1980c7..f8e1980c7 100644
--- a/pki/base/util/src/com/netscape/cmsutil/radius/FramedIPNetmaskAttribute.java
+++ b/base/util/src/com/netscape/cmsutil/radius/FramedIPNetmaskAttribute.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/FramedIPXNetworkAttribute.java b/base/util/src/com/netscape/cmsutil/radius/FramedIPXNetworkAttribute.java
index 92f47eec1..92f47eec1 100644
--- a/pki/base/util/src/com/netscape/cmsutil/radius/FramedIPXNetworkAttribute.java
+++ b/base/util/src/com/netscape/cmsutil/radius/FramedIPXNetworkAttribute.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/FramedMTUAttribute.java b/base/util/src/com/netscape/cmsutil/radius/FramedMTUAttribute.java
index 5cd9551a2..5cd9551a2 100644
--- a/pki/base/util/src/com/netscape/cmsutil/radius/FramedMTUAttribute.java
+++ b/base/util/src/com/netscape/cmsutil/radius/FramedMTUAttribute.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/FramedProtocolAttribute.java b/base/util/src/com/netscape/cmsutil/radius/FramedProtocolAttribute.java
index 5af219b9a..5af219b9a 100644
--- a/pki/base/util/src/com/netscape/cmsutil/radius/FramedProtocolAttribute.java
+++ b/base/util/src/com/netscape/cmsutil/radius/FramedProtocolAttribute.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/FramedRouteAttribute.java b/base/util/src/com/netscape/cmsutil/radius/FramedRouteAttribute.java
index 9b123fe2a..9b123fe2a 100644
--- a/pki/base/util/src/com/netscape/cmsutil/radius/FramedRouteAttribute.java
+++ b/base/util/src/com/netscape/cmsutil/radius/FramedRouteAttribute.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/FramedRoutingAttribute.java b/base/util/src/com/netscape/cmsutil/radius/FramedRoutingAttribute.java
index 14d2b0cc8..14d2b0cc8 100644
--- a/pki/base/util/src/com/netscape/cmsutil/radius/FramedRoutingAttribute.java
+++ b/base/util/src/com/netscape/cmsutil/radius/FramedRoutingAttribute.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/GenericAttribute.java b/base/util/src/com/netscape/cmsutil/radius/GenericAttribute.java
index ac1798ae3..ac1798ae3 100644
--- a/pki/base/util/src/com/netscape/cmsutil/radius/GenericAttribute.java
+++ b/base/util/src/com/netscape/cmsutil/radius/GenericAttribute.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/IdleTimeoutAttribute.java b/base/util/src/com/netscape/cmsutil/radius/IdleTimeoutAttribute.java
index 44b0c5087..44b0c5087 100644
--- a/pki/base/util/src/com/netscape/cmsutil/radius/IdleTimeoutAttribute.java
+++ b/base/util/src/com/netscape/cmsutil/radius/IdleTimeoutAttribute.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/LoginIPHostAttribute.java b/base/util/src/com/netscape/cmsutil/radius/LoginIPHostAttribute.java
index 0d1c0565a..0d1c0565a 100644
--- a/pki/base/util/src/com/netscape/cmsutil/radius/LoginIPHostAttribute.java
+++ b/base/util/src/com/netscape/cmsutil/radius/LoginIPHostAttribute.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/LoginLATGroupAttribute.java b/base/util/src/com/netscape/cmsutil/radius/LoginLATGroupAttribute.java
index 4cee6bc3a..4cee6bc3a 100644
--- a/pki/base/util/src/com/netscape/cmsutil/radius/LoginLATGroupAttribute.java
+++ b/base/util/src/com/netscape/cmsutil/radius/LoginLATGroupAttribute.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/LoginLATNodeAttribute.java b/base/util/src/com/netscape/cmsutil/radius/LoginLATNodeAttribute.java
index 2c2d3411e..2c2d3411e 100644
--- a/pki/base/util/src/com/netscape/cmsutil/radius/LoginLATNodeAttribute.java
+++ b/base/util/src/com/netscape/cmsutil/radius/LoginLATNodeAttribute.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/LoginLATPortAttribute.java b/base/util/src/com/netscape/cmsutil/radius/LoginLATPortAttribute.java
index 330161ec8..330161ec8 100644
--- a/pki/base/util/src/com/netscape/cmsutil/radius/LoginLATPortAttribute.java
+++ b/base/util/src/com/netscape/cmsutil/radius/LoginLATPortAttribute.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/LoginLATServiceAttribute.java b/base/util/src/com/netscape/cmsutil/radius/LoginLATServiceAttribute.java
index 158630d27..158630d27 100644
--- a/pki/base/util/src/com/netscape/cmsutil/radius/LoginLATServiceAttribute.java
+++ b/base/util/src/com/netscape/cmsutil/radius/LoginLATServiceAttribute.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/LoginServiceAttribute.java b/base/util/src/com/netscape/cmsutil/radius/LoginServiceAttribute.java
index 73f49d39f..73f49d39f 100644
--- a/pki/base/util/src/com/netscape/cmsutil/radius/LoginServiceAttribute.java
+++ b/base/util/src/com/netscape/cmsutil/radius/LoginServiceAttribute.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/LoginTCPPortAttribute.java b/base/util/src/com/netscape/cmsutil/radius/LoginTCPPortAttribute.java
index 6b44f50c6..6b44f50c6 100644
--- a/pki/base/util/src/com/netscape/cmsutil/radius/LoginTCPPortAttribute.java
+++ b/base/util/src/com/netscape/cmsutil/radius/LoginTCPPortAttribute.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/NASClassAttribute.java b/base/util/src/com/netscape/cmsutil/radius/NASClassAttribute.java
index 57b983028..57b983028 100644
--- a/pki/base/util/src/com/netscape/cmsutil/radius/NASClassAttribute.java
+++ b/base/util/src/com/netscape/cmsutil/radius/NASClassAttribute.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/NASIPAddressAttribute.java b/base/util/src/com/netscape/cmsutil/radius/NASIPAddressAttribute.java
index d4022b3dd..d4022b3dd 100644
--- a/pki/base/util/src/com/netscape/cmsutil/radius/NASIPAddressAttribute.java
+++ b/base/util/src/com/netscape/cmsutil/radius/NASIPAddressAttribute.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/NASIdentifierAttribute.java b/base/util/src/com/netscape/cmsutil/radius/NASIdentifierAttribute.java
index 0a3a62cd8..0a3a62cd8 100644
--- a/pki/base/util/src/com/netscape/cmsutil/radius/NASIdentifierAttribute.java
+++ b/base/util/src/com/netscape/cmsutil/radius/NASIdentifierAttribute.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/NASPacket.java b/base/util/src/com/netscape/cmsutil/radius/NASPacket.java
index 70d143989..70d143989 100644
--- a/pki/base/util/src/com/netscape/cmsutil/radius/NASPacket.java
+++ b/base/util/src/com/netscape/cmsutil/radius/NASPacket.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/NASPortAttribute.java b/base/util/src/com/netscape/cmsutil/radius/NASPortAttribute.java
index 0f7b31e75..0f7b31e75 100644
--- a/pki/base/util/src/com/netscape/cmsutil/radius/NASPortAttribute.java
+++ b/base/util/src/com/netscape/cmsutil/radius/NASPortAttribute.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/NASPortTypeAttribute.java b/base/util/src/com/netscape/cmsutil/radius/NASPortTypeAttribute.java
index 84ccc3ae1..84ccc3ae1 100644
--- a/pki/base/util/src/com/netscape/cmsutil/radius/NASPortTypeAttribute.java
+++ b/base/util/src/com/netscape/cmsutil/radius/NASPortTypeAttribute.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/Packet.java b/base/util/src/com/netscape/cmsutil/radius/Packet.java
index 4fad0ba79..4fad0ba79 100644
--- a/pki/base/util/src/com/netscape/cmsutil/radius/Packet.java
+++ b/base/util/src/com/netscape/cmsutil/radius/Packet.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/PacketFactory.java b/base/util/src/com/netscape/cmsutil/radius/PacketFactory.java
index 8d2e20e74..8d2e20e74 100644
--- a/pki/base/util/src/com/netscape/cmsutil/radius/PacketFactory.java
+++ b/base/util/src/com/netscape/cmsutil/radius/PacketFactory.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/PortLimitAttribute.java b/base/util/src/com/netscape/cmsutil/radius/PortLimitAttribute.java
index 7903bb1fd..7903bb1fd 100644
--- a/pki/base/util/src/com/netscape/cmsutil/radius/PortLimitAttribute.java
+++ b/base/util/src/com/netscape/cmsutil/radius/PortLimitAttribute.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/ProxyStateAttribute.java b/base/util/src/com/netscape/cmsutil/radius/ProxyStateAttribute.java
index 83831b652..83831b652 100644
--- a/pki/base/util/src/com/netscape/cmsutil/radius/ProxyStateAttribute.java
+++ b/base/util/src/com/netscape/cmsutil/radius/ProxyStateAttribute.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/RadiusConn.java b/base/util/src/com/netscape/cmsutil/radius/RadiusConn.java
index b22807a5d..b22807a5d 100644
--- a/pki/base/util/src/com/netscape/cmsutil/radius/RadiusConn.java
+++ b/base/util/src/com/netscape/cmsutil/radius/RadiusConn.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/RejectException.java b/base/util/src/com/netscape/cmsutil/radius/RejectException.java
index f312ef2a4..f312ef2a4 100644
--- a/pki/base/util/src/com/netscape/cmsutil/radius/RejectException.java
+++ b/base/util/src/com/netscape/cmsutil/radius/RejectException.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/ReplyMessageAttribute.java b/base/util/src/com/netscape/cmsutil/radius/ReplyMessageAttribute.java
index 5ec4ea052..5ec4ea052 100644
--- a/pki/base/util/src/com/netscape/cmsutil/radius/ReplyMessageAttribute.java
+++ b/base/util/src/com/netscape/cmsutil/radius/ReplyMessageAttribute.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/RequestAuthenticator.java b/base/util/src/com/netscape/cmsutil/radius/RequestAuthenticator.java
index 5d82752dd..5d82752dd 100644
--- a/pki/base/util/src/com/netscape/cmsutil/radius/RequestAuthenticator.java
+++ b/base/util/src/com/netscape/cmsutil/radius/RequestAuthenticator.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/ResponseAuthenticator.java b/base/util/src/com/netscape/cmsutil/radius/ResponseAuthenticator.java
index 3c3de33c4..3c3de33c4 100644
--- a/pki/base/util/src/com/netscape/cmsutil/radius/ResponseAuthenticator.java
+++ b/base/util/src/com/netscape/cmsutil/radius/ResponseAuthenticator.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/ServerPacket.java b/base/util/src/com/netscape/cmsutil/radius/ServerPacket.java
index f7d7fa302..f7d7fa302 100644
--- a/pki/base/util/src/com/netscape/cmsutil/radius/ServerPacket.java
+++ b/base/util/src/com/netscape/cmsutil/radius/ServerPacket.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/ServiceTypeAttribute.java b/base/util/src/com/netscape/cmsutil/radius/ServiceTypeAttribute.java
index f31c74f9a..f31c74f9a 100644
--- a/pki/base/util/src/com/netscape/cmsutil/radius/ServiceTypeAttribute.java
+++ b/base/util/src/com/netscape/cmsutil/radius/ServiceTypeAttribute.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/SessionTimeoutAttribute.java b/base/util/src/com/netscape/cmsutil/radius/SessionTimeoutAttribute.java
index 2809aee4b..2809aee4b 100644
--- a/pki/base/util/src/com/netscape/cmsutil/radius/SessionTimeoutAttribute.java
+++ b/base/util/src/com/netscape/cmsutil/radius/SessionTimeoutAttribute.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/StateAttribute.java b/base/util/src/com/netscape/cmsutil/radius/StateAttribute.java
index 027f95620..027f95620 100644
--- a/pki/base/util/src/com/netscape/cmsutil/radius/StateAttribute.java
+++ b/base/util/src/com/netscape/cmsutil/radius/StateAttribute.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/TerminationActionAttribute.java b/base/util/src/com/netscape/cmsutil/radius/TerminationActionAttribute.java
index b47a70d8c..b47a70d8c 100644
--- a/pki/base/util/src/com/netscape/cmsutil/radius/TerminationActionAttribute.java
+++ b/base/util/src/com/netscape/cmsutil/radius/TerminationActionAttribute.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/UserNameAttribute.java b/base/util/src/com/netscape/cmsutil/radius/UserNameAttribute.java
index af7ce6bbe..af7ce6bbe 100644
--- a/pki/base/util/src/com/netscape/cmsutil/radius/UserNameAttribute.java
+++ b/base/util/src/com/netscape/cmsutil/radius/UserNameAttribute.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/UserPasswordAttribute.java b/base/util/src/com/netscape/cmsutil/radius/UserPasswordAttribute.java
index 31c27cdfd..31c27cdfd 100644
--- a/pki/base/util/src/com/netscape/cmsutil/radius/UserPasswordAttribute.java
+++ b/base/util/src/com/netscape/cmsutil/radius/UserPasswordAttribute.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/VendorSpecificAttribute.java b/base/util/src/com/netscape/cmsutil/radius/VendorSpecificAttribute.java
index 5f3d9f170..5f3d9f170 100644
--- a/pki/base/util/src/com/netscape/cmsutil/radius/VendorSpecificAttribute.java
+++ b/base/util/src/com/netscape/cmsutil/radius/VendorSpecificAttribute.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/scep/CRSPKIMessage.java b/base/util/src/com/netscape/cmsutil/scep/CRSPKIMessage.java
index 03bc68723..03bc68723 100644
--- a/pki/base/util/src/com/netscape/cmsutil/scep/CRSPKIMessage.java
+++ b/base/util/src/com/netscape/cmsutil/scep/CRSPKIMessage.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/util/Cert.java b/base/util/src/com/netscape/cmsutil/util/Cert.java
index 3563f70c7..3563f70c7 100644
--- a/pki/base/util/src/com/netscape/cmsutil/util/Cert.java
+++ b/base/util/src/com/netscape/cmsutil/util/Cert.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/util/Fmt.java b/base/util/src/com/netscape/cmsutil/util/Fmt.java
index a24b8d090..a24b8d090 100644
--- a/pki/base/util/src/com/netscape/cmsutil/util/Fmt.java
+++ b/base/util/src/com/netscape/cmsutil/util/Fmt.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/util/HMACDigest.java b/base/util/src/com/netscape/cmsutil/util/HMACDigest.java
index 09bf53bbf..09bf53bbf 100644
--- a/pki/base/util/src/com/netscape/cmsutil/util/HMACDigest.java
+++ b/base/util/src/com/netscape/cmsutil/util/HMACDigest.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/util/Utils.java b/base/util/src/com/netscape/cmsutil/util/Utils.java
index 303566416..303566416 100644
--- a/pki/base/util/src/com/netscape/cmsutil/util/Utils.java
+++ b/base/util/src/com/netscape/cmsutil/util/Utils.java
diff --git a/pki/base/util/src/com/netscape/cmsutil/xml/XMLObject.java b/base/util/src/com/netscape/cmsutil/xml/XMLObject.java
index ed2fb67ee..ed2fb67ee 100644
--- a/pki/base/util/src/com/netscape/cmsutil/xml/XMLObject.java
+++ b/base/util/src/com/netscape/cmsutil/xml/XMLObject.java
diff --git a/pki/base/util/src/netscape/net/NetworkClient.java b/base/util/src/netscape/net/NetworkClient.java
index ae8cdfcf4..ae8cdfcf4 100644
--- a/pki/base/util/src/netscape/net/NetworkClient.java
+++ b/base/util/src/netscape/net/NetworkClient.java
diff --git a/pki/base/util/src/netscape/net/TransferProtocolClient.java b/base/util/src/netscape/net/TransferProtocolClient.java
index 76e3a9c21..76e3a9c21 100644
--- a/pki/base/util/src/netscape/net/TransferProtocolClient.java
+++ b/base/util/src/netscape/net/TransferProtocolClient.java
diff --git a/pki/base/util/src/netscape/net/smtp/SmtpClient.java b/base/util/src/netscape/net/smtp/SmtpClient.java
index 40b927b8f..40b927b8f 100644
--- a/pki/base/util/src/netscape/net/smtp/SmtpClient.java
+++ b/base/util/src/netscape/net/smtp/SmtpClient.java
diff --git a/pki/base/util/src/netscape/net/smtp/SmtpProtocolException.java b/base/util/src/netscape/net/smtp/SmtpProtocolException.java
index 9ffe5d95b..9ffe5d95b 100644
--- a/pki/base/util/src/netscape/net/smtp/SmtpProtocolException.java
+++ b/base/util/src/netscape/net/smtp/SmtpProtocolException.java
diff --git a/pki/base/util/src/netscape/security/acl/AclEntryImpl.java b/base/util/src/netscape/security/acl/AclEntryImpl.java
index 46365f5d8..46365f5d8 100644
--- a/pki/base/util/src/netscape/security/acl/AclEntryImpl.java
+++ b/base/util/src/netscape/security/acl/AclEntryImpl.java
diff --git a/pki/base/util/src/netscape/security/acl/AclImpl.java b/base/util/src/netscape/security/acl/AclImpl.java
index 76750b7b9..76750b7b9 100644
--- a/pki/base/util/src/netscape/security/acl/AclImpl.java
+++ b/base/util/src/netscape/security/acl/AclImpl.java
diff --git a/pki/base/util/src/netscape/security/acl/AllPermissionsImpl.java b/base/util/src/netscape/security/acl/AllPermissionsImpl.java
index f2b57742f..f2b57742f 100644
--- a/pki/base/util/src/netscape/security/acl/AllPermissionsImpl.java
+++ b/base/util/src/netscape/security/acl/AllPermissionsImpl.java
diff --git a/pki/base/util/src/netscape/security/acl/GroupImpl.java b/base/util/src/netscape/security/acl/GroupImpl.java
index ed087a544..ed087a544 100644
--- a/pki/base/util/src/netscape/security/acl/GroupImpl.java
+++ b/base/util/src/netscape/security/acl/GroupImpl.java
diff --git a/pki/base/util/src/netscape/security/acl/OwnerImpl.java b/base/util/src/netscape/security/acl/OwnerImpl.java
index 3f47a1dd8..3f47a1dd8 100644
--- a/pki/base/util/src/netscape/security/acl/OwnerImpl.java
+++ b/base/util/src/netscape/security/acl/OwnerImpl.java
diff --git a/pki/base/util/src/netscape/security/acl/PermissionImpl.java b/base/util/src/netscape/security/acl/PermissionImpl.java
index 2e73d3c7e..2e73d3c7e 100644
--- a/pki/base/util/src/netscape/security/acl/PermissionImpl.java
+++ b/base/util/src/netscape/security/acl/PermissionImpl.java
diff --git a/pki/base/util/src/netscape/security/acl/PrincipalImpl.java b/base/util/src/netscape/security/acl/PrincipalImpl.java
index 25fa11095..25fa11095 100644
--- a/pki/base/util/src/netscape/security/acl/PrincipalImpl.java
+++ b/base/util/src/netscape/security/acl/PrincipalImpl.java
diff --git a/pki/base/util/src/netscape/security/acl/WorldGroupImpl.java b/base/util/src/netscape/security/acl/WorldGroupImpl.java
index 2f885cbec..2f885cbec 100644
--- a/pki/base/util/src/netscape/security/acl/WorldGroupImpl.java
+++ b/base/util/src/netscape/security/acl/WorldGroupImpl.java
diff --git a/pki/base/util/src/netscape/security/extensions/AccessDescription.java b/base/util/src/netscape/security/extensions/AccessDescription.java
index f13c937e7..f13c937e7 100644
--- a/pki/base/util/src/netscape/security/extensions/AccessDescription.java
+++ b/base/util/src/netscape/security/extensions/AccessDescription.java
diff --git a/pki/base/util/src/netscape/security/extensions/AuthInfoAccessExtension.java b/base/util/src/netscape/security/extensions/AuthInfoAccessExtension.java
index b8e2933dd..b8e2933dd 100644
--- a/pki/base/util/src/netscape/security/extensions/AuthInfoAccessExtension.java
+++ b/base/util/src/netscape/security/extensions/AuthInfoAccessExtension.java
diff --git a/pki/base/util/src/netscape/security/extensions/CertInfo.java b/base/util/src/netscape/security/extensions/CertInfo.java
index ab88ec8ab..ab88ec8ab 100644
--- a/pki/base/util/src/netscape/security/extensions/CertInfo.java
+++ b/base/util/src/netscape/security/extensions/CertInfo.java
diff --git a/pki/base/util/src/netscape/security/extensions/CertificateRenewalWindowExtension.java b/base/util/src/netscape/security/extensions/CertificateRenewalWindowExtension.java
index 018fd71c8..018fd71c8 100644
--- a/pki/base/util/src/netscape/security/extensions/CertificateRenewalWindowExtension.java
+++ b/base/util/src/netscape/security/extensions/CertificateRenewalWindowExtension.java
diff --git a/pki/base/util/src/netscape/security/extensions/CertificateScopeEntry.java b/base/util/src/netscape/security/extensions/CertificateScopeEntry.java
index 527093ccf..527093ccf 100644
--- a/pki/base/util/src/netscape/security/extensions/CertificateScopeEntry.java
+++ b/base/util/src/netscape/security/extensions/CertificateScopeEntry.java
diff --git a/pki/base/util/src/netscape/security/extensions/CertificateScopeOfUseExtension.java b/base/util/src/netscape/security/extensions/CertificateScopeOfUseExtension.java
index 16641f36b..16641f36b 100644
--- a/pki/base/util/src/netscape/security/extensions/CertificateScopeOfUseExtension.java
+++ b/base/util/src/netscape/security/extensions/CertificateScopeOfUseExtension.java
diff --git a/pki/base/util/src/netscape/security/extensions/ExtendedKeyUsageExtension.java b/base/util/src/netscape/security/extensions/ExtendedKeyUsageExtension.java
index 939da036f..939da036f 100644
--- a/pki/base/util/src/netscape/security/extensions/ExtendedKeyUsageExtension.java
+++ b/base/util/src/netscape/security/extensions/ExtendedKeyUsageExtension.java
diff --git a/pki/base/util/src/netscape/security/extensions/GenericASN1Extension.java b/base/util/src/netscape/security/extensions/GenericASN1Extension.java
index ff1ea7173..ff1ea7173 100644
--- a/pki/base/util/src/netscape/security/extensions/GenericASN1Extension.java
+++ b/base/util/src/netscape/security/extensions/GenericASN1Extension.java
diff --git a/pki/base/util/src/netscape/security/extensions/InhibitAnyPolicyExtension.java b/base/util/src/netscape/security/extensions/InhibitAnyPolicyExtension.java
index 81b8cf5b5..81b8cf5b5 100644
--- a/pki/base/util/src/netscape/security/extensions/InhibitAnyPolicyExtension.java
+++ b/base/util/src/netscape/security/extensions/InhibitAnyPolicyExtension.java
diff --git a/pki/base/util/src/netscape/security/extensions/KerberosName.java b/base/util/src/netscape/security/extensions/KerberosName.java
index 0a6a6e213..0a6a6e213 100644
--- a/pki/base/util/src/netscape/security/extensions/KerberosName.java
+++ b/base/util/src/netscape/security/extensions/KerberosName.java
diff --git a/pki/base/util/src/netscape/security/extensions/NSCertTypeExtension.java b/base/util/src/netscape/security/extensions/NSCertTypeExtension.java
index 04b3038e5..04b3038e5 100644
--- a/pki/base/util/src/netscape/security/extensions/NSCertTypeExtension.java
+++ b/base/util/src/netscape/security/extensions/NSCertTypeExtension.java
diff --git a/pki/base/util/src/netscape/security/extensions/OCSPNoCheckExtension.java b/base/util/src/netscape/security/extensions/OCSPNoCheckExtension.java
index 28da8085f..28da8085f 100644
--- a/pki/base/util/src/netscape/security/extensions/OCSPNoCheckExtension.java
+++ b/base/util/src/netscape/security/extensions/OCSPNoCheckExtension.java
diff --git a/pki/base/util/src/netscape/security/extensions/PresenceServerExtension.java b/base/util/src/netscape/security/extensions/PresenceServerExtension.java
index c67fe9965..c67fe9965 100644
--- a/pki/base/util/src/netscape/security/extensions/PresenceServerExtension.java
+++ b/base/util/src/netscape/security/extensions/PresenceServerExtension.java
diff --git a/pki/base/util/src/netscape/security/extensions/SubjectInfoAccessExtension.java b/base/util/src/netscape/security/extensions/SubjectInfoAccessExtension.java
index 5c373289f..5c373289f 100644
--- a/pki/base/util/src/netscape/security/extensions/SubjectInfoAccessExtension.java
+++ b/base/util/src/netscape/security/extensions/SubjectInfoAccessExtension.java
diff --git a/pki/base/util/src/netscape/security/pkcs/ContentInfo.java b/base/util/src/netscape/security/pkcs/ContentInfo.java
index 9825494c2..9825494c2 100644
--- a/pki/base/util/src/netscape/security/pkcs/ContentInfo.java
+++ b/base/util/src/netscape/security/pkcs/ContentInfo.java
diff --git a/pki/base/util/src/netscape/security/pkcs/EncodingException.java b/base/util/src/netscape/security/pkcs/EncodingException.java
index cb495e990..cb495e990 100644
--- a/pki/base/util/src/netscape/security/pkcs/EncodingException.java
+++ b/base/util/src/netscape/security/pkcs/EncodingException.java
diff --git a/pki/base/util/src/netscape/security/pkcs/PKCS10.java b/base/util/src/netscape/security/pkcs/PKCS10.java
index a6ddd203f..a6ddd203f 100644
--- a/pki/base/util/src/netscape/security/pkcs/PKCS10.java
+++ b/base/util/src/netscape/security/pkcs/PKCS10.java
diff --git a/pki/base/util/src/netscape/security/pkcs/PKCS10Attribute.java b/base/util/src/netscape/security/pkcs/PKCS10Attribute.java
index a649c395a..a649c395a 100644
--- a/pki/base/util/src/netscape/security/pkcs/PKCS10Attribute.java
+++ b/base/util/src/netscape/security/pkcs/PKCS10Attribute.java
diff --git a/pki/base/util/src/netscape/security/pkcs/PKCS10Attributes.java b/base/util/src/netscape/security/pkcs/PKCS10Attributes.java
index 8beb1e64c..8beb1e64c 100644
--- a/pki/base/util/src/netscape/security/pkcs/PKCS10Attributes.java
+++ b/base/util/src/netscape/security/pkcs/PKCS10Attributes.java
diff --git a/pki/base/util/src/netscape/security/pkcs/PKCS7.java b/base/util/src/netscape/security/pkcs/PKCS7.java
index c8fb69582..c8fb69582 100644
--- a/pki/base/util/src/netscape/security/pkcs/PKCS7.java
+++ b/base/util/src/netscape/security/pkcs/PKCS7.java
diff --git a/pki/base/util/src/netscape/security/pkcs/PKCS8Key.java b/base/util/src/netscape/security/pkcs/PKCS8Key.java
index 7c5f64582..7c5f64582 100644
--- a/pki/base/util/src/netscape/security/pkcs/PKCS8Key.java
+++ b/base/util/src/netscape/security/pkcs/PKCS8Key.java
diff --git a/pki/base/util/src/netscape/security/pkcs/PKCS9Attribute.java b/base/util/src/netscape/security/pkcs/PKCS9Attribute.java
index 6a6fd7dc9..6a6fd7dc9 100644
--- a/pki/base/util/src/netscape/security/pkcs/PKCS9Attribute.java
+++ b/base/util/src/netscape/security/pkcs/PKCS9Attribute.java
diff --git a/pki/base/util/src/netscape/security/pkcs/PKCS9Attributes.java b/base/util/src/netscape/security/pkcs/PKCS9Attributes.java
index 485cdded1..485cdded1 100644
--- a/pki/base/util/src/netscape/security/pkcs/PKCS9Attributes.java
+++ b/base/util/src/netscape/security/pkcs/PKCS9Attributes.java
diff --git a/pki/base/util/src/netscape/security/pkcs/ParsingException.java b/base/util/src/netscape/security/pkcs/ParsingException.java
index 88e91a8db..88e91a8db 100644
--- a/pki/base/util/src/netscape/security/pkcs/ParsingException.java
+++ b/base/util/src/netscape/security/pkcs/ParsingException.java
diff --git a/pki/base/util/src/netscape/security/pkcs/SignerInfo.java b/base/util/src/netscape/security/pkcs/SignerInfo.java
index adb0115cc..adb0115cc 100644
--- a/pki/base/util/src/netscape/security/pkcs/SignerInfo.java
+++ b/base/util/src/netscape/security/pkcs/SignerInfo.java
diff --git a/pki/base/util/src/netscape/security/provider/CMS.java b/base/util/src/netscape/security/provider/CMS.java
index 4a4f150ab..4a4f150ab 100644
--- a/pki/base/util/src/netscape/security/provider/CMS.java
+++ b/base/util/src/netscape/security/provider/CMS.java
diff --git a/pki/base/util/src/netscape/security/provider/DSA.java b/base/util/src/netscape/security/provider/DSA.java
index 262095576..262095576 100644
--- a/pki/base/util/src/netscape/security/provider/DSA.java
+++ b/base/util/src/netscape/security/provider/DSA.java
diff --git a/pki/base/util/src/netscape/security/provider/DSAKeyFactory.java b/base/util/src/netscape/security/provider/DSAKeyFactory.java
index 41f0081f2..41f0081f2 100755
--- a/pki/base/util/src/netscape/security/provider/DSAKeyFactory.java
+++ b/base/util/src/netscape/security/provider/DSAKeyFactory.java
diff --git a/pki/base/util/src/netscape/security/provider/DSAKeyPairGenerator.java b/base/util/src/netscape/security/provider/DSAKeyPairGenerator.java
index 3e04792bf..3e04792bf 100644
--- a/pki/base/util/src/netscape/security/provider/DSAKeyPairGenerator.java
+++ b/base/util/src/netscape/security/provider/DSAKeyPairGenerator.java
diff --git a/pki/base/util/src/netscape/security/provider/DSAParameterGenerator.java b/base/util/src/netscape/security/provider/DSAParameterGenerator.java
index cd7b8de33..cd7b8de33 100755
--- a/pki/base/util/src/netscape/security/provider/DSAParameterGenerator.java
+++ b/base/util/src/netscape/security/provider/DSAParameterGenerator.java
diff --git a/pki/base/util/src/netscape/security/provider/DSAParameters.java b/base/util/src/netscape/security/provider/DSAParameters.java
index e2a5dd128..e2a5dd128 100755
--- a/pki/base/util/src/netscape/security/provider/DSAParameters.java
+++ b/base/util/src/netscape/security/provider/DSAParameters.java
diff --git a/pki/base/util/src/netscape/security/provider/DSAPrivateKey.java b/base/util/src/netscape/security/provider/DSAPrivateKey.java
index 0cfc5e5ea..0cfc5e5ea 100644
--- a/pki/base/util/src/netscape/security/provider/DSAPrivateKey.java
+++ b/base/util/src/netscape/security/provider/DSAPrivateKey.java
diff --git a/pki/base/util/src/netscape/security/provider/DSAPublicKey.java b/base/util/src/netscape/security/provider/DSAPublicKey.java
index 89262809b..89262809b 100644
--- a/pki/base/util/src/netscape/security/provider/DSAPublicKey.java
+++ b/base/util/src/netscape/security/provider/DSAPublicKey.java
diff --git a/pki/base/util/src/netscape/security/provider/MD5.java b/base/util/src/netscape/security/provider/MD5.java
index d7aeacaee..d7aeacaee 100644
--- a/pki/base/util/src/netscape/security/provider/MD5.java
+++ b/base/util/src/netscape/security/provider/MD5.java
diff --git a/pki/base/util/src/netscape/security/provider/RSAPublicKey.java b/base/util/src/netscape/security/provider/RSAPublicKey.java
index 4c65b4fa0..4c65b4fa0 100644
--- a/pki/base/util/src/netscape/security/provider/RSAPublicKey.java
+++ b/base/util/src/netscape/security/provider/RSAPublicKey.java
diff --git a/pki/base/util/src/netscape/security/provider/SHA.java b/base/util/src/netscape/security/provider/SHA.java
index 42a6b8b90..42a6b8b90 100644
--- a/pki/base/util/src/netscape/security/provider/SHA.java
+++ b/base/util/src/netscape/security/provider/SHA.java
diff --git a/pki/base/util/src/netscape/security/provider/Sun.java b/base/util/src/netscape/security/provider/Sun.java
index df384aeab..df384aeab 100644
--- a/pki/base/util/src/netscape/security/provider/Sun.java
+++ b/base/util/src/netscape/security/provider/Sun.java
diff --git a/pki/base/util/src/netscape/security/provider/X509CertificateFactory.java b/base/util/src/netscape/security/provider/X509CertificateFactory.java
index 9780983a5..9780983a5 100644
--- a/pki/base/util/src/netscape/security/provider/X509CertificateFactory.java
+++ b/base/util/src/netscape/security/provider/X509CertificateFactory.java
diff --git a/pki/base/util/src/netscape/security/util/ASN1CharStrConvMap.java b/base/util/src/netscape/security/util/ASN1CharStrConvMap.java
index c9c364f4f..c9c364f4f 100644
--- a/pki/base/util/src/netscape/security/util/ASN1CharStrConvMap.java
+++ b/base/util/src/netscape/security/util/ASN1CharStrConvMap.java
diff --git a/pki/base/util/src/netscape/security/util/ASN1CharsetProvider.java b/base/util/src/netscape/security/util/ASN1CharsetProvider.java
index 1de1c3c48..1de1c3c48 100644
--- a/pki/base/util/src/netscape/security/util/ASN1CharsetProvider.java
+++ b/base/util/src/netscape/security/util/ASN1CharsetProvider.java
diff --git a/pki/base/util/src/netscape/security/util/BigInt.java b/base/util/src/netscape/security/util/BigInt.java
index 9210648f1..9210648f1 100644
--- a/pki/base/util/src/netscape/security/util/BigInt.java
+++ b/base/util/src/netscape/security/util/BigInt.java
diff --git a/pki/base/util/src/netscape/security/util/BitArray.java b/base/util/src/netscape/security/util/BitArray.java
index ab77c226e..ab77c226e 100644
--- a/pki/base/util/src/netscape/security/util/BitArray.java
+++ b/base/util/src/netscape/security/util/BitArray.java
diff --git a/pki/base/util/src/netscape/security/util/ByteArrayLexOrder.java b/base/util/src/netscape/security/util/ByteArrayLexOrder.java
index 2ee2f740e..2ee2f740e 100644
--- a/pki/base/util/src/netscape/security/util/ByteArrayLexOrder.java
+++ b/base/util/src/netscape/security/util/ByteArrayLexOrder.java
diff --git a/pki/base/util/src/netscape/security/util/ByteArrayTagOrder.java b/base/util/src/netscape/security/util/ByteArrayTagOrder.java
index e57a3b5f1..e57a3b5f1 100644
--- a/pki/base/util/src/netscape/security/util/ByteArrayTagOrder.java
+++ b/base/util/src/netscape/security/util/ByteArrayTagOrder.java
diff --git a/pki/base/util/src/netscape/security/util/CertPrettyPrint.java b/base/util/src/netscape/security/util/CertPrettyPrint.java
index 3a8c65fd0..3a8c65fd0 100644
--- a/pki/base/util/src/netscape/security/util/CertPrettyPrint.java
+++ b/base/util/src/netscape/security/util/CertPrettyPrint.java
diff --git a/pki/base/util/src/netscape/security/util/CrlPrettyPrint.java b/base/util/src/netscape/security/util/CrlPrettyPrint.java
index edf1217ea..edf1217ea 100644
--- a/pki/base/util/src/netscape/security/util/CrlPrettyPrint.java
+++ b/base/util/src/netscape/security/util/CrlPrettyPrint.java
diff --git a/pki/base/util/src/netscape/security/util/DerEncoder.java b/base/util/src/netscape/security/util/DerEncoder.java
index c2eb64fc0..c2eb64fc0 100644
--- a/pki/base/util/src/netscape/security/util/DerEncoder.java
+++ b/base/util/src/netscape/security/util/DerEncoder.java
diff --git a/pki/base/util/src/netscape/security/util/DerInputBuffer.java b/base/util/src/netscape/security/util/DerInputBuffer.java
index 7534f3d06..7534f3d06 100644
--- a/pki/base/util/src/netscape/security/util/DerInputBuffer.java
+++ b/base/util/src/netscape/security/util/DerInputBuffer.java
diff --git a/pki/base/util/src/netscape/security/util/DerInputStream.java b/base/util/src/netscape/security/util/DerInputStream.java
index 20ced6757..20ced6757 100644
--- a/pki/base/util/src/netscape/security/util/DerInputStream.java
+++ b/base/util/src/netscape/security/util/DerInputStream.java
diff --git a/pki/base/util/src/netscape/security/util/DerOutputStream.java b/base/util/src/netscape/security/util/DerOutputStream.java
index 62290d604..62290d604 100644
--- a/pki/base/util/src/netscape/security/util/DerOutputStream.java
+++ b/base/util/src/netscape/security/util/DerOutputStream.java
diff --git a/pki/base/util/src/netscape/security/util/DerValue.java b/base/util/src/netscape/security/util/DerValue.java
index 71b6f7f2c..71b6f7f2c 100644
--- a/pki/base/util/src/netscape/security/util/DerValue.java
+++ b/base/util/src/netscape/security/util/DerValue.java
diff --git a/pki/base/util/src/netscape/security/util/ExtPrettyPrint.java b/base/util/src/netscape/security/util/ExtPrettyPrint.java
index 90d0d094f..90d0d094f 100644
--- a/pki/base/util/src/netscape/security/util/ExtPrettyPrint.java
+++ b/base/util/src/netscape/security/util/ExtPrettyPrint.java
diff --git a/pki/base/util/src/netscape/security/util/IA5Charset.java b/base/util/src/netscape/security/util/IA5Charset.java
index db6da2331..db6da2331 100644
--- a/pki/base/util/src/netscape/security/util/IA5Charset.java
+++ b/base/util/src/netscape/security/util/IA5Charset.java
diff --git a/pki/base/util/src/netscape/security/util/IA5CharsetDecoder.java b/base/util/src/netscape/security/util/IA5CharsetDecoder.java
index 620d65aca..620d65aca 100644
--- a/pki/base/util/src/netscape/security/util/IA5CharsetDecoder.java
+++ b/base/util/src/netscape/security/util/IA5CharsetDecoder.java
diff --git a/pki/base/util/src/netscape/security/util/IA5CharsetEncoder.java b/base/util/src/netscape/security/util/IA5CharsetEncoder.java
index dad0c9a2d..dad0c9a2d 100644
--- a/pki/base/util/src/netscape/security/util/IA5CharsetEncoder.java
+++ b/base/util/src/netscape/security/util/IA5CharsetEncoder.java
diff --git a/pki/base/util/src/netscape/security/util/ObjectIdentifier.java b/base/util/src/netscape/security/util/ObjectIdentifier.java
index 6ff02d1b0..6ff02d1b0 100644
--- a/pki/base/util/src/netscape/security/util/ObjectIdentifier.java
+++ b/base/util/src/netscape/security/util/ObjectIdentifier.java
diff --git a/pki/base/util/src/netscape/security/util/PrettyPrintFormat.java b/base/util/src/netscape/security/util/PrettyPrintFormat.java
index 25bc23d26..25bc23d26 100644
--- a/pki/base/util/src/netscape/security/util/PrettyPrintFormat.java
+++ b/base/util/src/netscape/security/util/PrettyPrintFormat.java
diff --git a/pki/base/util/src/netscape/security/util/PrettyPrintResources.java b/base/util/src/netscape/security/util/PrettyPrintResources.java
index a3f068f64..a3f068f64 100644
--- a/pki/base/util/src/netscape/security/util/PrettyPrintResources.java
+++ b/base/util/src/netscape/security/util/PrettyPrintResources.java
diff --git a/pki/base/util/src/netscape/security/util/PrintableCharset.java b/base/util/src/netscape/security/util/PrintableCharset.java
index a9cf15c04..a9cf15c04 100644
--- a/pki/base/util/src/netscape/security/util/PrintableCharset.java
+++ b/base/util/src/netscape/security/util/PrintableCharset.java
diff --git a/pki/base/util/src/netscape/security/util/PrintableCharsetDecoder.java b/base/util/src/netscape/security/util/PrintableCharsetDecoder.java
index 014095494..014095494 100644
--- a/pki/base/util/src/netscape/security/util/PrintableCharsetDecoder.java
+++ b/base/util/src/netscape/security/util/PrintableCharsetDecoder.java
diff --git a/pki/base/util/src/netscape/security/util/PrintableCharsetEncoder.java b/base/util/src/netscape/security/util/PrintableCharsetEncoder.java
index bc658096a..bc658096a 100644
--- a/pki/base/util/src/netscape/security/util/PrintableCharsetEncoder.java
+++ b/base/util/src/netscape/security/util/PrintableCharsetEncoder.java
diff --git a/pki/base/util/src/netscape/security/util/PubKeyPrettyPrint.java b/base/util/src/netscape/security/util/PubKeyPrettyPrint.java
index 46c007cd9..46c007cd9 100644
--- a/pki/base/util/src/netscape/security/util/PubKeyPrettyPrint.java
+++ b/base/util/src/netscape/security/util/PubKeyPrettyPrint.java
diff --git a/pki/base/util/src/netscape/security/util/UniversalCharset.java b/base/util/src/netscape/security/util/UniversalCharset.java
index 59cc3c6f4..59cc3c6f4 100644
--- a/pki/base/util/src/netscape/security/util/UniversalCharset.java
+++ b/base/util/src/netscape/security/util/UniversalCharset.java
diff --git a/pki/base/util/src/netscape/security/util/UniversalCharsetDecoder.java b/base/util/src/netscape/security/util/UniversalCharsetDecoder.java
index a41c5ad50..a41c5ad50 100644
--- a/pki/base/util/src/netscape/security/util/UniversalCharsetDecoder.java
+++ b/base/util/src/netscape/security/util/UniversalCharsetDecoder.java
diff --git a/pki/base/util/src/netscape/security/util/UniversalCharsetEncoder.java b/base/util/src/netscape/security/util/UniversalCharsetEncoder.java
index cd2a51296..cd2a51296 100644
--- a/pki/base/util/src/netscape/security/util/UniversalCharsetEncoder.java
+++ b/base/util/src/netscape/security/util/UniversalCharsetEncoder.java
diff --git a/pki/base/util/src/netscape/security/x509/ACertAttrSet.java b/base/util/src/netscape/security/x509/ACertAttrSet.java
index 8a757d7f5..8a757d7f5 100755
--- a/pki/base/util/src/netscape/security/x509/ACertAttrSet.java
+++ b/base/util/src/netscape/security/x509/ACertAttrSet.java
diff --git a/pki/base/util/src/netscape/security/x509/AVA.java b/base/util/src/netscape/security/x509/AVA.java
index ad94c2c61..ad94c2c61 100644
--- a/pki/base/util/src/netscape/security/x509/AVA.java
+++ b/base/util/src/netscape/security/x509/AVA.java
diff --git a/pki/base/util/src/netscape/security/x509/AVAValueConverter.java b/base/util/src/netscape/security/x509/AVAValueConverter.java
index cd3ce7616..cd3ce7616 100644
--- a/pki/base/util/src/netscape/security/x509/AVAValueConverter.java
+++ b/base/util/src/netscape/security/x509/AVAValueConverter.java
diff --git a/pki/base/util/src/netscape/security/x509/AlgIdDSA.java b/base/util/src/netscape/security/x509/AlgIdDSA.java
index 0a64ad37b..0a64ad37b 100644
--- a/pki/base/util/src/netscape/security/x509/AlgIdDSA.java
+++ b/base/util/src/netscape/security/x509/AlgIdDSA.java
diff --git a/pki/base/util/src/netscape/security/x509/AlgorithmId.java b/base/util/src/netscape/security/x509/AlgorithmId.java
index b0113af41..b0113af41 100644
--- a/pki/base/util/src/netscape/security/x509/AlgorithmId.java
+++ b/base/util/src/netscape/security/x509/AlgorithmId.java
diff --git a/pki/base/util/src/netscape/security/x509/Attribute.java b/base/util/src/netscape/security/x509/Attribute.java
index 11e22db10..11e22db10 100644
--- a/pki/base/util/src/netscape/security/x509/Attribute.java
+++ b/base/util/src/netscape/security/x509/Attribute.java
diff --git a/pki/base/util/src/netscape/security/x509/AuthorityKeyIdentifierExtension.java b/base/util/src/netscape/security/x509/AuthorityKeyIdentifierExtension.java
index 91b6c2598..91b6c2598 100644
--- a/pki/base/util/src/netscape/security/x509/AuthorityKeyIdentifierExtension.java
+++ b/base/util/src/netscape/security/x509/AuthorityKeyIdentifierExtension.java
diff --git a/pki/base/util/src/netscape/security/x509/BasicConstraintsExtension.java b/base/util/src/netscape/security/x509/BasicConstraintsExtension.java
index 2688e961d..2688e961d 100644
--- a/pki/base/util/src/netscape/security/x509/BasicConstraintsExtension.java
+++ b/base/util/src/netscape/security/x509/BasicConstraintsExtension.java
diff --git a/pki/base/util/src/netscape/security/x509/CPSuri.java b/base/util/src/netscape/security/x509/CPSuri.java
index d0a2e0762..d0a2e0762 100644
--- a/pki/base/util/src/netscape/security/x509/CPSuri.java
+++ b/base/util/src/netscape/security/x509/CPSuri.java
diff --git a/pki/base/util/src/netscape/security/x509/CRLDistributionPoint.java b/base/util/src/netscape/security/x509/CRLDistributionPoint.java
index c7ad84389..c7ad84389 100644
--- a/pki/base/util/src/netscape/security/x509/CRLDistributionPoint.java
+++ b/base/util/src/netscape/security/x509/CRLDistributionPoint.java
diff --git a/pki/base/util/src/netscape/security/x509/CRLDistributionPointsExtension.java b/base/util/src/netscape/security/x509/CRLDistributionPointsExtension.java
index c939a7431..c939a7431 100644
--- a/pki/base/util/src/netscape/security/x509/CRLDistributionPointsExtension.java
+++ b/base/util/src/netscape/security/x509/CRLDistributionPointsExtension.java
diff --git a/pki/base/util/src/netscape/security/x509/CRLExtensions.java b/base/util/src/netscape/security/x509/CRLExtensions.java
index bdadcc12e..bdadcc12e 100755
--- a/pki/base/util/src/netscape/security/x509/CRLExtensions.java
+++ b/base/util/src/netscape/security/x509/CRLExtensions.java
diff --git a/pki/base/util/src/netscape/security/x509/CRLNumberExtension.java b/base/util/src/netscape/security/x509/CRLNumberExtension.java
index 7c89b179f..7c89b179f 100755
--- a/pki/base/util/src/netscape/security/x509/CRLNumberExtension.java
+++ b/base/util/src/netscape/security/x509/CRLNumberExtension.java
diff --git a/pki/base/util/src/netscape/security/x509/CRLReasonExtension.java b/base/util/src/netscape/security/x509/CRLReasonExtension.java
index 3c11fc70b..3c11fc70b 100644
--- a/pki/base/util/src/netscape/security/x509/CRLReasonExtension.java
+++ b/base/util/src/netscape/security/x509/CRLReasonExtension.java
diff --git a/pki/base/util/src/netscape/security/x509/CertAndKeyGen.java b/base/util/src/netscape/security/x509/CertAndKeyGen.java
index 1579d46bf..1579d46bf 100644
--- a/pki/base/util/src/netscape/security/x509/CertAndKeyGen.java
+++ b/base/util/src/netscape/security/x509/CertAndKeyGen.java
diff --git a/pki/base/util/src/netscape/security/x509/CertAttrSet.java b/base/util/src/netscape/security/x509/CertAttrSet.java
index 7e8d6db82..7e8d6db82 100755
--- a/pki/base/util/src/netscape/security/x509/CertAttrSet.java
+++ b/base/util/src/netscape/security/x509/CertAttrSet.java
diff --git a/pki/base/util/src/netscape/security/x509/CertException.java b/base/util/src/netscape/security/x509/CertException.java
index 31d9e686e..31d9e686e 100644
--- a/pki/base/util/src/netscape/security/x509/CertException.java
+++ b/base/util/src/netscape/security/x509/CertException.java
diff --git a/pki/base/util/src/netscape/security/x509/CertParseError.java b/base/util/src/netscape/security/x509/CertParseError.java
index 7328c7207..7328c7207 100644
--- a/pki/base/util/src/netscape/security/x509/CertParseError.java
+++ b/base/util/src/netscape/security/x509/CertParseError.java
diff --git a/pki/base/util/src/netscape/security/x509/CertificateAlgorithmId.java b/base/util/src/netscape/security/x509/CertificateAlgorithmId.java
index 41610844e..41610844e 100644
--- a/pki/base/util/src/netscape/security/x509/CertificateAlgorithmId.java
+++ b/base/util/src/netscape/security/x509/CertificateAlgorithmId.java
diff --git a/pki/base/util/src/netscape/security/x509/CertificateChain.java b/base/util/src/netscape/security/x509/CertificateChain.java
index b60325378..b60325378 100644
--- a/pki/base/util/src/netscape/security/x509/CertificateChain.java
+++ b/base/util/src/netscape/security/x509/CertificateChain.java
diff --git a/pki/base/util/src/netscape/security/x509/CertificateExtensions.java b/base/util/src/netscape/security/x509/CertificateExtensions.java
index b9667d8f6..b9667d8f6 100644
--- a/pki/base/util/src/netscape/security/x509/CertificateExtensions.java
+++ b/base/util/src/netscape/security/x509/CertificateExtensions.java
diff --git a/pki/base/util/src/netscape/security/x509/CertificateIssuerExtension.java b/base/util/src/netscape/security/x509/CertificateIssuerExtension.java
index 774116bcc..774116bcc 100644
--- a/pki/base/util/src/netscape/security/x509/CertificateIssuerExtension.java
+++ b/base/util/src/netscape/security/x509/CertificateIssuerExtension.java
diff --git a/pki/base/util/src/netscape/security/x509/CertificateIssuerName.java b/base/util/src/netscape/security/x509/CertificateIssuerName.java
index a2f9026c1..a2f9026c1 100644
--- a/pki/base/util/src/netscape/security/x509/CertificateIssuerName.java
+++ b/base/util/src/netscape/security/x509/CertificateIssuerName.java
diff --git a/pki/base/util/src/netscape/security/x509/CertificateIssuerUniqueIdentity.java b/base/util/src/netscape/security/x509/CertificateIssuerUniqueIdentity.java
index 351116ffb..351116ffb 100644
--- a/pki/base/util/src/netscape/security/x509/CertificateIssuerUniqueIdentity.java
+++ b/base/util/src/netscape/security/x509/CertificateIssuerUniqueIdentity.java
diff --git a/pki/base/util/src/netscape/security/x509/CertificatePoliciesExtension.java b/base/util/src/netscape/security/x509/CertificatePoliciesExtension.java
index fedc15917..fedc15917 100644
--- a/pki/base/util/src/netscape/security/x509/CertificatePoliciesExtension.java
+++ b/base/util/src/netscape/security/x509/CertificatePoliciesExtension.java
diff --git a/pki/base/util/src/netscape/security/x509/CertificatePolicyId.java b/base/util/src/netscape/security/x509/CertificatePolicyId.java
index bfc93b0bb..bfc93b0bb 100644
--- a/pki/base/util/src/netscape/security/x509/CertificatePolicyId.java
+++ b/base/util/src/netscape/security/x509/CertificatePolicyId.java
diff --git a/pki/base/util/src/netscape/security/x509/CertificatePolicyInfo.java b/base/util/src/netscape/security/x509/CertificatePolicyInfo.java
index 33e541c65..33e541c65 100644
--- a/pki/base/util/src/netscape/security/x509/CertificatePolicyInfo.java
+++ b/base/util/src/netscape/security/x509/CertificatePolicyInfo.java
diff --git a/pki/base/util/src/netscape/security/x509/CertificatePolicyMap.java b/base/util/src/netscape/security/x509/CertificatePolicyMap.java
index 75ddf3314..75ddf3314 100644
--- a/pki/base/util/src/netscape/security/x509/CertificatePolicyMap.java
+++ b/base/util/src/netscape/security/x509/CertificatePolicyMap.java
diff --git a/pki/base/util/src/netscape/security/x509/CertificatePolicySet.java b/base/util/src/netscape/security/x509/CertificatePolicySet.java
index 86d9c107f..86d9c107f 100644
--- a/pki/base/util/src/netscape/security/x509/CertificatePolicySet.java
+++ b/base/util/src/netscape/security/x509/CertificatePolicySet.java
diff --git a/pki/base/util/src/netscape/security/x509/CertificateSerialNumber.java b/base/util/src/netscape/security/x509/CertificateSerialNumber.java
index e9655178f..e9655178f 100644
--- a/pki/base/util/src/netscape/security/x509/CertificateSerialNumber.java
+++ b/base/util/src/netscape/security/x509/CertificateSerialNumber.java
diff --git a/pki/base/util/src/netscape/security/x509/CertificateSubjectName.java b/base/util/src/netscape/security/x509/CertificateSubjectName.java
index 6159638b9..6159638b9 100644
--- a/pki/base/util/src/netscape/security/x509/CertificateSubjectName.java
+++ b/base/util/src/netscape/security/x509/CertificateSubjectName.java
diff --git a/pki/base/util/src/netscape/security/x509/CertificateSubjectUniqueIdentity.java b/base/util/src/netscape/security/x509/CertificateSubjectUniqueIdentity.java
index 51687e86d..51687e86d 100644
--- a/pki/base/util/src/netscape/security/x509/CertificateSubjectUniqueIdentity.java
+++ b/base/util/src/netscape/security/x509/CertificateSubjectUniqueIdentity.java
diff --git a/pki/base/util/src/netscape/security/x509/CertificateValidity.java b/base/util/src/netscape/security/x509/CertificateValidity.java
index 0c2c841b0..0c2c841b0 100644
--- a/pki/base/util/src/netscape/security/x509/CertificateValidity.java
+++ b/base/util/src/netscape/security/x509/CertificateValidity.java
diff --git a/pki/base/util/src/netscape/security/x509/CertificateVersion.java b/base/util/src/netscape/security/x509/CertificateVersion.java
index d3659779f..d3659779f 100644
--- a/pki/base/util/src/netscape/security/x509/CertificateVersion.java
+++ b/base/util/src/netscape/security/x509/CertificateVersion.java
diff --git a/pki/base/util/src/netscape/security/x509/CertificateX509Key.java b/base/util/src/netscape/security/x509/CertificateX509Key.java
index c7003bb8e..c7003bb8e 100644
--- a/pki/base/util/src/netscape/security/x509/CertificateX509Key.java
+++ b/base/util/src/netscape/security/x509/CertificateX509Key.java
diff --git a/pki/base/util/src/netscape/security/x509/DNSName.java b/base/util/src/netscape/security/x509/DNSName.java
index 831f51cc1..831f51cc1 100644
--- a/pki/base/util/src/netscape/security/x509/DNSName.java
+++ b/base/util/src/netscape/security/x509/DNSName.java
diff --git a/pki/base/util/src/netscape/security/x509/DeltaCRLIndicatorExtension.java b/base/util/src/netscape/security/x509/DeltaCRLIndicatorExtension.java
index da870f4fd..da870f4fd 100755
--- a/pki/base/util/src/netscape/security/x509/DeltaCRLIndicatorExtension.java
+++ b/base/util/src/netscape/security/x509/DeltaCRLIndicatorExtension.java
diff --git a/pki/base/util/src/netscape/security/x509/DirStrConverter.java b/base/util/src/netscape/security/x509/DirStrConverter.java
index 776344c0a..776344c0a 100644
--- a/pki/base/util/src/netscape/security/x509/DirStrConverter.java
+++ b/base/util/src/netscape/security/x509/DirStrConverter.java
diff --git a/pki/base/util/src/netscape/security/x509/DisplayText.java b/base/util/src/netscape/security/x509/DisplayText.java
index a379617a7..a379617a7 100644
--- a/pki/base/util/src/netscape/security/x509/DisplayText.java
+++ b/base/util/src/netscape/security/x509/DisplayText.java
diff --git a/pki/base/util/src/netscape/security/x509/EDIPartyName.java b/base/util/src/netscape/security/x509/EDIPartyName.java
index 0c69242cc..0c69242cc 100644
--- a/pki/base/util/src/netscape/security/x509/EDIPartyName.java
+++ b/base/util/src/netscape/security/x509/EDIPartyName.java
diff --git a/pki/base/util/src/netscape/security/x509/Extension.java b/base/util/src/netscape/security/x509/Extension.java
index 7dc9e2890..7dc9e2890 100644
--- a/pki/base/util/src/netscape/security/x509/Extension.java
+++ b/base/util/src/netscape/security/x509/Extension.java
diff --git a/pki/base/util/src/netscape/security/x509/Extensions.java b/base/util/src/netscape/security/x509/Extensions.java
index 622367ab6..622367ab6 100644
--- a/pki/base/util/src/netscape/security/x509/Extensions.java
+++ b/base/util/src/netscape/security/x509/Extensions.java
diff --git a/pki/base/util/src/netscape/security/x509/FreshestCRLExtension.java b/base/util/src/netscape/security/x509/FreshestCRLExtension.java
index c749ae04e..c749ae04e 100644
--- a/pki/base/util/src/netscape/security/x509/FreshestCRLExtension.java
+++ b/base/util/src/netscape/security/x509/FreshestCRLExtension.java
diff --git a/pki/base/util/src/netscape/security/x509/GeneralName.java b/base/util/src/netscape/security/x509/GeneralName.java
index 5ed98d830..5ed98d830 100644
--- a/pki/base/util/src/netscape/security/x509/GeneralName.java
+++ b/base/util/src/netscape/security/x509/GeneralName.java
diff --git a/pki/base/util/src/netscape/security/x509/GeneralNameInterface.java b/base/util/src/netscape/security/x509/GeneralNameInterface.java
index 4a9673663..4a9673663 100644
--- a/pki/base/util/src/netscape/security/x509/GeneralNameInterface.java
+++ b/base/util/src/netscape/security/x509/GeneralNameInterface.java
diff --git a/pki/base/util/src/netscape/security/x509/GeneralNames.java b/base/util/src/netscape/security/x509/GeneralNames.java
index 9e06db5ac..9e06db5ac 100644
--- a/pki/base/util/src/netscape/security/x509/GeneralNames.java
+++ b/base/util/src/netscape/security/x509/GeneralNames.java
diff --git a/pki/base/util/src/netscape/security/x509/GeneralNamesException.java b/base/util/src/netscape/security/x509/GeneralNamesException.java
index 6309ed114..6309ed114 100644
--- a/pki/base/util/src/netscape/security/x509/GeneralNamesException.java
+++ b/base/util/src/netscape/security/x509/GeneralNamesException.java
diff --git a/pki/base/util/src/netscape/security/x509/GeneralSubtree.java b/base/util/src/netscape/security/x509/GeneralSubtree.java
index 635427e0b..635427e0b 100644
--- a/pki/base/util/src/netscape/security/x509/GeneralSubtree.java
+++ b/base/util/src/netscape/security/x509/GeneralSubtree.java
diff --git a/pki/base/util/src/netscape/security/x509/GeneralSubtrees.java b/base/util/src/netscape/security/x509/GeneralSubtrees.java
index 37097ca71..37097ca71 100644
--- a/pki/base/util/src/netscape/security/x509/GeneralSubtrees.java
+++ b/base/util/src/netscape/security/x509/GeneralSubtrees.java
diff --git a/pki/base/util/src/netscape/security/x509/GenericValueConverter.java b/base/util/src/netscape/security/x509/GenericValueConverter.java
index 73bc1979c..73bc1979c 100644
--- a/pki/base/util/src/netscape/security/x509/GenericValueConverter.java
+++ b/base/util/src/netscape/security/x509/GenericValueConverter.java
diff --git a/pki/base/util/src/netscape/security/x509/HoldInstructionExtension.java b/base/util/src/netscape/security/x509/HoldInstructionExtension.java
index b42bb6ac9..b42bb6ac9 100644
--- a/pki/base/util/src/netscape/security/x509/HoldInstructionExtension.java
+++ b/base/util/src/netscape/security/x509/HoldInstructionExtension.java
diff --git a/pki/base/util/src/netscape/security/x509/IA5StringConverter.java b/base/util/src/netscape/security/x509/IA5StringConverter.java
index eced75a58..eced75a58 100644
--- a/pki/base/util/src/netscape/security/x509/IA5StringConverter.java
+++ b/base/util/src/netscape/security/x509/IA5StringConverter.java
diff --git a/pki/base/util/src/netscape/security/x509/IPAddressName.java b/base/util/src/netscape/security/x509/IPAddressName.java
index 75b5bc564..75b5bc564 100644
--- a/pki/base/util/src/netscape/security/x509/IPAddressName.java
+++ b/base/util/src/netscape/security/x509/IPAddressName.java
diff --git a/pki/base/util/src/netscape/security/x509/InvalidIPAddressException.java b/base/util/src/netscape/security/x509/InvalidIPAddressException.java
index f544df200..f544df200 100644
--- a/pki/base/util/src/netscape/security/x509/InvalidIPAddressException.java
+++ b/base/util/src/netscape/security/x509/InvalidIPAddressException.java
diff --git a/pki/base/util/src/netscape/security/x509/InvalidityDateExtension.java b/base/util/src/netscape/security/x509/InvalidityDateExtension.java
index 44c76275f..44c76275f 100755
--- a/pki/base/util/src/netscape/security/x509/InvalidityDateExtension.java
+++ b/base/util/src/netscape/security/x509/InvalidityDateExtension.java
diff --git a/pki/base/util/src/netscape/security/x509/IssuerAlternativeNameExtension.java b/base/util/src/netscape/security/x509/IssuerAlternativeNameExtension.java
index df0289f9e..df0289f9e 100644
--- a/pki/base/util/src/netscape/security/x509/IssuerAlternativeNameExtension.java
+++ b/base/util/src/netscape/security/x509/IssuerAlternativeNameExtension.java
diff --git a/pki/base/util/src/netscape/security/x509/IssuingDistributionPoint.java b/base/util/src/netscape/security/x509/IssuingDistributionPoint.java
index 0f0747f84..0f0747f84 100644
--- a/pki/base/util/src/netscape/security/x509/IssuingDistributionPoint.java
+++ b/base/util/src/netscape/security/x509/IssuingDistributionPoint.java
diff --git a/pki/base/util/src/netscape/security/x509/IssuingDistributionPointExtension.java b/base/util/src/netscape/security/x509/IssuingDistributionPointExtension.java
index d5f5100bf..d5f5100bf 100644
--- a/pki/base/util/src/netscape/security/x509/IssuingDistributionPointExtension.java
+++ b/base/util/src/netscape/security/x509/IssuingDistributionPointExtension.java
diff --git a/pki/base/util/src/netscape/security/x509/KeyIdentifier.java b/base/util/src/netscape/security/x509/KeyIdentifier.java
index 631f6fd65..631f6fd65 100644
--- a/pki/base/util/src/netscape/security/x509/KeyIdentifier.java
+++ b/base/util/src/netscape/security/x509/KeyIdentifier.java
diff --git a/pki/base/util/src/netscape/security/x509/KeyUsageExtension.java b/base/util/src/netscape/security/x509/KeyUsageExtension.java
index 56084dbcf..56084dbcf 100644
--- a/pki/base/util/src/netscape/security/x509/KeyUsageExtension.java
+++ b/base/util/src/netscape/security/x509/KeyUsageExtension.java
diff --git a/pki/base/util/src/netscape/security/x509/LdapDNStrConverter.java b/base/util/src/netscape/security/x509/LdapDNStrConverter.java
index a8cb87813..a8cb87813 100644
--- a/pki/base/util/src/netscape/security/x509/LdapDNStrConverter.java
+++ b/base/util/src/netscape/security/x509/LdapDNStrConverter.java
diff --git a/pki/base/util/src/netscape/security/x509/LdapV3DNStrConverter.java b/base/util/src/netscape/security/x509/LdapV3DNStrConverter.java
index 1245cc6bd..1245cc6bd 100644
--- a/pki/base/util/src/netscape/security/x509/LdapV3DNStrConverter.java
+++ b/base/util/src/netscape/security/x509/LdapV3DNStrConverter.java
diff --git a/pki/base/util/src/netscape/security/x509/NSCCommentExtension.java b/base/util/src/netscape/security/x509/NSCCommentExtension.java
index 0912d5b0c..0912d5b0c 100644
--- a/pki/base/util/src/netscape/security/x509/NSCCommentExtension.java
+++ b/base/util/src/netscape/security/x509/NSCCommentExtension.java
diff --git a/pki/base/util/src/netscape/security/x509/NameConstraintsExtension.java b/base/util/src/netscape/security/x509/NameConstraintsExtension.java
index 948d0d8c9..948d0d8c9 100644
--- a/pki/base/util/src/netscape/security/x509/NameConstraintsExtension.java
+++ b/base/util/src/netscape/security/x509/NameConstraintsExtension.java
diff --git a/pki/base/util/src/netscape/security/x509/NoticeReference.java b/base/util/src/netscape/security/x509/NoticeReference.java
index 150b34f40..150b34f40 100644
--- a/pki/base/util/src/netscape/security/x509/NoticeReference.java
+++ b/base/util/src/netscape/security/x509/NoticeReference.java
diff --git a/pki/base/util/src/netscape/security/x509/OIDMap.java b/base/util/src/netscape/security/x509/OIDMap.java
index 9c732d938..9c732d938 100644
--- a/pki/base/util/src/netscape/security/x509/OIDMap.java
+++ b/base/util/src/netscape/security/x509/OIDMap.java
diff --git a/pki/base/util/src/netscape/security/x509/OIDName.java b/base/util/src/netscape/security/x509/OIDName.java
index e5c1b7ac3..e5c1b7ac3 100644
--- a/pki/base/util/src/netscape/security/x509/OIDName.java
+++ b/base/util/src/netscape/security/x509/OIDName.java
diff --git a/pki/base/util/src/netscape/security/x509/OtherName.java b/base/util/src/netscape/security/x509/OtherName.java
index 38d3a0af3..38d3a0af3 100644
--- a/pki/base/util/src/netscape/security/x509/OtherName.java
+++ b/base/util/src/netscape/security/x509/OtherName.java
diff --git a/pki/base/util/src/netscape/security/x509/PKIXExtensions.java b/base/util/src/netscape/security/x509/PKIXExtensions.java
index 9946a5c57..9946a5c57 100644
--- a/pki/base/util/src/netscape/security/x509/PKIXExtensions.java
+++ b/base/util/src/netscape/security/x509/PKIXExtensions.java
diff --git a/pki/base/util/src/netscape/security/x509/PolicyConstraint.java b/base/util/src/netscape/security/x509/PolicyConstraint.java
index 22f9cebed..22f9cebed 100644
--- a/pki/base/util/src/netscape/security/x509/PolicyConstraint.java
+++ b/base/util/src/netscape/security/x509/PolicyConstraint.java
diff --git a/pki/base/util/src/netscape/security/x509/PolicyConstraintsExtension.java b/base/util/src/netscape/security/x509/PolicyConstraintsExtension.java
index 7d98b21ba..7d98b21ba 100644
--- a/pki/base/util/src/netscape/security/x509/PolicyConstraintsExtension.java
+++ b/base/util/src/netscape/security/x509/PolicyConstraintsExtension.java
diff --git a/pki/base/util/src/netscape/security/x509/PolicyMappingsExtension.java b/base/util/src/netscape/security/x509/PolicyMappingsExtension.java
index 9bdfb611b..9bdfb611b 100644
--- a/pki/base/util/src/netscape/security/x509/PolicyMappingsExtension.java
+++ b/base/util/src/netscape/security/x509/PolicyMappingsExtension.java
diff --git a/pki/base/util/src/netscape/security/x509/PolicyQualifierInfo.java b/base/util/src/netscape/security/x509/PolicyQualifierInfo.java
index 56d3e32c0..56d3e32c0 100644
--- a/pki/base/util/src/netscape/security/x509/PolicyQualifierInfo.java
+++ b/base/util/src/netscape/security/x509/PolicyQualifierInfo.java
diff --git a/pki/base/util/src/netscape/security/x509/PolicyQualifiers.java b/base/util/src/netscape/security/x509/PolicyQualifiers.java
index ee756f50a..ee756f50a 100644
--- a/pki/base/util/src/netscape/security/x509/PolicyQualifiers.java
+++ b/base/util/src/netscape/security/x509/PolicyQualifiers.java
diff --git a/pki/base/util/src/netscape/security/x509/PrintableConverter.java b/base/util/src/netscape/security/x509/PrintableConverter.java
index d63696d8f..d63696d8f 100644
--- a/pki/base/util/src/netscape/security/x509/PrintableConverter.java
+++ b/base/util/src/netscape/security/x509/PrintableConverter.java
diff --git a/pki/base/util/src/netscape/security/x509/PrivateKeyUsageExtension.java b/base/util/src/netscape/security/x509/PrivateKeyUsageExtension.java
index e3ecdb33d..e3ecdb33d 100644
--- a/pki/base/util/src/netscape/security/x509/PrivateKeyUsageExtension.java
+++ b/base/util/src/netscape/security/x509/PrivateKeyUsageExtension.java
diff --git a/pki/base/util/src/netscape/security/x509/Qualifier.java b/base/util/src/netscape/security/x509/Qualifier.java
index 7c0c7edfe..7c0c7edfe 100644
--- a/pki/base/util/src/netscape/security/x509/Qualifier.java
+++ b/base/util/src/netscape/security/x509/Qualifier.java
diff --git a/pki/base/util/src/netscape/security/x509/RDN.java b/base/util/src/netscape/security/x509/RDN.java
index c5e8765a0..c5e8765a0 100644
--- a/pki/base/util/src/netscape/security/x509/RDN.java
+++ b/base/util/src/netscape/security/x509/RDN.java
diff --git a/pki/base/util/src/netscape/security/x509/RFC1779StrConverter.java b/base/util/src/netscape/security/x509/RFC1779StrConverter.java
index 6527d0fff..6527d0fff 100644
--- a/pki/base/util/src/netscape/security/x509/RFC1779StrConverter.java
+++ b/base/util/src/netscape/security/x509/RFC1779StrConverter.java
diff --git a/pki/base/util/src/netscape/security/x509/RFC822Name.java b/base/util/src/netscape/security/x509/RFC822Name.java
index 257b5c51d..257b5c51d 100644
--- a/pki/base/util/src/netscape/security/x509/RFC822Name.java
+++ b/base/util/src/netscape/security/x509/RFC822Name.java
diff --git a/pki/base/util/src/netscape/security/x509/ReasonFlags.java b/base/util/src/netscape/security/x509/ReasonFlags.java
index e43c7022c..e43c7022c 100755
--- a/pki/base/util/src/netscape/security/x509/ReasonFlags.java
+++ b/base/util/src/netscape/security/x509/ReasonFlags.java
diff --git a/pki/base/util/src/netscape/security/x509/RevocationReason.java b/base/util/src/netscape/security/x509/RevocationReason.java
index 419eb1772..419eb1772 100644
--- a/pki/base/util/src/netscape/security/x509/RevocationReason.java
+++ b/base/util/src/netscape/security/x509/RevocationReason.java
diff --git a/pki/base/util/src/netscape/security/x509/RevokedCertImpl.java b/base/util/src/netscape/security/x509/RevokedCertImpl.java
index 345694fb1..345694fb1 100755
--- a/pki/base/util/src/netscape/security/x509/RevokedCertImpl.java
+++ b/base/util/src/netscape/security/x509/RevokedCertImpl.java
diff --git a/pki/base/util/src/netscape/security/x509/RevokedCertificate.java b/base/util/src/netscape/security/x509/RevokedCertificate.java
index 2087d064a..2087d064a 100644
--- a/pki/base/util/src/netscape/security/x509/RevokedCertificate.java
+++ b/base/util/src/netscape/security/x509/RevokedCertificate.java
diff --git a/pki/base/util/src/netscape/security/x509/SerialNumber.java b/base/util/src/netscape/security/x509/SerialNumber.java
index a2d7109c0..a2d7109c0 100644
--- a/pki/base/util/src/netscape/security/x509/SerialNumber.java
+++ b/base/util/src/netscape/security/x509/SerialNumber.java
diff --git a/pki/base/util/src/netscape/security/x509/SubjectAlternativeNameExtension.java b/base/util/src/netscape/security/x509/SubjectAlternativeNameExtension.java
index c30ae1576..c30ae1576 100644
--- a/pki/base/util/src/netscape/security/x509/SubjectAlternativeNameExtension.java
+++ b/base/util/src/netscape/security/x509/SubjectAlternativeNameExtension.java
diff --git a/pki/base/util/src/netscape/security/x509/SubjectDirAttributesExtension.java b/base/util/src/netscape/security/x509/SubjectDirAttributesExtension.java
index b249ef600..b249ef600 100644
--- a/pki/base/util/src/netscape/security/x509/SubjectDirAttributesExtension.java
+++ b/base/util/src/netscape/security/x509/SubjectDirAttributesExtension.java
diff --git a/pki/base/util/src/netscape/security/x509/SubjectKeyIdentifierExtension.java b/base/util/src/netscape/security/x509/SubjectKeyIdentifierExtension.java
index ea0ebae82..ea0ebae82 100644
--- a/pki/base/util/src/netscape/security/x509/SubjectKeyIdentifierExtension.java
+++ b/base/util/src/netscape/security/x509/SubjectKeyIdentifierExtension.java
diff --git a/pki/base/util/src/netscape/security/x509/URIName.java b/base/util/src/netscape/security/x509/URIName.java
index cc321a3b3..cc321a3b3 100644
--- a/pki/base/util/src/netscape/security/x509/URIName.java
+++ b/base/util/src/netscape/security/x509/URIName.java
diff --git a/pki/base/util/src/netscape/security/x509/UniqueIdentity.java b/base/util/src/netscape/security/x509/UniqueIdentity.java
index 5113efeaf..5113efeaf 100644
--- a/pki/base/util/src/netscape/security/x509/UniqueIdentity.java
+++ b/base/util/src/netscape/security/x509/UniqueIdentity.java
diff --git a/pki/base/util/src/netscape/security/x509/UserNotice.java b/base/util/src/netscape/security/x509/UserNotice.java
index dc2e1d535..dc2e1d535 100644
--- a/pki/base/util/src/netscape/security/x509/UserNotice.java
+++ b/base/util/src/netscape/security/x509/UserNotice.java
diff --git a/pki/base/util/src/netscape/security/x509/X500Name.java b/base/util/src/netscape/security/x509/X500Name.java
index d44003baa..d44003baa 100644
--- a/pki/base/util/src/netscape/security/x509/X500Name.java
+++ b/base/util/src/netscape/security/x509/X500Name.java
diff --git a/pki/base/util/src/netscape/security/x509/X500NameAttrMap.java b/base/util/src/netscape/security/x509/X500NameAttrMap.java
index 1c87c79b8..1c87c79b8 100644
--- a/pki/base/util/src/netscape/security/x509/X500NameAttrMap.java
+++ b/base/util/src/netscape/security/x509/X500NameAttrMap.java
diff --git a/pki/base/util/src/netscape/security/x509/X500Signer.java b/base/util/src/netscape/security/x509/X500Signer.java
index 0b8cf87a4..0b8cf87a4 100644
--- a/pki/base/util/src/netscape/security/x509/X500Signer.java
+++ b/base/util/src/netscape/security/x509/X500Signer.java
diff --git a/pki/base/util/src/netscape/security/x509/X509AttributeName.java b/base/util/src/netscape/security/x509/X509AttributeName.java
index 2f6c46cb1..2f6c46cb1 100644
--- a/pki/base/util/src/netscape/security/x509/X509AttributeName.java
+++ b/base/util/src/netscape/security/x509/X509AttributeName.java
diff --git a/pki/base/util/src/netscape/security/x509/X509CRLImpl.java b/base/util/src/netscape/security/x509/X509CRLImpl.java
index 8c69b6aa0..8c69b6aa0 100755
--- a/pki/base/util/src/netscape/security/x509/X509CRLImpl.java
+++ b/base/util/src/netscape/security/x509/X509CRLImpl.java
diff --git a/pki/base/util/src/netscape/security/x509/X509Cert.java b/base/util/src/netscape/security/x509/X509Cert.java
index 9ab7ba754..9ab7ba754 100644
--- a/pki/base/util/src/netscape/security/x509/X509Cert.java
+++ b/base/util/src/netscape/security/x509/X509Cert.java
diff --git a/pki/base/util/src/netscape/security/x509/X509CertImpl.java b/base/util/src/netscape/security/x509/X509CertImpl.java
index 9c62b36a6..9c62b36a6 100755
--- a/pki/base/util/src/netscape/security/x509/X509CertImpl.java
+++ b/base/util/src/netscape/security/x509/X509CertImpl.java
diff --git a/pki/base/util/src/netscape/security/x509/X509CertInfo.java b/base/util/src/netscape/security/x509/X509CertInfo.java
index 4777cd958..4777cd958 100644
--- a/pki/base/util/src/netscape/security/x509/X509CertInfo.java
+++ b/base/util/src/netscape/security/x509/X509CertInfo.java
diff --git a/pki/base/util/src/netscape/security/x509/X509ExtensionException.java b/base/util/src/netscape/security/x509/X509ExtensionException.java
index c7174aed8..c7174aed8 100644
--- a/pki/base/util/src/netscape/security/x509/X509ExtensionException.java
+++ b/base/util/src/netscape/security/x509/X509ExtensionException.java
diff --git a/pki/base/util/src/netscape/security/x509/X509Key.java b/base/util/src/netscape/security/x509/X509Key.java
index a8253c0d8..a8253c0d8 100644
--- a/pki/base/util/src/netscape/security/x509/X509Key.java
+++ b/base/util/src/netscape/security/x509/X509Key.java
diff --git a/pki/base/util/test/CMakeLists.txt b/base/util/test/CMakeLists.txt
index 592f3dbbb..592f3dbbb 100644
--- a/pki/base/util/test/CMakeLists.txt
+++ b/base/util/test/CMakeLists.txt
diff --git a/pki/base/util/test/com/netscape/security/extensions/GenericASN1ExtensionTest.java b/base/util/test/com/netscape/security/extensions/GenericASN1ExtensionTest.java
index 74d082f09..74d082f09 100644
--- a/pki/base/util/test/com/netscape/security/extensions/GenericASN1ExtensionTest.java
+++ b/base/util/test/com/netscape/security/extensions/GenericASN1ExtensionTest.java
diff --git a/pki/base/util/test/com/netscape/security/util/BMPStringTest.java b/base/util/test/com/netscape/security/util/BMPStringTest.java
index ffe13b238..ffe13b238 100644
--- a/pki/base/util/test/com/netscape/security/util/BMPStringTest.java
+++ b/base/util/test/com/netscape/security/util/BMPStringTest.java
diff --git a/pki/base/util/test/com/netscape/security/util/IA5StringTest.java b/base/util/test/com/netscape/security/util/IA5StringTest.java
index dd0af242c..dd0af242c 100644
--- a/pki/base/util/test/com/netscape/security/util/IA5StringTest.java
+++ b/base/util/test/com/netscape/security/util/IA5StringTest.java
diff --git a/pki/base/util/test/com/netscape/security/util/JSSUtil.java b/base/util/test/com/netscape/security/util/JSSUtil.java
index bbbabbf14..bbbabbf14 100644
--- a/pki/base/util/test/com/netscape/security/util/JSSUtil.java
+++ b/base/util/test/com/netscape/security/util/JSSUtil.java
diff --git a/pki/base/util/test/com/netscape/security/util/PrintableStringTest.java b/base/util/test/com/netscape/security/util/PrintableStringTest.java
index 5808a2650..5808a2650 100644
--- a/pki/base/util/test/com/netscape/security/util/PrintableStringTest.java
+++ b/base/util/test/com/netscape/security/util/PrintableStringTest.java
diff --git a/pki/base/util/test/com/netscape/security/util/StringTestUtil.java b/base/util/test/com/netscape/security/util/StringTestUtil.java
index 16810581c..16810581c 100644
--- a/pki/base/util/test/com/netscape/security/util/StringTestUtil.java
+++ b/base/util/test/com/netscape/security/util/StringTestUtil.java
diff --git a/pki/base/util/test/com/netscape/security/util/TeletexStringTest.java b/base/util/test/com/netscape/security/util/TeletexStringTest.java
index 69f46c220..69f46c220 100644
--- a/pki/base/util/test/com/netscape/security/util/TeletexStringTest.java
+++ b/base/util/test/com/netscape/security/util/TeletexStringTest.java
diff --git a/pki/base/util/test/com/netscape/security/util/UTF8StringTest.java b/base/util/test/com/netscape/security/util/UTF8StringTest.java
index 6bffb28b6..6bffb28b6 100644
--- a/pki/base/util/test/com/netscape/security/util/UTF8StringTest.java
+++ b/base/util/test/com/netscape/security/util/UTF8StringTest.java
diff --git a/pki/base/util/test/com/netscape/security/util/UniversalStringTest.java b/base/util/test/com/netscape/security/util/UniversalStringTest.java
index 5f09f1f8e..5f09f1f8e 100644
--- a/pki/base/util/test/com/netscape/security/util/UniversalStringTest.java
+++ b/base/util/test/com/netscape/security/util/UniversalStringTest.java
diff --git a/pki/base/util/test/com/netscape/security/x509/ConverterTestUtil.java b/base/util/test/com/netscape/security/x509/ConverterTestUtil.java
index 748c1b284..748c1b284 100644
--- a/pki/base/util/test/com/netscape/security/x509/ConverterTestUtil.java
+++ b/base/util/test/com/netscape/security/x509/ConverterTestUtil.java
diff --git a/pki/base/util/test/com/netscape/security/x509/DirStrConverterTest.java b/base/util/test/com/netscape/security/x509/DirStrConverterTest.java
index 0549dec9c..0549dec9c 100644
--- a/pki/base/util/test/com/netscape/security/x509/DirStrConverterTest.java
+++ b/base/util/test/com/netscape/security/x509/DirStrConverterTest.java
diff --git a/pki/base/util/test/com/netscape/security/x509/GenericValueConverterTest.java b/base/util/test/com/netscape/security/x509/GenericValueConverterTest.java
index 46ea86cc7..46ea86cc7 100644
--- a/pki/base/util/test/com/netscape/security/x509/GenericValueConverterTest.java
+++ b/base/util/test/com/netscape/security/x509/GenericValueConverterTest.java
diff --git a/pki/base/util/test/com/netscape/security/x509/IA5StringConverterTest.java b/base/util/test/com/netscape/security/x509/IA5StringConverterTest.java
index ba99218ad..ba99218ad 100644
--- a/pki/base/util/test/com/netscape/security/x509/IA5StringConverterTest.java
+++ b/base/util/test/com/netscape/security/x509/IA5StringConverterTest.java
diff --git a/pki/base/util/test/com/netscape/security/x509/PrintableConverterTest.java b/base/util/test/com/netscape/security/x509/PrintableConverterTest.java
index a7acc9c90..a7acc9c90 100644
--- a/pki/base/util/test/com/netscape/security/x509/PrintableConverterTest.java
+++ b/base/util/test/com/netscape/security/x509/PrintableConverterTest.java
diff --git a/pki/cmake/Modules/CMakeDetermineJavaCompiler.cmake b/cmake/Modules/CMakeDetermineJavaCompiler.cmake
index a08cd42ca..a08cd42ca 100644
--- a/pki/cmake/Modules/CMakeDetermineJavaCompiler.cmake
+++ b/cmake/Modules/CMakeDetermineJavaCompiler.cmake
diff --git a/pki/cmake/Modules/CMakeJavaCompiler.cmake.in b/cmake/Modules/CMakeJavaCompiler.cmake.in
index 46cd0f357..46cd0f357 100644
--- a/pki/cmake/Modules/CMakeJavaCompiler.cmake.in
+++ b/cmake/Modules/CMakeJavaCompiler.cmake.in
diff --git a/pki/cmake/Modules/CMakeJavaInformation.cmake b/cmake/Modules/CMakeJavaInformation.cmake
index ed7b6d59d..ed7b6d59d 100644
--- a/pki/cmake/Modules/CMakeJavaInformation.cmake
+++ b/cmake/Modules/CMakeJavaInformation.cmake
diff --git a/pki/cmake/Modules/CMakeTestJavaCompiler.cmake b/cmake/Modules/CMakeTestJavaCompiler.cmake
index e524bc251..e524bc251 100644
--- a/pki/cmake/Modules/CMakeTestJavaCompiler.cmake
+++ b/cmake/Modules/CMakeTestJavaCompiler.cmake
diff --git a/pki/cmake/Modules/COPYING-CMAKE-SCRIPTS b/cmake/Modules/COPYING-CMAKE-SCRIPTS
index 53b6b71eb..53b6b71eb 100644
--- a/pki/cmake/Modules/COPYING-CMAKE-SCRIPTS
+++ b/cmake/Modules/COPYING-CMAKE-SCRIPTS
diff --git a/pki/cmake/Modules/DefineCMakeDefaults.cmake b/cmake/Modules/DefineCMakeDefaults.cmake
index 72893c3c9..72893c3c9 100644
--- a/pki/cmake/Modules/DefineCMakeDefaults.cmake
+++ b/cmake/Modules/DefineCMakeDefaults.cmake
diff --git a/pki/cmake/Modules/DefineCompilerFlags.cmake b/cmake/Modules/DefineCompilerFlags.cmake
index 04ed1bf4f..04ed1bf4f 100644
--- a/pki/cmake/Modules/DefineCompilerFlags.cmake
+++ b/cmake/Modules/DefineCompilerFlags.cmake
diff --git a/pki/cmake/Modules/DefineInstallationPaths.cmake b/cmake/Modules/DefineInstallationPaths.cmake
index fa4a870b7..fa4a870b7 100644
--- a/pki/cmake/Modules/DefineInstallationPaths.cmake
+++ b/cmake/Modules/DefineInstallationPaths.cmake
diff --git a/pki/cmake/Modules/DefinePlatformDefaults.cmake b/cmake/Modules/DefinePlatformDefaults.cmake
index 46c3185a6..46c3185a6 100644
--- a/pki/cmake/Modules/DefinePlatformDefaults.cmake
+++ b/cmake/Modules/DefinePlatformDefaults.cmake
diff --git a/pki/cmake/Modules/FindAPR.cmake b/cmake/Modules/FindAPR.cmake
index c61faa691..c61faa691 100644
--- a/pki/cmake/Modules/FindAPR.cmake
+++ b/cmake/Modules/FindAPR.cmake
diff --git a/pki/cmake/Modules/FindJNI.cmake b/cmake/Modules/FindJNI.cmake
index a7da5b138..a7da5b138 100644
--- a/pki/cmake/Modules/FindJNI.cmake
+++ b/cmake/Modules/FindJNI.cmake
diff --git a/pki/cmake/Modules/FindJava.cmake b/cmake/Modules/FindJava.cmake
index f2bed5807..f2bed5807 100644
--- a/pki/cmake/Modules/FindJava.cmake
+++ b/cmake/Modules/FindJava.cmake
diff --git a/pki/cmake/Modules/FindLdap.cmake b/cmake/Modules/FindLdap.cmake
index be4693bd7..be4693bd7 100644
--- a/pki/cmake/Modules/FindLdap.cmake
+++ b/cmake/Modules/FindLdap.cmake
diff --git a/pki/cmake/Modules/FindMozLDAP.cmake b/cmake/Modules/FindMozLDAP.cmake
index 634241ce1..634241ce1 100644
--- a/pki/cmake/Modules/FindMozLDAP.cmake
+++ b/cmake/Modules/FindMozLDAP.cmake
diff --git a/pki/cmake/Modules/FindNSPR.cmake b/cmake/Modules/FindNSPR.cmake
index 48f929516..48f929516 100644
--- a/pki/cmake/Modules/FindNSPR.cmake
+++ b/cmake/Modules/FindNSPR.cmake
diff --git a/pki/cmake/Modules/FindNSS.cmake b/cmake/Modules/FindNSS.cmake
index 9b89c08a2..9b89c08a2 100644
--- a/pki/cmake/Modules/FindNSS.cmake
+++ b/cmake/Modules/FindNSS.cmake
diff --git a/pki/cmake/Modules/FindOpenSSL.cmake b/cmake/Modules/FindOpenSSL.cmake
index 05126f1d2..05126f1d2 100644
--- a/pki/cmake/Modules/FindOpenSSL.cmake
+++ b/cmake/Modules/FindOpenSSL.cmake
diff --git a/pki/cmake/Modules/FindSvrcore.cmake b/cmake/Modules/FindSvrcore.cmake
index cfb073301..cfb073301 100644
--- a/pki/cmake/Modules/FindSvrcore.cmake
+++ b/cmake/Modules/FindSvrcore.cmake
diff --git a/pki/cmake/Modules/FindZLIB.cmake b/cmake/Modules/FindZLIB.cmake
index 197e6c757..197e6c757 100644
--- a/pki/cmake/Modules/FindZLIB.cmake
+++ b/cmake/Modules/FindZLIB.cmake
diff --git a/pki/cmake/Modules/JUnit.cmake b/cmake/Modules/JUnit.cmake
index 84faa6874..84faa6874 100644
--- a/pki/cmake/Modules/JUnit.cmake
+++ b/cmake/Modules/JUnit.cmake
diff --git a/pki/cmake/Modules/MacroCheckCCompilerFlagSSP.cmake b/cmake/Modules/MacroCheckCCompilerFlagSSP.cmake
index 6ac935dae..6ac935dae 100644
--- a/pki/cmake/Modules/MacroCheckCCompilerFlagSSP.cmake
+++ b/cmake/Modules/MacroCheckCCompilerFlagSSP.cmake
diff --git a/pki/cmake/Modules/MacroCopyFile.cmake b/cmake/Modules/MacroCopyFile.cmake
index cee1cae37..cee1cae37 100644
--- a/pki/cmake/Modules/MacroCopyFile.cmake
+++ b/cmake/Modules/MacroCopyFile.cmake
diff --git a/pki/cmake/Modules/MacroEnsureOutOfSourceBuild.cmake b/cmake/Modules/MacroEnsureOutOfSourceBuild.cmake
index a2e948099..a2e948099 100644
--- a/pki/cmake/Modules/MacroEnsureOutOfSourceBuild.cmake
+++ b/cmake/Modules/MacroEnsureOutOfSourceBuild.cmake
diff --git a/pki/cmake/Modules/UseJava.cmake b/cmake/Modules/UseJava.cmake
index b649ed102..b649ed102 100644
--- a/pki/cmake/Modules/UseJava.cmake
+++ b/cmake/Modules/UseJava.cmake
diff --git a/pki/cmake/Modules/UseJavaClassFilelist.cmake b/cmake/Modules/UseJavaClassFilelist.cmake
index e07dda2f4..e07dda2f4 100644
--- a/pki/cmake/Modules/UseJavaClassFilelist.cmake
+++ b/cmake/Modules/UseJavaClassFilelist.cmake
diff --git a/pki/cmake/Modules/UseJavaSymlinks.cmake b/cmake/Modules/UseJavaSymlinks.cmake
index dbc4694b2..dbc4694b2 100644
--- a/pki/cmake/Modules/UseJavaSymlinks.cmake
+++ b/cmake/Modules/UseJavaSymlinks.cmake
diff --git a/pki/cmake_uninstall.cmake.in b/cmake_uninstall.cmake.in
index 7e36ed410..7e36ed410 100644
--- a/pki/cmake_uninstall.cmake.in
+++ b/cmake_uninstall.cmake.in
diff --git a/pki/config.h.cmake b/config.h.cmake
index 63ceff235..63ceff235 100644
--- a/pki/config.h.cmake
+++ b/config.h.cmake
diff --git a/pki/dogtag/CMakeLists.txt b/dogtag/CMakeLists.txt
index d83f91591..d83f91591 100644
--- a/pki/dogtag/CMakeLists.txt
+++ b/dogtag/CMakeLists.txt
diff --git a/pki/dogtag/ca-ui/CMakeLists.txt b/dogtag/ca-ui/CMakeLists.txt
index 68c1c2061..68c1c2061 100644
--- a/pki/dogtag/ca-ui/CMakeLists.txt
+++ b/dogtag/ca-ui/CMakeLists.txt
diff --git a/pki/dogtag/ca-ui/LICENSE b/dogtag/ca-ui/LICENSE
index e281f4362..e281f4362 100644
--- a/pki/dogtag/ca-ui/LICENSE
+++ b/dogtag/ca-ui/LICENSE
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/404.html b/dogtag/ca-ui/shared/webapps/ca/404.html
index bd04559aa..bd04559aa 100755
--- a/pki/dogtag/ca-ui/shared/webapps/ca/404.html
+++ b/dogtag/ca-ui/shared/webapps/ca/404.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/500.html b/dogtag/ca-ui/shared/webapps/ca/500.html
index a775341e5..a775341e5 100755
--- a/pki/dogtag/ca-ui/shared/webapps/ca/500.html
+++ b/dogtag/ca-ui/shared/webapps/ca/500.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/GenUnexpectedError.template b/dogtag/ca-ui/shared/webapps/ca/GenUnexpectedError.template
index 1e51f85e9..1e51f85e9 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/GenUnexpectedError.template
+++ b/dogtag/ca-ui/shared/webapps/ca/GenUnexpectedError.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/admin/GenUnexpectedError.template b/dogtag/ca-ui/shared/webapps/ca/admin/GenUnexpectedError.template
index 7a47f2c2b..7a47f2c2b 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/admin/GenUnexpectedError.template
+++ b/dogtag/ca-ui/shared/webapps/ca/admin/GenUnexpectedError.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/admin/ca/EnrollSuccess.template b/dogtag/ca-ui/shared/webapps/ca/admin/ca/EnrollSuccess.template
index d0e5af3dd..d0e5af3dd 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/admin/ca/EnrollSuccess.template
+++ b/dogtag/ca-ui/shared/webapps/ca/admin/ca/EnrollSuccess.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/admin/ca/ImportAdminCert.template b/dogtag/ca-ui/shared/webapps/ca/admin/ca/ImportAdminCert.template
index e52764ec6..e52764ec6 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/admin/ca/ImportAdminCert.template
+++ b/dogtag/ca-ui/shared/webapps/ca/admin/ca/ImportAdminCert.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/admin/ca/ImportCert.template b/dogtag/ca-ui/shared/webapps/ca/admin/ca/ImportCert.template
index 8df83eca9..8df83eca9 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/admin/ca/ImportCert.template
+++ b/dogtag/ca-ui/shared/webapps/ca/admin/ca/ImportCert.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/admin/ca/adminEnroll.html b/dogtag/ca-ui/shared/webapps/ca/admin/ca/adminEnroll.html
index e4be5c746..e4be5c746 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/admin/ca/adminEnroll.html
+++ b/dogtag/ca-ui/shared/webapps/ca/admin/ca/adminEnroll.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/admin/ca/securitydomainlogin.template b/dogtag/ca-ui/shared/webapps/ca/admin/ca/securitydomainlogin.template
index 7d61a8602..7d61a8602 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/admin/ca/securitydomainlogin.template
+++ b/dogtag/ca-ui/shared/webapps/ca/admin/ca/securitydomainlogin.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/admin/ca/sendCookie.template b/dogtag/ca-ui/shared/webapps/ca/admin/ca/sendCookie.template
index 8f2e62e4d..8f2e62e4d 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/admin/ca/sendCookie.template
+++ b/dogtag/ca-ui/shared/webapps/ca/admin/ca/sendCookie.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/admin/cms-funcs.js b/dogtag/ca-ui/shared/webapps/ca/admin/cms-funcs.js
index c8ffd51c7..c8ffd51c7 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/admin/cms-funcs.js
+++ b/dogtag/ca-ui/shared/webapps/ca/admin/cms-funcs.js
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/admin/graphics/gray90.gif b/dogtag/ca-ui/shared/webapps/ca/admin/graphics/gray90.gif
index c6f811102..c6f811102 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/admin/graphics/gray90.gif
+++ b/dogtag/ca-ui/shared/webapps/ca/admin/graphics/gray90.gif
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/admin/graphics/hr.gif b/dogtag/ca-ui/shared/webapps/ca/admin/graphics/hr.gif
index 14f8acf92..14f8acf92 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/admin/graphics/hr.gif
+++ b/dogtag/ca-ui/shared/webapps/ca/admin/graphics/hr.gif
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/admin/graphics/spacer.gif b/dogtag/ca-ui/shared/webapps/ca/admin/graphics/spacer.gif
index 13acffe53..13acffe53 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/admin/graphics/spacer.gif
+++ b/dogtag/ca-ui/shared/webapps/ca/admin/graphics/spacer.gif
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/admin/helpfun.js b/dogtag/ca-ui/shared/webapps/ca/admin/helpfun.js
index 14a80bb95..14a80bb95 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/admin/helpfun.js
+++ b/dogtag/ca-ui/shared/webapps/ca/admin/helpfun.js
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/admin/index.html b/dogtag/ca-ui/shared/webapps/ca/admin/index.html
index 30662d47a..30662d47a 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/admin/index.html
+++ b/dogtag/ca-ui/shared/webapps/ca/admin/index.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/GenError.template b/dogtag/ca-ui/shared/webapps/ca/agent/GenError.template
index 33133ce3d..33133ce3d 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/agent/GenError.template
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/GenError.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/GenPending.template b/dogtag/ca-ui/shared/webapps/ca/agent/GenPending.template
index 50d23ee31..50d23ee31 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/agent/GenPending.template
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/GenPending.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/GenRejected.template b/dogtag/ca-ui/shared/webapps/ca/agent/GenRejected.template
index 81d12641a..81d12641a 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/agent/GenRejected.template
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/GenRejected.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/GenSuccess.template b/dogtag/ca-ui/shared/webapps/ca/agent/GenSuccess.template
index f3531f0b9..f3531f0b9 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/agent/GenSuccess.template
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/GenSuccess.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/GenSvcPending.template b/dogtag/ca-ui/shared/webapps/ca/agent/GenSvcPending.template
index 584402c69..584402c69 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/agent/GenSvcPending.template
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/GenSvcPending.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/GenUnauthorized.template b/dogtag/ca-ui/shared/webapps/ca/agent/GenUnauthorized.template
index f0016cdfa..f0016cdfa 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/agent/GenUnauthorized.template
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/GenUnauthorized.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/GenUnexpectedError.template b/dogtag/ca-ui/shared/webapps/ca/agent/GenUnexpectedError.template
index b00295c2f..b00295c2f 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/agent/GenUnexpectedError.template
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/GenUnexpectedError.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/EnrollSuccess.template b/dogtag/ca-ui/shared/webapps/ca/agent/ca/EnrollSuccess.template
index a2f8e499d..a2f8e499d 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/EnrollSuccess.template
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/ca/EnrollSuccess.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/ImportCert.template b/dogtag/ca-ui/shared/webapps/ca/agent/ca/ImportCert.template
index 4b828ca6f..4b828ca6f 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/ImportCert.template
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/ca/ImportCert.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/ListRequests.html b/dogtag/ca-ui/shared/webapps/ca/agent/ca/ListRequests.html
index 8043cbb3e..8043cbb3e 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/ListRequests.html
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/ca/ListRequests.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/ProfileApprove.template b/dogtag/ca-ui/shared/webapps/ca/agent/ca/ProfileApprove.template
index 6e0558df9..6e0558df9 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/ProfileApprove.template
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/ca/ProfileApprove.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/ProfileList.template b/dogtag/ca-ui/shared/webapps/ca/agent/ca/ProfileList.template
index 1514ad754..1514ad754 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/ProfileList.template
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/ca/ProfileList.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/ProfileProcess.template b/dogtag/ca-ui/shared/webapps/ca/agent/ca/ProfileProcess.template
index 70e7b2ae8..70e7b2ae8 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/ProfileProcess.template
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/ca/ProfileProcess.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/ProfileReview.template b/dogtag/ca-ui/shared/webapps/ca/agent/ca/ProfileReview.template
index 4e27f5245..4e27f5245 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/ProfileReview.template
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/ca/ProfileReview.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/ProfileSelect.template b/dogtag/ca-ui/shared/webapps/ca/agent/ca/ProfileSelect.template
index 4c7139d69..4c7139d69 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/ProfileSelect.template
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/ca/ProfileSelect.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/SrchCert.html b/dogtag/ca-ui/shared/webapps/ca/agent/ca/SrchCert.html
index 27350286d..27350286d 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/SrchCert.html
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/ca/SrchCert.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/SrchRequests.html b/dogtag/ca-ui/shared/webapps/ca/agent/ca/SrchRequests.html
index 8565b1b90..8565b1b90 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/SrchRequests.html
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/ca/SrchRequests.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/SrchRevokeCert.html b/dogtag/ca-ui/shared/webapps/ca/agent/ca/SrchRevokeCert.html
index 71384109d..71384109d 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/SrchRevokeCert.html
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/ca/SrchRevokeCert.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/UpdateDir.html b/dogtag/ca-ui/shared/webapps/ca/agent/ca/UpdateDir.html
index 1d50f2507..1d50f2507 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/UpdateDir.html
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/ca/UpdateDir.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/blank.html b/dogtag/ca-ui/shared/webapps/ca/agent/ca/blank.html
index e41af69c4..e41af69c4 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/blank.html
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/ca/blank.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/bulkissuance.template b/dogtag/ca-ui/shared/webapps/ca/agent/ca/bulkissuance.template
index 01f57455d..01f57455d 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/bulkissuance.template
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/ca/bulkissuance.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/cloneRedirect.template b/dogtag/ca-ui/shared/webapps/ca/agent/ca/cloneRedirect.template
index ef763e83f..ef763e83f 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/cloneRedirect.template
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/ca/cloneRedirect.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/confirmRevocation.template b/dogtag/ca-ui/shared/webapps/ca/agent/ca/confirmRevocation.template
index c1061affa..c1061affa 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/confirmRevocation.template
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/ca/confirmRevocation.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/displayBySerial.template b/dogtag/ca-ui/shared/webapps/ca/agent/ca/displayBySerial.template
index 4f2d6f2d5..4f2d6f2d5 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/displayBySerial.template
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/ca/displayBySerial.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/displayBySerial2.template b/dogtag/ca-ui/shared/webapps/ca/agent/ca/displayBySerial2.template
index 5c700da66..5c700da66 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/displayBySerial2.template
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/ca/displayBySerial2.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/displayCRL.template b/dogtag/ca-ui/shared/webapps/ca/agent/ca/displayCRL.template
index b3f0a50a0..b3f0a50a0 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/displayCRL.template
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/ca/displayCRL.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/displayCertFromRequest.template b/dogtag/ca-ui/shared/webapps/ca/agent/ca/displayCertFromRequest.template
index 13bbb166b..13bbb166b 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/displayCertFromRequest.template
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/ca/displayCertFromRequest.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/error.template b/dogtag/ca-ui/shared/webapps/ca/agent/ca/error.template
index b1940a820..b1940a820 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/error.template
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/ca/error.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameCRL.html b/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameCRL.html
index a0483c7e4..a0483c7e4 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameCRL.html
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameCRL.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameDir.html b/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameDir.html
index bcf5df10e..bcf5df10e 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameDir.html
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameDir.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameDisplayCRL.html b/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameDisplayCRL.html
index 79a11aab6..79a11aab6 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameDisplayCRL.html
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameDisplayCRL.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameList.html b/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameList.html
index 98f514696..98f514696 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameList.html
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameList.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameListReq.html b/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameListReq.html
index c4b3d1e62..c4b3d1e62 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameListReq.html
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameListReq.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameOCSP.html b/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameOCSP.html
index 8cc976d02..8cc976d02 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameOCSP.html
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameOCSP.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameProfile.html b/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameProfile.html
index 2a15bae4c..2a15bae4c 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameProfile.html
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameProfile.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameRevoke.html b/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameRevoke.html
index ebaee6df8..ebaee6df8 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameRevoke.html
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameRevoke.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameSearch.html b/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameSearch.html
index b75a6272b..b75a6272b 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameSearch.html
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameSearch.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameSrchRequests.html b/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameSrchRequests.html
index 0e73ea82f..0e73ea82f 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameSrchRequests.html
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameSrchRequests.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameStats.html b/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameStats.html
index 75a4dbebb..75a4dbebb 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameStats.html
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameStats.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/getOCSPInfo.template b/dogtag/ca-ui/shared/webapps/ca/agent/ca/getOCSPInfo.template
index 46e4ccf32..46e4ccf32 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/getOCSPInfo.template
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/ca/getOCSPInfo.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/getStats.template b/dogtag/ca-ui/shared/webapps/ca/agent/ca/getStats.template
index 59c59eea5..59c59eea5 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/getStats.template
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/ca/getStats.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/index.html b/dogtag/ca-ui/shared/webapps/ca/agent/ca/index.html
index 05756ed3a..05756ed3a 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/index.html
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/ca/index.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuCRL.html b/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuCRL.html
index 2c4984e9e..2c4984e9e 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuCRL.html
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuCRL.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuDir.html b/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuDir.html
index 7fa9f658d..7fa9f658d 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuDir.html
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuDir.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuDisplayCRL.html b/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuDisplayCRL.html
index de76603c4..de76603c4 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuDisplayCRL.html
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuDisplayCRL.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuList.html b/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuList.html
index 21452599d..21452599d 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuList.html
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuList.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuListReq.html b/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuListReq.html
index f3b541962..f3b541962 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuListReq.html
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuListReq.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuOCSP.html b/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuOCSP.html
index 0b73aa60e..0b73aa60e 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuOCSP.html
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuOCSP.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuProfile.html b/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuProfile.html
index a7bcd66df..a7bcd66df 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuProfile.html
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuProfile.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuRevoke.html b/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuRevoke.html
index 1148bf7c4..1148bf7c4 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuRevoke.html
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuRevoke.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuSearch.html b/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuSearch.html
index a088ef030..a088ef030 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuSearch.html
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuSearch.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuSrchRequests.html b/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuSrchRequests.html
index 3b16a1a20..3b16a1a20 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuSrchRequests.html
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuSrchRequests.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuStats.html b/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuStats.html
index c251356bd..c251356bd 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuStats.html
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuStats.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/monitor.html b/dogtag/ca-ui/shared/webapps/ca/agent/ca/monitor.html
index a5ee3db8f..a5ee3db8f 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/monitor.html
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/ca/monitor.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/monitor.template b/dogtag/ca-ui/shared/webapps/ca/agent/ca/monitor.template
index 1d84f9f20..1d84f9f20 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/monitor.template
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/ca/monitor.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/notImplemented.html b/dogtag/ca-ui/shared/webapps/ca/agent/ca/notImplemented.html
index cbdd43f6a..cbdd43f6a 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/notImplemented.html
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/ca/notImplemented.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/processCertReq.template b/dogtag/ca-ui/shared/webapps/ca/agent/ca/processCertReq.template
index 437895934..437895934 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/processCertReq.template
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/ca/processCertReq.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/processReq.template b/dogtag/ca-ui/shared/webapps/ca/agent/ca/processReq.template
index 2f8fc7778..2f8fc7778 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/processReq.template
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/ca/processReq.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/queryBySerial.html b/dogtag/ca-ui/shared/webapps/ca/agent/ca/queryBySerial.html
index 95f8ed653..95f8ed653 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/queryBySerial.html
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/ca/queryBySerial.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/queryCert.html b/dogtag/ca-ui/shared/webapps/ca/agent/ca/queryCert.html
index 73d59ef30..73d59ef30 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/queryCert.html
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/ca/queryCert.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/queryCert.template b/dogtag/ca-ui/shared/webapps/ca/agent/ca/queryCert.template
index 32f30d226..32f30d226 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/queryCert.template
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/ca/queryCert.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/queryReq.template b/dogtag/ca-ui/shared/webapps/ca/agent/ca/queryReq.template
index 9fb63a109..9fb63a109 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/queryReq.template
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/ca/queryReq.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/reasonToRevoke.template b/dogtag/ca-ui/shared/webapps/ca/agent/ca/reasonToRevoke.template
index 12c14dfda..12c14dfda 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/reasonToRevoke.template
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/ca/reasonToRevoke.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/revocationResult.template b/dogtag/ca-ui/shared/webapps/ca/agent/ca/revocationResult.template
index bd356841d..bd356841d 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/revocationResult.template
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/ca/revocationResult.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/revokeBySerial.template b/dogtag/ca-ui/shared/webapps/ca/agent/ca/revokeBySerial.template
index cae2a93da..cae2a93da 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/revokeBySerial.template
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/ca/revokeBySerial.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/revokeCert.html b/dogtag/ca-ui/shared/webapps/ca/agent/ca/revokeCert.html
index c20c949ed..c20c949ed 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/revokeCert.html
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/ca/revokeCert.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/srchCert.template b/dogtag/ca-ui/shared/webapps/ca/agent/ca/srchCert.template
index fcaa1adf8..fcaa1adf8 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/srchCert.template
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/ca/srchCert.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/toDisplayCRL.template b/dogtag/ca-ui/shared/webapps/ca/agent/ca/toDisplayCRL.template
index a1467810e..a1467810e 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/toDisplayCRL.template
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/ca/toDisplayCRL.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/toUpdateCRL.template b/dogtag/ca-ui/shared/webapps/ca/agent/ca/toUpdateCRL.template
index 1d804a604..1d804a604 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/toUpdateCRL.template
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/ca/toUpdateCRL.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/top.html b/dogtag/ca-ui/shared/webapps/ca/agent/ca/top.html
index f4033d0f4..f4033d0f4 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/top.html
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/ca/top.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/unrevocationResult.template b/dogtag/ca-ui/shared/webapps/ca/agent/ca/unrevocationResult.template
index 8080ce0d2..8080ce0d2 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/unrevocationResult.template
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/ca/unrevocationResult.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/updateCRL.html b/dogtag/ca-ui/shared/webapps/ca/agent/ca/updateCRL.html
index 70216a531..70216a531 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/updateCRL.html
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/ca/updateCRL.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/updateCRL.template b/dogtag/ca-ui/shared/webapps/ca/agent/ca/updateCRL.template
index ebe318599..ebe318599 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/updateCRL.template
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/ca/updateCRL.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/updateDir.template b/dogtag/ca-ui/shared/webapps/ca/agent/ca/updateDir.template
index 64954a257..64954a257 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/updateDir.template
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/ca/updateDir.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/cms-funcs.js b/dogtag/ca-ui/shared/webapps/ca/agent/cms-funcs.js
index c8ffd51c7..c8ffd51c7 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/agent/cms-funcs.js
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/cms-funcs.js
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/funcs.js b/dogtag/ca-ui/shared/webapps/ca/agent/funcs.js
index f610759e8..f610759e8 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/agent/funcs.js
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/funcs.js
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/graphics/dgLeftTab.gif b/dogtag/ca-ui/shared/webapps/ca/agent/graphics/dgLeftTab.gif
index 35a76c859..35a76c859 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/agent/graphics/dgLeftTab.gif
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/graphics/dgLeftTab.gif
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/graphics/dgRightTab.gif b/dogtag/ca-ui/shared/webapps/ca/agent/graphics/dgRightTab.gif
index a519bc759..a519bc759 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/agent/graphics/dgRightTab.gif
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/graphics/dgRightTab.gif
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/graphics/favicon.ico b/dogtag/ca-ui/shared/webapps/ca/agent/graphics/favicon.ico
index efc1d33f4..efc1d33f4 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/agent/graphics/favicon.ico
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/graphics/favicon.ico
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/graphics/goto-tall.gif b/dogtag/ca-ui/shared/webapps/ca/agent/graphics/goto-tall.gif
index 6eea3ef5c..6eea3ef5c 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/agent/graphics/goto-tall.gif
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/graphics/goto-tall.gif
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/graphics/gray90.gif b/dogtag/ca-ui/shared/webapps/ca/agent/graphics/gray90.gif
index c6f811102..c6f811102 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/agent/graphics/gray90.gif
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/graphics/gray90.gif
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/graphics/hr.gif b/dogtag/ca-ui/shared/webapps/ca/agent/graphics/hr.gif
index 14f8acf92..14f8acf92 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/agent/graphics/hr.gif
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/graphics/hr.gif
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/graphics/lgLeftTab.gif b/dogtag/ca-ui/shared/webapps/ca/agent/graphics/lgLeftTab.gif
index a78fbc89d..a78fbc89d 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/agent/graphics/lgLeftTab.gif
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/graphics/lgLeftTab.gif
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/graphics/lgRightTab.gif b/dogtag/ca-ui/shared/webapps/ca/agent/graphics/lgRightTab.gif
index 71852402d..71852402d 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/agent/graphics/lgRightTab.gif
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/graphics/lgRightTab.gif
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/graphics/logo_header.gif b/dogtag/ca-ui/shared/webapps/ca/agent/graphics/logo_header.gif
index 573482227..573482227 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/agent/graphics/logo_header.gif
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/graphics/logo_header.gif
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/graphics/spacer.gif b/dogtag/ca-ui/shared/webapps/ca/agent/graphics/spacer.gif
index 13acffe53..13acffe53 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/agent/graphics/spacer.gif
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/graphics/spacer.gif
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/header.template b/dogtag/ca-ui/shared/webapps/ca/agent/header.template
index dfe7061f1..dfe7061f1 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/agent/header.template
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/header.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/helpfun.js b/dogtag/ca-ui/shared/webapps/ca/agent/helpfun.js
index 14a80bb95..14a80bb95 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/agent/helpfun.js
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/helpfun.js
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/index.html b/dogtag/ca-ui/shared/webapps/ca/agent/index.html
index 30662d47a..30662d47a 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/agent/index.html
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/index.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/index.template b/dogtag/ca-ui/shared/webapps/ca/agent/index.template
index 99ea3a090..99ea3a090 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/agent/index.template
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/index.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ports.template b/dogtag/ca-ui/shared/webapps/ca/agent/ports.template
index 46ab91d60..46ab91d60 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/agent/ports.template
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/ports.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/agent/xenroll.dll b/dogtag/ca-ui/shared/webapps/ca/agent/xenroll.dll
index 9375e988d..9375e988d 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/agent/xenroll.dll
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/xenroll.dll
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/GenError.template b/dogtag/ca-ui/shared/webapps/ca/ee/GenError.template
index 729525afd..729525afd 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/ee/GenError.template
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/GenError.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/GenPending.template b/dogtag/ca-ui/shared/webapps/ca/ee/GenPending.template
index 15ab7316a..15ab7316a 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/ee/GenPending.template
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/GenPending.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/GenRejected.template b/dogtag/ca-ui/shared/webapps/ca/ee/GenRejected.template
index 6e0ca836f..6e0ca836f 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/ee/GenRejected.template
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/GenRejected.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/GenSuccess.template b/dogtag/ca-ui/shared/webapps/ca/ee/GenSuccess.template
index 5e17ecd64..5e17ecd64 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/ee/GenSuccess.template
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/GenSuccess.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/GenSvcPending.template b/dogtag/ca-ui/shared/webapps/ca/ee/GenSvcPending.template
index e61acbe6c..e61acbe6c 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/ee/GenSvcPending.template
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/GenSvcPending.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/GenUnauthorized.template b/dogtag/ca-ui/shared/webapps/ca/ee/GenUnauthorized.template
index b8526cb59..b8526cb59 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/ee/GenUnauthorized.template
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/GenUnauthorized.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/GenUnexpectedError.template b/dogtag/ca-ui/shared/webapps/ca/ee/GenUnexpectedError.template
index d93eb0fd6..d93eb0fd6 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/ee/GenUnexpectedError.template
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/GenUnexpectedError.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/AIMEnroll.html b/dogtag/ca-ui/shared/webapps/ca/ee/ca/AIMEnroll.html
index d72f7c974..d72f7c974 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/AIMEnroll.html
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/ca/AIMEnroll.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/CMCEnrollment.html b/dogtag/ca-ui/shared/webapps/ca/ee/ca/CMCEnrollment.html
index d570addc6..d570addc6 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/CMCEnrollment.html
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/ca/CMCEnrollment.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/CMCRevReq.html b/dogtag/ca-ui/shared/webapps/ca/ee/ca/CMCRevReq.html
index f7aa04f29..f7aa04f29 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/CMCRevReq.html
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/ca/CMCRevReq.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/CertBasedDualEnroll.html b/dogtag/ca-ui/shared/webapps/ca/ee/ca/CertBasedDualEnroll.html
index a2861d6a6..a2861d6a6 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/CertBasedDualEnroll.html
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/ca/CertBasedDualEnroll.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/CertBasedEncryptionEnroll.html b/dogtag/ca-ui/shared/webapps/ca/ee/ca/CertBasedEncryptionEnroll.html
index df2afdae6..df2afdae6 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/CertBasedEncryptionEnroll.html
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/ca/CertBasedEncryptionEnroll.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/CertBasedSingleEnroll.html b/dogtag/ca-ui/shared/webapps/ca/ee/ca/CertBasedSingleEnroll.html
index 7ac94ae09..7ac94ae09 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/CertBasedSingleEnroll.html
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/ca/CertBasedSingleEnroll.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/ChallengeRevoke1.html b/dogtag/ca-ui/shared/webapps/ca/ee/ca/ChallengeRevoke1.html
index ea4916cdb..ea4916cdb 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/ChallengeRevoke1.html
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/ca/ChallengeRevoke1.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/DirPinUserEnroll.html b/dogtag/ca-ui/shared/webapps/ca/ee/ca/DirPinUserEnroll.html
index 2e5a28aca..2e5a28aca 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/DirPinUserEnroll.html
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/ca/DirPinUserEnroll.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/DirUserEnroll.html b/dogtag/ca-ui/shared/webapps/ca/ee/ca/DirUserEnroll.html
index 57947e566..57947e566 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/DirUserEnroll.html
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/ca/DirUserEnroll.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/DisplayCRL.html b/dogtag/ca-ui/shared/webapps/ca/ee/ca/DisplayCRL.html
index b4c2cd635..b4c2cd635 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/DisplayCRL.html
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/ca/DisplayCRL.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/EnrollSuccess.template b/dogtag/ca-ui/shared/webapps/ca/ee/ca/EnrollSuccess.template
index 771c6fb1b..771c6fb1b 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/EnrollSuccess.template
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/ca/EnrollSuccess.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/GetCAChain.html b/dogtag/ca-ui/shared/webapps/ca/ee/ca/GetCAChain.html
index f21f606df..f21f606df 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/GetCAChain.html
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/ca/GetCAChain.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/ImportAdminCert.template b/dogtag/ca-ui/shared/webapps/ca/ee/ca/ImportAdminCert.template
index e52764ec6..e52764ec6 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/ImportAdminCert.template
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/ca/ImportAdminCert.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/ImportCert.template b/dogtag/ca-ui/shared/webapps/ca/ee/ca/ImportCert.template
index 8df83eca9..8df83eca9 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/ImportCert.template
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/ca/ImportCert.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/KeyRecovery.html b/dogtag/ca-ui/shared/webapps/ca/ee/ca/KeyRecovery.html
index b3a9e4676..b3a9e4676 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/KeyRecovery.html
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/ca/KeyRecovery.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/ManCAEnroll.html b/dogtag/ca-ui/shared/webapps/ca/ee/ca/ManCAEnroll.html
index b96909fb0..b96909fb0 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/ManCAEnroll.html
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/ca/ManCAEnroll.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/ManObjSignEnroll.html b/dogtag/ca-ui/shared/webapps/ca/ee/ca/ManObjSignEnroll.html
index 04f37b650..04f37b650 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/ManObjSignEnroll.html
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/ca/ManObjSignEnroll.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/ManRAEnroll.html b/dogtag/ca-ui/shared/webapps/ca/ee/ca/ManRAEnroll.html
index c1a807bc9..c1a807bc9 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/ManRAEnroll.html
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/ca/ManRAEnroll.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/ManServerEnroll.html b/dogtag/ca-ui/shared/webapps/ca/ee/ca/ManServerEnroll.html
index ff15fee59..ff15fee59 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/ManServerEnroll.html
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/ca/ManServerEnroll.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/ManUserEnroll.html b/dogtag/ca-ui/shared/webapps/ca/ee/ca/ManUserEnroll.html
index 8cc80148d..8cc80148d 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/ManUserEnroll.html
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/ca/ManUserEnroll.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/NISUserEnroll.html b/dogtag/ca-ui/shared/webapps/ca/ee/ca/NISUserEnroll.html
index 26915188d..26915188d 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/NISUserEnroll.html
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/ca/NISUserEnroll.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/OCSPResponder.html b/dogtag/ca-ui/shared/webapps/ca/ee/ca/OCSPResponder.html
index 4d14f513f..4d14f513f 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/OCSPResponder.html
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/ca/OCSPResponder.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/ObjSignPKCS10Enroll.html b/dogtag/ca-ui/shared/webapps/ca/ee/ca/ObjSignPKCS10Enroll.html
index fcf68f12e..fcf68f12e 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/ObjSignPKCS10Enroll.html
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/ca/ObjSignPKCS10Enroll.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/PortalEnrollment.html b/dogtag/ca-ui/shared/webapps/ca/ee/ca/PortalEnrollment.html
index b1bce69b6..b1bce69b6 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/PortalEnrollment.html
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/ca/PortalEnrollment.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/ProfileList.template b/dogtag/ca-ui/shared/webapps/ca/ee/ca/ProfileList.template
index de7c32c93..de7c32c93 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/ProfileList.template
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/ca/ProfileList.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/ProfileSelect.template b/dogtag/ca-ui/shared/webapps/ca/ee/ca/ProfileSelect.template
index 0e3ded046..0e3ded046 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/ProfileSelect.template
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/ca/ProfileSelect.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/ProfileSubmit.html b/dogtag/ca-ui/shared/webapps/ca/ee/ca/ProfileSubmit.html
index 90d50864d..90d50864d 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/ProfileSubmit.html
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/ca/ProfileSubmit.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/ProfileSubmit.template b/dogtag/ca-ui/shared/webapps/ca/ee/ca/ProfileSubmit.template
index 6fa3a0d71..6fa3a0d71 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/ProfileSubmit.template
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/ca/ProfileSubmit.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/RenewalSuccess.template b/dogtag/ca-ui/shared/webapps/ca/ee/ca/RenewalSuccess.template
index cb840d296..cb840d296 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/RenewalSuccess.template
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/ca/RenewalSuccess.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/RevocationSuccess.template b/dogtag/ca-ui/shared/webapps/ca/ee/ca/RevocationSuccess.template
index d024a3d14..d024a3d14 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/RevocationSuccess.template
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/ca/RevocationSuccess.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/UserDnEnroll.html b/dogtag/ca-ui/shared/webapps/ca/ee/ca/UserDnEnroll.html
index f218ccc51..f218ccc51 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/UserDnEnroll.html
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/ca/UserDnEnroll.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/UserRenewal.html b/dogtag/ca-ui/shared/webapps/ca/ee/ca/UserRenewal.html
index 4e4ebec5f..4e4ebec5f 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/UserRenewal.html
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/ca/UserRenewal.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/UserRevocation.html b/dogtag/ca-ui/shared/webapps/ca/ee/ca/UserRevocation.html
index 50cca6507..50cca6507 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/UserRevocation.html
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/ca/UserRevocation.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/bench2k.html b/dogtag/ca-ui/shared/webapps/ca/ee/ca/bench2k.html
index ab667f47f..ab667f47f 100755
--- a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/bench2k.html
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/ca/bench2k.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/checkRequest.html b/dogtag/ca-ui/shared/webapps/ca/ee/ca/checkRequest.html
index e315aa817..e315aa817 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/checkRequest.html
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/ca/checkRequest.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/displayBySerial.template b/dogtag/ca-ui/shared/webapps/ca/ee/ca/displayBySerial.template
index e01e4e123..e01e4e123 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/displayBySerial.template
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/ca/displayBySerial.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/displayBySerial2.template b/dogtag/ca-ui/shared/webapps/ca/ee/ca/displayBySerial2.template
index 909cf8030..909cf8030 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/displayBySerial2.template
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/ca/displayBySerial2.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/displayCRL.template b/dogtag/ca-ui/shared/webapps/ca/ee/ca/displayCRL.template
index 2b98ed588..2b98ed588 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/displayCRL.template
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/ca/displayCRL.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/displayCaCert.template b/dogtag/ca-ui/shared/webapps/ca/ee/ca/displayCaCert.template
index 7ce74f91f..7ce74f91f 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/displayCaCert.template
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/ca/displayCaCert.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/displayCertFromRequest.template b/dogtag/ca-ui/shared/webapps/ca/ee/ca/displayCertFromRequest.template
index d30744150..d30744150 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/displayCertFromRequest.template
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/ca/displayCertFromRequest.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/enrollMenu.html b/dogtag/ca-ui/shared/webapps/ca/ee/ca/enrollMenu.html
index cebdc1aec..cebdc1aec 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/enrollMenu.html
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/ca/enrollMenu.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/index.html b/dogtag/ca-ui/shared/webapps/ca/ee/ca/index.html
index 4388c58c6..4388c58c6 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/index.html
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/ca/index.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/policyEnrollment/index.html b/dogtag/ca-ui/shared/webapps/ca/ee/ca/policyEnrollment/index.html
index d0d823416..d0d823416 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/policyEnrollment/index.html
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/ca/policyEnrollment/index.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/policyEnrollment/profileMenu.html b/dogtag/ca-ui/shared/webapps/ca/ee/ca/policyEnrollment/profileMenu.html
index 9eabc2262..9eabc2262 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/policyEnrollment/profileMenu.html
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/ca/policyEnrollment/profileMenu.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/policyEnrollment/retrievalMenu.html b/dogtag/ca-ui/shared/webapps/ca/ee/ca/policyEnrollment/retrievalMenu.html
index ec39a7a01..ec39a7a01 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/policyEnrollment/retrievalMenu.html
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/ca/policyEnrollment/retrievalMenu.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/policyEnrollment/revocationMenu.html b/dogtag/ca-ui/shared/webapps/ca/ee/ca/policyEnrollment/revocationMenu.html
index fa810e748..fa810e748 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/policyEnrollment/revocationMenu.html
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/ca/policyEnrollment/revocationMenu.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/profileEnrollment/index.html b/dogtag/ca-ui/shared/webapps/ca/ee/ca/profileEnrollment/index.html
index efcc3c67d..efcc3c67d 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/profileEnrollment/index.html
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/ca/profileEnrollment/index.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/profileEnrollment/profileMenu.html b/dogtag/ca-ui/shared/webapps/ca/ee/ca/profileEnrollment/profileMenu.html
index 8f19d91b4..8f19d91b4 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/profileEnrollment/profileMenu.html
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/ca/profileEnrollment/profileMenu.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/profileEnrollment/retrievalMenu.html b/dogtag/ca-ui/shared/webapps/ca/ee/ca/profileEnrollment/retrievalMenu.html
index faafe343e..faafe343e 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/profileEnrollment/retrievalMenu.html
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/ca/profileEnrollment/retrievalMenu.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/profileEnrollment/revocationMenu.html b/dogtag/ca-ui/shared/webapps/ca/ee/ca/profileEnrollment/revocationMenu.html
index 21f5f4397..21f5f4397 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/profileEnrollment/revocationMenu.html
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/ca/profileEnrollment/revocationMenu.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/profileMenu.html b/dogtag/ca-ui/shared/webapps/ca/ee/ca/profileMenu.html
index b621c230e..b621c230e 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/profileMenu.html
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/ca/profileMenu.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/queryBySerial.html b/dogtag/ca-ui/shared/webapps/ca/ee/ca/queryBySerial.html
index d9e55bddb..d9e55bddb 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/queryBySerial.html
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/ca/queryBySerial.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/queryCert.html b/dogtag/ca-ui/shared/webapps/ca/ee/ca/queryCert.html
index 1855ffaac..1855ffaac 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/queryCert.html
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/ca/queryCert.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/queryCert.template b/dogtag/ca-ui/shared/webapps/ca/ee/ca/queryCert.template
index a6dcf31f3..a6dcf31f3 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/queryCert.template
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/ca/queryCert.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/reasonToRevoke.template b/dogtag/ca-ui/shared/webapps/ca/ee/ca/reasonToRevoke.template
index 6d2edf1ec..6d2edf1ec 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/reasonToRevoke.template
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/ca/reasonToRevoke.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/recoveryMenu.html b/dogtag/ca-ui/shared/webapps/ca/ee/ca/recoveryMenu.html
index c463d2d3d..c463d2d3d 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/recoveryMenu.html
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/ca/recoveryMenu.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/remoteAuthConfig.template b/dogtag/ca-ui/shared/webapps/ca/ee/ca/remoteAuthConfig.template
index 777c61575..777c61575 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/remoteAuthConfig.template
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/ca/remoteAuthConfig.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/renewalMenu.html b/dogtag/ca-ui/shared/webapps/ca/ee/ca/renewalMenu.html
index ca2956b33..ca2956b33 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/renewalMenu.html
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/ca/renewalMenu.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/requestStatus.template b/dogtag/ca-ui/shared/webapps/ca/ee/ca/requestStatus.template
index b00e55766..b00e55766 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/requestStatus.template
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/ca/requestStatus.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/retrievalMenu.html b/dogtag/ca-ui/shared/webapps/ca/ee/ca/retrievalMenu.html
index c7d8d13c8..c7d8d13c8 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/retrievalMenu.html
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/ca/retrievalMenu.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/revocationMenu.html b/dogtag/ca-ui/shared/webapps/ca/ee/ca/revocationMenu.html
index 1b1d19a60..1b1d19a60 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/revocationMenu.html
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/ca/revocationMenu.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/revocationResult.template b/dogtag/ca-ui/shared/webapps/ca/ee/ca/revocationResult.template
index ddcc66198..ddcc66198 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/revocationResult.template
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/ca/revocationResult.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/srchCert.html b/dogtag/ca-ui/shared/webapps/ca/ee/ca/srchCert.html
index a1ef5657c..a1ef5657c 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/srchCert.html
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/ca/srchCert.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/srchCert.template b/dogtag/ca-ui/shared/webapps/ca/ee/ca/srchCert.template
index 6381cec87..6381cec87 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/srchCert.template
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/ca/srchCert.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/tabs.html b/dogtag/ca-ui/shared/webapps/ca/ee/ca/tabs.html
index 2cf6ee3be..2cf6ee3be 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/tabs.html
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/ca/tabs.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/toDisplayCRL.template b/dogtag/ca-ui/shared/webapps/ca/ee/ca/toDisplayCRL.template
index ccc6ffd3e..ccc6ffd3e 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/toDisplayCRL.template
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/ca/toDisplayCRL.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/unrevocationResult.template b/dogtag/ca-ui/shared/webapps/ca/ee/ca/unrevocationResult.template
index b876f6f5f..b876f6f5f 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/unrevocationResult.template
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/ca/unrevocationResult.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/cms-funcs.js b/dogtag/ca-ui/shared/webapps/ca/ee/cms-funcs.js
index 800e4afc9..800e4afc9 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/ee/cms-funcs.js
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/cms-funcs.js
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/graphics/alertl.gif b/dogtag/ca-ui/shared/webapps/ca/ee/graphics/alertl.gif
index 453d1b2bd..453d1b2bd 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/ee/graphics/alertl.gif
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/graphics/alertl.gif
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/graphics/delete.gif b/dogtag/ca-ui/shared/webapps/ca/ee/graphics/delete.gif
index 53a5a3a9b..53a5a3a9b 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/ee/graphics/delete.gif
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/graphics/delete.gif
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/graphics/dgLeftTab.gif b/dogtag/ca-ui/shared/webapps/ca/ee/graphics/dgLeftTab.gif
index 35a76c859..35a76c859 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/ee/graphics/dgLeftTab.gif
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/graphics/dgLeftTab.gif
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/graphics/dgRightTab.gif b/dogtag/ca-ui/shared/webapps/ca/ee/graphics/dgRightTab.gif
index a519bc759..a519bc759 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/ee/graphics/dgRightTab.gif
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/graphics/dgRightTab.gif
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/graphics/dgRightTab2.gif b/dogtag/ca-ui/shared/webapps/ca/ee/graphics/dgRightTab2.gif
index f43ef3a8c..f43ef3a8c 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/ee/graphics/dgRightTab2.gif
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/graphics/dgRightTab2.gif
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/graphics/error.gif b/dogtag/ca-ui/shared/webapps/ca/ee/graphics/error.gif
index ba9c07e17..ba9c07e17 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/ee/graphics/error.gif
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/graphics/error.gif
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/graphics/favicon.ico b/dogtag/ca-ui/shared/webapps/ca/ee/graphics/favicon.ico
index efc1d33f4..efc1d33f4 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/ee/graphics/favicon.ico
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/graphics/favicon.ico
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/graphics/folder.gif b/dogtag/ca-ui/shared/webapps/ca/ee/graphics/folder.gif
index fe7796c73..fe7796c73 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/ee/graphics/folder.gif
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/graphics/folder.gif
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/graphics/gray90.gif b/dogtag/ca-ui/shared/webapps/ca/ee/graphics/gray90.gif
index c6f811102..c6f811102 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/ee/graphics/gray90.gif
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/graphics/gray90.gif
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/graphics/hr.gif b/dogtag/ca-ui/shared/webapps/ca/ee/graphics/hr.gif
index 14f8acf92..14f8acf92 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/ee/graphics/hr.gif
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/graphics/hr.gif
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/graphics/lgLeftTab.gif b/dogtag/ca-ui/shared/webapps/ca/ee/graphics/lgLeftTab.gif
index a78fbc89d..a78fbc89d 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/ee/graphics/lgLeftTab.gif
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/graphics/lgLeftTab.gif
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/graphics/lgRightTab.gif b/dogtag/ca-ui/shared/webapps/ca/ee/graphics/lgRightTab.gif
index 71852402d..71852402d 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/ee/graphics/lgRightTab.gif
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/graphics/lgRightTab.gif
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/graphics/lgRightTab2.gif b/dogtag/ca-ui/shared/webapps/ca/ee/graphics/lgRightTab2.gif
index 76b2f67f1..76b2f67f1 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/ee/graphics/lgRightTab2.gif
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/graphics/lgRightTab2.gif
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/graphics/listclosed.gif b/dogtag/ca-ui/shared/webapps/ca/ee/graphics/listclosed.gif
index 4907361c6..4907361c6 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/ee/graphics/listclosed.gif
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/graphics/listclosed.gif
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/graphics/logo_header.gif b/dogtag/ca-ui/shared/webapps/ca/ee/graphics/logo_header.gif
index 573482227..573482227 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/ee/graphics/logo_header.gif
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/graphics/logo_header.gif
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/graphics/messagel.gif b/dogtag/ca-ui/shared/webapps/ca/ee/graphics/messagel.gif
index e46c67a09..e46c67a09 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/ee/graphics/messagel.gif
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/graphics/messagel.gif
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/graphics/spacer.gif b/dogtag/ca-ui/shared/webapps/ca/ee/graphics/spacer.gif
index 13acffe53..13acffe53 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/ee/graphics/spacer.gif
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/graphics/spacer.gif
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/graphics/whLeftTab.gif b/dogtag/ca-ui/shared/webapps/ca/ee/graphics/whLeftTab.gif
index 525e6e73d..525e6e73d 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/ee/graphics/whLeftTab.gif
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/graphics/whLeftTab.gif
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/graphics/whRightTab.gif b/dogtag/ca-ui/shared/webapps/ca/ee/graphics/whRightTab.gif
index f3740ee9b..f3740ee9b 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/ee/graphics/whRightTab.gif
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/graphics/whRightTab.gif
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/graphics/whRightTab2.gif b/dogtag/ca-ui/shared/webapps/ca/ee/graphics/whRightTab2.gif
index 81f8daac5..81f8daac5 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/ee/graphics/whRightTab2.gif
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/graphics/whRightTab2.gif
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/helpfun.js b/dogtag/ca-ui/shared/webapps/ca/ee/helpfun.js
index 14a80bb95..14a80bb95 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/ee/helpfun.js
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/helpfun.js
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/index.html b/dogtag/ca-ui/shared/webapps/ca/ee/index.html
index 30662d47a..30662d47a 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/ee/index.html
+++ b/dogtag/ca-ui/shared/webapps/ca/ee/index.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/index.html b/dogtag/ca-ui/shared/webapps/ca/index.html
index 30662d47a..30662d47a 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/index.html
+++ b/dogtag/ca-ui/shared/webapps/ca/index.html
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/services.template b/dogtag/ca-ui/shared/webapps/ca/services.template
index c3238e7cd..c3238e7cd 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/services.template
+++ b/dogtag/ca-ui/shared/webapps/ca/services.template
diff --git a/pki/dogtag/common-ui/CMakeLists.txt b/dogtag/common-ui/CMakeLists.txt
index c4288e51a..c4288e51a 100644
--- a/pki/dogtag/common-ui/CMakeLists.txt
+++ b/dogtag/common-ui/CMakeLists.txt
diff --git a/pki/dogtag/common-ui/LICENSE b/dogtag/common-ui/LICENSE
index e281f4362..e281f4362 100644
--- a/pki/dogtag/common-ui/LICENSE
+++ b/dogtag/common-ui/LICENSE
diff --git a/pki/dogtag/common-ui/build.xml b/dogtag/common-ui/build.xml
index 416754f35..416754f35 100644
--- a/pki/dogtag/common-ui/build.xml
+++ b/dogtag/common-ui/build.xml
diff --git a/pki/dogtag/common-ui/build_dogtag b/dogtag/common-ui/build_dogtag
index 194bfbcfc..194bfbcfc 100755
--- a/pki/dogtag/common-ui/build_dogtag
+++ b/dogtag/common-ui/build_dogtag
diff --git a/pki/dogtag/common-ui/dogtag-pki-common-ui.spec b/dogtag/common-ui/dogtag-pki-common-ui.spec
index c730f3444..c730f3444 100644
--- a/pki/dogtag/common-ui/dogtag-pki-common-ui.spec
+++ b/dogtag/common-ui/dogtag-pki-common-ui.spec
diff --git a/pki/dogtag/common-ui/shared/admin/console/config/adminauthenticatepanel.vm b/dogtag/common-ui/shared/admin/console/config/adminauthenticatepanel.vm
index 7d5aade5f..7d5aade5f 100644
--- a/pki/dogtag/common-ui/shared/admin/console/config/adminauthenticatepanel.vm
+++ b/dogtag/common-ui/shared/admin/console/config/adminauthenticatepanel.vm
diff --git a/pki/dogtag/common-ui/shared/admin/console/config/adminpanel.vm b/dogtag/common-ui/shared/admin/console/config/adminpanel.vm
index 5db27e00d..5db27e00d 100644
--- a/pki/dogtag/common-ui/shared/admin/console/config/adminpanel.vm
+++ b/dogtag/common-ui/shared/admin/console/config/adminpanel.vm
diff --git a/pki/dogtag/common-ui/shared/admin/console/config/agentauthenticatepanel.vm b/dogtag/common-ui/shared/admin/console/config/agentauthenticatepanel.vm
index 2124e7a36..2124e7a36 100644
--- a/pki/dogtag/common-ui/shared/admin/console/config/agentauthenticatepanel.vm
+++ b/dogtag/common-ui/shared/admin/console/config/agentauthenticatepanel.vm
diff --git a/pki/dogtag/common-ui/shared/admin/console/config/backupkeycertpanel.vm b/dogtag/common-ui/shared/admin/console/config/backupkeycertpanel.vm
index 471f7e09f..471f7e09f 100644
--- a/pki/dogtag/common-ui/shared/admin/console/config/backupkeycertpanel.vm
+++ b/dogtag/common-ui/shared/admin/console/config/backupkeycertpanel.vm
diff --git a/pki/dogtag/common-ui/shared/admin/console/config/certchainpanel.vm b/dogtag/common-ui/shared/admin/console/config/certchainpanel.vm
index 08bcc1331..08bcc1331 100644
--- a/pki/dogtag/common-ui/shared/admin/console/config/certchainpanel.vm
+++ b/dogtag/common-ui/shared/admin/console/config/certchainpanel.vm
diff --git a/pki/dogtag/common-ui/shared/admin/console/config/certprettyprintpanel.vm b/dogtag/common-ui/shared/admin/console/config/certprettyprintpanel.vm
index ac8da10ee..ac8da10ee 100644
--- a/pki/dogtag/common-ui/shared/admin/console/config/certprettyprintpanel.vm
+++ b/dogtag/common-ui/shared/admin/console/config/certprettyprintpanel.vm
diff --git a/pki/dogtag/common-ui/shared/admin/console/config/certrequestpanel.vm b/dogtag/common-ui/shared/admin/console/config/certrequestpanel.vm
index 3eb5ebdf9..3eb5ebdf9 100644
--- a/pki/dogtag/common-ui/shared/admin/console/config/certrequestpanel.vm
+++ b/dogtag/common-ui/shared/admin/console/config/certrequestpanel.vm
diff --git a/pki/dogtag/common-ui/shared/admin/console/config/config_addhsm.vm b/dogtag/common-ui/shared/admin/console/config/config_addhsm.vm
index c10f6c18e..c10f6c18e 100644
--- a/pki/dogtag/common-ui/shared/admin/console/config/config_addhsm.vm
+++ b/dogtag/common-ui/shared/admin/console/config/config_addhsm.vm
diff --git a/pki/dogtag/common-ui/shared/admin/console/config/config_clone.vm b/dogtag/common-ui/shared/admin/console/config/config_clone.vm
index 521836050..521836050 100644
--- a/pki/dogtag/common-ui/shared/admin/console/config/config_clone.vm
+++ b/dogtag/common-ui/shared/admin/console/config/config_clone.vm
diff --git a/pki/dogtag/common-ui/shared/admin/console/config/config_db.vm b/dogtag/common-ui/shared/admin/console/config/config_db.vm
index b53c5d9ef..b53c5d9ef 100644
--- a/pki/dogtag/common-ui/shared/admin/console/config/config_db.vm
+++ b/dogtag/common-ui/shared/admin/console/config/config_db.vm
diff --git a/pki/dogtag/common-ui/shared/admin/console/config/config_hsm.vm b/dogtag/common-ui/shared/admin/console/config/config_hsm.vm
index 5aa3ebc7b..5aa3ebc7b 100644
--- a/pki/dogtag/common-ui/shared/admin/console/config/config_hsm.vm
+++ b/dogtag/common-ui/shared/admin/console/config/config_hsm.vm
diff --git a/pki/dogtag/common-ui/shared/admin/console/config/config_hsmloginpanel.vm b/dogtag/common-ui/shared/admin/console/config/config_hsmloginpanel.vm
index 147425bae..147425bae 100644
--- a/pki/dogtag/common-ui/shared/admin/console/config/config_hsmloginpanel.vm
+++ b/dogtag/common-ui/shared/admin/console/config/config_hsmloginpanel.vm
diff --git a/pki/dogtag/common-ui/shared/admin/console/config/config_join.vm b/dogtag/common-ui/shared/admin/console/config/config_join.vm
index e79720a0e..e79720a0e 100644
--- a/pki/dogtag/common-ui/shared/admin/console/config/config_join.vm
+++ b/dogtag/common-ui/shared/admin/console/config/config_join.vm
diff --git a/pki/dogtag/common-ui/shared/admin/console/config/config_rootca.vm b/dogtag/common-ui/shared/admin/console/config/config_rootca.vm
index 9647cfd32..9647cfd32 100644
--- a/pki/dogtag/common-ui/shared/admin/console/config/config_rootca.vm
+++ b/dogtag/common-ui/shared/admin/console/config/config_rootca.vm
diff --git a/pki/dogtag/common-ui/shared/admin/console/config/createsubsystempanel.vm b/dogtag/common-ui/shared/admin/console/config/createsubsystempanel.vm
index 9d3ec86b8..9d3ec86b8 100644
--- a/pki/dogtag/common-ui/shared/admin/console/config/createsubsystempanel.vm
+++ b/dogtag/common-ui/shared/admin/console/config/createsubsystempanel.vm
diff --git a/pki/dogtag/common-ui/shared/admin/console/config/databasepanel.vm b/dogtag/common-ui/shared/admin/console/config/databasepanel.vm
index 95086808b..95086808b 100644
--- a/pki/dogtag/common-ui/shared/admin/console/config/databasepanel.vm
+++ b/dogtag/common-ui/shared/admin/console/config/databasepanel.vm
diff --git a/pki/dogtag/common-ui/shared/admin/console/config/displaycertchainpanel.vm b/dogtag/common-ui/shared/admin/console/config/displaycertchainpanel.vm
index 73348189d..73348189d 100644
--- a/pki/dogtag/common-ui/shared/admin/console/config/displaycertchainpanel.vm
+++ b/dogtag/common-ui/shared/admin/console/config/displaycertchainpanel.vm
diff --git a/pki/dogtag/common-ui/shared/admin/console/config/donepanel.vm b/dogtag/common-ui/shared/admin/console/config/donepanel.vm
index 062025825..062025825 100644
--- a/pki/dogtag/common-ui/shared/admin/console/config/donepanel.vm
+++ b/dogtag/common-ui/shared/admin/console/config/donepanel.vm
diff --git a/pki/dogtag/common-ui/shared/admin/console/config/footer.vm b/dogtag/common-ui/shared/admin/console/config/footer.vm
index a596e45b1..a596e45b1 100644
--- a/pki/dogtag/common-ui/shared/admin/console/config/footer.vm
+++ b/dogtag/common-ui/shared/admin/console/config/footer.vm
diff --git a/pki/dogtag/common-ui/shared/admin/console/config/header.vm b/dogtag/common-ui/shared/admin/console/config/header.vm
index 7966ba745..7966ba745 100644
--- a/pki/dogtag/common-ui/shared/admin/console/config/header.vm
+++ b/dogtag/common-ui/shared/admin/console/config/header.vm
diff --git a/pki/dogtag/common-ui/shared/admin/console/config/hierarchypanel.vm b/dogtag/common-ui/shared/admin/console/config/hierarchypanel.vm
index 64b77a8bd..64b77a8bd 100644
--- a/pki/dogtag/common-ui/shared/admin/console/config/hierarchypanel.vm
+++ b/dogtag/common-ui/shared/admin/console/config/hierarchypanel.vm
diff --git a/pki/dogtag/common-ui/shared/admin/console/config/importadmincertpanel.vm b/dogtag/common-ui/shared/admin/console/config/importadmincertpanel.vm
index 9eea5d277..9eea5d277 100644
--- a/pki/dogtag/common-ui/shared/admin/console/config/importadmincertpanel.vm
+++ b/dogtag/common-ui/shared/admin/console/config/importadmincertpanel.vm
diff --git a/pki/dogtag/common-ui/shared/admin/console/config/importcachainpanel.vm b/dogtag/common-ui/shared/admin/console/config/importcachainpanel.vm
index f0774c5ee..f0774c5ee 100755
--- a/pki/dogtag/common-ui/shared/admin/console/config/importcachainpanel.vm
+++ b/dogtag/common-ui/shared/admin/console/config/importcachainpanel.vm
diff --git a/pki/dogtag/common-ui/shared/admin/console/config/login.vm b/dogtag/common-ui/shared/admin/console/config/login.vm
index 98a7c5bf5..98a7c5bf5 100644
--- a/pki/dogtag/common-ui/shared/admin/console/config/login.vm
+++ b/dogtag/common-ui/shared/admin/console/config/login.vm
diff --git a/pki/dogtag/common-ui/shared/admin/console/config/modulepanel.vm b/dogtag/common-ui/shared/admin/console/config/modulepanel.vm
index f0952ecbe..f0952ecbe 100644
--- a/pki/dogtag/common-ui/shared/admin/console/config/modulepanel.vm
+++ b/dogtag/common-ui/shared/admin/console/config/modulepanel.vm
diff --git a/pki/dogtag/common-ui/shared/admin/console/config/namepanel.vm b/dogtag/common-ui/shared/admin/console/config/namepanel.vm
index ef5c564e6..ef5c564e6 100644
--- a/pki/dogtag/common-ui/shared/admin/console/config/namepanel.vm
+++ b/dogtag/common-ui/shared/admin/console/config/namepanel.vm
diff --git a/pki/dogtag/common-ui/shared/admin/console/config/restorekeycertpanel.vm b/dogtag/common-ui/shared/admin/console/config/restorekeycertpanel.vm
index 8ef78bf36..8ef78bf36 100644
--- a/pki/dogtag/common-ui/shared/admin/console/config/restorekeycertpanel.vm
+++ b/dogtag/common-ui/shared/admin/console/config/restorekeycertpanel.vm
diff --git a/pki/dogtag/common-ui/shared/admin/console/config/savepkcs12panel.vm b/dogtag/common-ui/shared/admin/console/config/savepkcs12panel.vm
index de7d86467..de7d86467 100644
--- a/pki/dogtag/common-ui/shared/admin/console/config/savepkcs12panel.vm
+++ b/dogtag/common-ui/shared/admin/console/config/savepkcs12panel.vm
diff --git a/pki/dogtag/common-ui/shared/admin/console/config/securitydomainloginpanel.vm b/dogtag/common-ui/shared/admin/console/config/securitydomainloginpanel.vm
index d3c5e901b..d3c5e901b 100644
--- a/pki/dogtag/common-ui/shared/admin/console/config/securitydomainloginpanel.vm
+++ b/dogtag/common-ui/shared/admin/console/config/securitydomainloginpanel.vm
diff --git a/pki/dogtag/common-ui/shared/admin/console/config/securitydomainpanel.vm b/dogtag/common-ui/shared/admin/console/config/securitydomainpanel.vm
index 0e6a902eb..0e6a902eb 100644
--- a/pki/dogtag/common-ui/shared/admin/console/config/securitydomainpanel.vm
+++ b/dogtag/common-ui/shared/admin/console/config/securitydomainpanel.vm
diff --git a/pki/dogtag/common-ui/shared/admin/console/config/sidemenu.vm b/dogtag/common-ui/shared/admin/console/config/sidemenu.vm
index 09fe16870..09fe16870 100644
--- a/pki/dogtag/common-ui/shared/admin/console/config/sidemenu.vm
+++ b/dogtag/common-ui/shared/admin/console/config/sidemenu.vm
diff --git a/pki/dogtag/common-ui/shared/admin/console/config/sizepanel.vm b/dogtag/common-ui/shared/admin/console/config/sizepanel.vm
index ef80ecf20..ef80ecf20 100644
--- a/pki/dogtag/common-ui/shared/admin/console/config/sizepanel.vm
+++ b/dogtag/common-ui/shared/admin/console/config/sizepanel.vm
diff --git a/pki/dogtag/common-ui/shared/admin/console/config/topmenu.vm b/dogtag/common-ui/shared/admin/console/config/topmenu.vm
index 64881066f..64881066f 100644
--- a/pki/dogtag/common-ui/shared/admin/console/config/topmenu.vm
+++ b/dogtag/common-ui/shared/admin/console/config/topmenu.vm
diff --git a/pki/dogtag/common-ui/shared/admin/console/config/welcomepanel.vm b/dogtag/common-ui/shared/admin/console/config/welcomepanel.vm
index 07b0d641f..07b0d641f 100644
--- a/pki/dogtag/common-ui/shared/admin/console/config/welcomepanel.vm
+++ b/dogtag/common-ui/shared/admin/console/config/welcomepanel.vm
diff --git a/pki/dogtag/common-ui/shared/admin/console/config/wizard.vm b/dogtag/common-ui/shared/admin/console/config/wizard.vm
index 22574a970..22574a970 100644
--- a/pki/dogtag/common-ui/shared/admin/console/config/wizard.vm
+++ b/dogtag/common-ui/shared/admin/console/config/wizard.vm
diff --git a/pki/dogtag/common-ui/shared/admin/console/config/xml.vm b/dogtag/common-ui/shared/admin/console/config/xml.vm
index ee4bc2c97..ee4bc2c97 100644
--- a/pki/dogtag/common-ui/shared/admin/console/config/xml.vm
+++ b/dogtag/common-ui/shared/admin/console/config/xml.vm
diff --git a/pki/dogtag/common-ui/shared/admin/console/img/badge.png b/dogtag/common-ui/shared/admin/console/img/badge.png
index 5fe0223b5..5fe0223b5 100644
--- a/pki/dogtag/common-ui/shared/admin/console/img/badge.png
+++ b/dogtag/common-ui/shared/admin/console/img/badge.png
diff --git a/pki/dogtag/common-ui/shared/admin/console/img/bigrotation2.gif b/dogtag/common-ui/shared/admin/console/img/bigrotation2.gif
index 5bb90fd6a..5bb90fd6a 100644
--- a/pki/dogtag/common-ui/shared/admin/console/img/bigrotation2.gif
+++ b/dogtag/common-ui/shared/admin/console/img/bigrotation2.gif
diff --git a/pki/dogtag/common-ui/shared/admin/console/img/certificate.png b/dogtag/common-ui/shared/admin/console/img/certificate.png
index 2ea9f88bb..2ea9f88bb 100644
--- a/pki/dogtag/common-ui/shared/admin/console/img/certificate.png
+++ b/dogtag/common-ui/shared/admin/console/img/certificate.png
diff --git a/pki/dogtag/common-ui/shared/admin/console/img/clearpixel.gif b/dogtag/common-ui/shared/admin/console/img/clearpixel.gif
index ae710460b..ae710460b 100644
--- a/pki/dogtag/common-ui/shared/admin/console/img/clearpixel.gif
+++ b/dogtag/common-ui/shared/admin/console/img/clearpixel.gif
diff --git a/pki/dogtag/common-ui/shared/admin/console/img/favicon.ico b/dogtag/common-ui/shared/admin/console/img/favicon.ico
index efc1d33f4..efc1d33f4 100644
--- a/pki/dogtag/common-ui/shared/admin/console/img/favicon.ico
+++ b/dogtag/common-ui/shared/admin/console/img/favicon.ico
diff --git a/pki/dogtag/common-ui/shared/admin/console/img/icon-software.gif b/dogtag/common-ui/shared/admin/console/img/icon-software.gif
index dd64b485c..dd64b485c 100644
--- a/pki/dogtag/common-ui/shared/admin/console/img/icon-software.gif
+++ b/dogtag/common-ui/shared/admin/console/img/icon-software.gif
diff --git a/pki/dogtag/common-ui/shared/admin/console/img/icon_crit_update.gif b/dogtag/common-ui/shared/admin/console/img/icon_crit_update.gif
index cf3c47907..cf3c47907 100644
--- a/pki/dogtag/common-ui/shared/admin/console/img/icon_crit_update.gif
+++ b/dogtag/common-ui/shared/admin/console/img/icon_crit_update.gif
diff --git a/pki/dogtag/common-ui/shared/admin/console/img/id.png b/dogtag/common-ui/shared/admin/console/img/id.png
index 2c54191e1..2c54191e1 100644
--- a/pki/dogtag/common-ui/shared/admin/console/img/id.png
+++ b/dogtag/common-ui/shared/admin/console/img/id.png
diff --git a/pki/dogtag/common-ui/shared/admin/console/img/idkey.png b/dogtag/common-ui/shared/admin/console/img/idkey.png
index 3e27d2d05..3e27d2d05 100644
--- a/pki/dogtag/common-ui/shared/admin/console/img/idkey.png
+++ b/dogtag/common-ui/shared/admin/console/img/idkey.png
diff --git a/pki/dogtag/common-ui/shared/admin/console/img/key.png b/dogtag/common-ui/shared/admin/console/img/key.png
index db2896248..db2896248 100644
--- a/pki/dogtag/common-ui/shared/admin/console/img/key.png
+++ b/dogtag/common-ui/shared/admin/console/img/key.png
diff --git a/pki/dogtag/common-ui/shared/admin/console/img/lock.png b/dogtag/common-ui/shared/admin/console/img/lock.png
index 56be3b755..56be3b755 100644
--- a/pki/dogtag/common-ui/shared/admin/console/img/lock.png
+++ b/dogtag/common-ui/shared/admin/console/img/lock.png
diff --git a/pki/dogtag/common-ui/shared/admin/console/img/logo_header.gif b/dogtag/common-ui/shared/admin/console/img/logo_header.gif
index 573482227..573482227 100644
--- a/pki/dogtag/common-ui/shared/admin/console/img/logo_header.gif
+++ b/dogtag/common-ui/shared/admin/console/img/logo_header.gif
diff --git a/pki/dogtag/common-ui/shared/admin/console/img/no-certificate.png b/dogtag/common-ui/shared/admin/console/img/no-certificate.png
index 7d93a41c3..7d93a41c3 100644
--- a/pki/dogtag/common-ui/shared/admin/console/img/no-certificate.png
+++ b/dogtag/common-ui/shared/admin/console/img/no-certificate.png
diff --git a/pki/dogtag/common-ui/shared/admin/console/img/rootca.gif b/dogtag/common-ui/shared/admin/console/img/rootca.gif
index 303e25c10..303e25c10 100644
--- a/pki/dogtag/common-ui/shared/admin/console/img/rootca.gif
+++ b/dogtag/common-ui/shared/admin/console/img/rootca.gif
diff --git a/pki/dogtag/common-ui/shared/admin/console/img/sub.gif b/dogtag/common-ui/shared/admin/console/img/sub.gif
index e4cca8384..e4cca8384 100644
--- a/pki/dogtag/common-ui/shared/admin/console/img/sub.gif
+++ b/dogtag/common-ui/shared/admin/console/img/sub.gif
diff --git a/pki/dogtag/common-ui/shared/admin/console/js/misc.js b/dogtag/common-ui/shared/admin/console/js/misc.js
index d4dc336ab..d4dc336ab 100644
--- a/pki/dogtag/common-ui/shared/admin/console/js/misc.js
+++ b/dogtag/common-ui/shared/admin/console/js/misc.js
diff --git a/pki/dogtag/common-ui/shared/css/pki-360.css b/dogtag/common-ui/shared/css/pki-360.css
index bdcd7ed3b..bdcd7ed3b 100644
--- a/pki/dogtag/common-ui/shared/css/pki-360.css
+++ b/dogtag/common-ui/shared/css/pki-360.css
diff --git a/pki/dogtag/common-ui/shared/css/pki-base.css b/dogtag/common-ui/shared/css/pki-base.css
index 1892b75dc..1892b75dc 100644
--- a/pki/dogtag/common-ui/shared/css/pki-base.css
+++ b/dogtag/common-ui/shared/css/pki-base.css
diff --git a/pki/dogtag/common-ui/shared/css/pki.css b/dogtag/common-ui/shared/css/pki.css
index 8149eccf4..8149eccf4 100644
--- a/pki/dogtag/common-ui/shared/css/pki.css
+++ b/dogtag/common-ui/shared/css/pki.css
diff --git a/pki/dogtag/common-ui/shared/img/favicon.ico b/dogtag/common-ui/shared/img/favicon.ico
index efc1d33f4..efc1d33f4 100644
--- a/pki/dogtag/common-ui/shared/img/favicon.ico
+++ b/dogtag/common-ui/shared/img/favicon.ico
diff --git a/pki/dogtag/common-ui/shared/img/logo_header.gif b/dogtag/common-ui/shared/img/logo_header.gif
index 573482227..573482227 100644
--- a/pki/dogtag/common-ui/shared/img/logo_header.gif
+++ b/dogtag/common-ui/shared/img/logo_header.gif
diff --git a/pki/dogtag/console-ui/CMakeLists.txt b/dogtag/console-ui/CMakeLists.txt
index fcb7bf40e..fcb7bf40e 100644
--- a/pki/dogtag/console-ui/CMakeLists.txt
+++ b/dogtag/console-ui/CMakeLists.txt
diff --git a/pki/dogtag/console-ui/LICENSE b/dogtag/console-ui/LICENSE
index e281f4362..e281f4362 100644
--- a/pki/dogtag/console-ui/LICENSE
+++ b/dogtag/console-ui/LICENSE
diff --git a/pki/dogtag/console-ui/build.xml b/dogtag/console-ui/build.xml
index a472d1782..a472d1782 100644
--- a/pki/dogtag/console-ui/build.xml
+++ b/dogtag/console-ui/build.xml
diff --git a/pki/dogtag/console-ui/build_dogtag b/dogtag/console-ui/build_dogtag
index 5cfa1424c..5cfa1424c 100755
--- a/pki/dogtag/console-ui/build_dogtag
+++ b/dogtag/console-ui/build_dogtag
diff --git a/pki/dogtag/console-ui/dogtag-pki-console-ui.spec b/dogtag/console-ui/dogtag-pki-console-ui.spec
index d33ea016c..d33ea016c 100644
--- a/pki/dogtag/console-ui/dogtag-pki-console-ui.spec
+++ b/dogtag/console-ui/dogtag-pki-console-ui.spec
diff --git a/pki/dogtag/console-ui/src/CMSAdminRS.properties b/dogtag/console-ui/src/CMSAdminRS.properties
index e42104937..e42104937 100644
--- a/pki/dogtag/console-ui/src/CMSAdminRS.properties
+++ b/dogtag/console-ui/src/CMSAdminRS.properties
diff --git a/pki/dogtag/console-ui/src/CMakeLists.txt b/dogtag/console-ui/src/CMakeLists.txt
index bc8995a12..bc8995a12 100644
--- a/pki/dogtag/console-ui/src/CMakeLists.txt
+++ b/dogtag/console-ui/src/CMakeLists.txt
diff --git a/pki/dogtag/console-ui/src/com/netscape/admin/certsrv/theme/certmgmt.gif b/dogtag/console-ui/src/com/netscape/admin/certsrv/theme/certmgmt.gif
index e3ad6ab94..e3ad6ab94 100644
--- a/pki/dogtag/console-ui/src/com/netscape/admin/certsrv/theme/certmgmt.gif
+++ b/dogtag/console-ui/src/com/netscape/admin/certsrv/theme/certmgmt.gif
diff --git a/pki/dogtag/console-ui/src/com/netscape/management/client/theme/images/ConsoleBanner.gif b/dogtag/console-ui/src/com/netscape/management/client/theme/images/ConsoleBanner.gif
index e3ad6ab94..e3ad6ab94 100644
--- a/pki/dogtag/console-ui/src/com/netscape/management/client/theme/images/ConsoleBanner.gif
+++ b/dogtag/console-ui/src/com/netscape/management/client/theme/images/ConsoleBanner.gif
diff --git a/pki/dogtag/console-ui/src/com/netscape/management/client/theme/images/login.gif b/dogtag/console-ui/src/com/netscape/management/client/theme/images/login.gif
index 84e3b08b8..84e3b08b8 100644
--- a/pki/dogtag/console-ui/src/com/netscape/management/client/theme/images/login.gif
+++ b/dogtag/console-ui/src/com/netscape/management/client/theme/images/login.gif
diff --git a/pki/dogtag/console-ui/src/com/netscape/management/client/theme/images/logo16.gif b/dogtag/console-ui/src/com/netscape/management/client/theme/images/logo16.gif
index 3ab1a1eb0..3ab1a1eb0 100644
--- a/pki/dogtag/console-ui/src/com/netscape/management/client/theme/images/logo16.gif
+++ b/dogtag/console-ui/src/com/netscape/management/client/theme/images/logo16.gif
diff --git a/pki/dogtag/console-ui/src/com/netscape/management/client/theme/images/logo32.gif b/dogtag/console-ui/src/com/netscape/management/client/theme/images/logo32.gif
index 859200f0e..859200f0e 100644
--- a/pki/dogtag/console-ui/src/com/netscape/management/client/theme/images/logo32.gif
+++ b/dogtag/console-ui/src/com/netscape/management/client/theme/images/logo32.gif
diff --git a/pki/dogtag/console-ui/src/com/netscape/management/client/theme/theme.properties b/dogtag/console-ui/src/com/netscape/management/client/theme/theme.properties
index c1902c66a..c1902c66a 100644
--- a/pki/dogtag/console-ui/src/com/netscape/management/client/theme/theme.properties
+++ b/dogtag/console-ui/src/com/netscape/management/client/theme/theme.properties
diff --git a/pki/dogtag/kra-ui/CMakeLists.txt b/dogtag/kra-ui/CMakeLists.txt
index 0079e5286..0079e5286 100644
--- a/pki/dogtag/kra-ui/CMakeLists.txt
+++ b/dogtag/kra-ui/CMakeLists.txt
diff --git a/pki/dogtag/kra-ui/LICENSE b/dogtag/kra-ui/LICENSE
index e281f4362..e281f4362 100644
--- a/pki/dogtag/kra-ui/LICENSE
+++ b/dogtag/kra-ui/LICENSE
diff --git a/pki/dogtag/kra-ui/build.xml b/dogtag/kra-ui/build.xml
index 7826cc485..7826cc485 100644
--- a/pki/dogtag/kra-ui/build.xml
+++ b/dogtag/kra-ui/build.xml
diff --git a/pki/dogtag/kra-ui/build_dogtag b/dogtag/kra-ui/build_dogtag
index 74e9bc860..74e9bc860 100755
--- a/pki/dogtag/kra-ui/build_dogtag
+++ b/dogtag/kra-ui/build_dogtag
diff --git a/pki/dogtag/kra-ui/dogtag-pki-kra-ui.spec b/dogtag/kra-ui/dogtag-pki-kra-ui.spec
index 274d1ec76..274d1ec76 100644
--- a/pki/dogtag/kra-ui/dogtag-pki-kra-ui.spec
+++ b/dogtag/kra-ui/dogtag-pki-kra-ui.spec
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/404.html b/dogtag/kra-ui/shared/webapps/kra/404.html
index 2e7e59cdd..2e7e59cdd 100755
--- a/pki/dogtag/kra-ui/shared/webapps/kra/404.html
+++ b/dogtag/kra-ui/shared/webapps/kra/404.html
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/500.html b/dogtag/kra-ui/shared/webapps/kra/500.html
index 224cec1c8..224cec1c8 100755
--- a/pki/dogtag/kra-ui/shared/webapps/kra/500.html
+++ b/dogtag/kra-ui/shared/webapps/kra/500.html
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/GenUnexpectedError.template b/dogtag/kra-ui/shared/webapps/kra/GenUnexpectedError.template
index a6ec193bc..a6ec193bc 100644
--- a/pki/dogtag/kra-ui/shared/webapps/kra/GenUnexpectedError.template
+++ b/dogtag/kra-ui/shared/webapps/kra/GenUnexpectedError.template
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/GenError.template b/dogtag/kra-ui/shared/webapps/kra/agent/GenError.template
index 2ecb08cf5..2ecb08cf5 100644
--- a/pki/dogtag/kra-ui/shared/webapps/kra/agent/GenError.template
+++ b/dogtag/kra-ui/shared/webapps/kra/agent/GenError.template
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/GenPending.template b/dogtag/kra-ui/shared/webapps/kra/agent/GenPending.template
index 62d4316b1..62d4316b1 100644
--- a/pki/dogtag/kra-ui/shared/webapps/kra/agent/GenPending.template
+++ b/dogtag/kra-ui/shared/webapps/kra/agent/GenPending.template
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/GenRejected.template b/dogtag/kra-ui/shared/webapps/kra/agent/GenRejected.template
index d6c67f2c4..d6c67f2c4 100644
--- a/pki/dogtag/kra-ui/shared/webapps/kra/agent/GenRejected.template
+++ b/dogtag/kra-ui/shared/webapps/kra/agent/GenRejected.template
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/GenSuccess.template b/dogtag/kra-ui/shared/webapps/kra/agent/GenSuccess.template
index dc3a9775f..dc3a9775f 100644
--- a/pki/dogtag/kra-ui/shared/webapps/kra/agent/GenSuccess.template
+++ b/dogtag/kra-ui/shared/webapps/kra/agent/GenSuccess.template
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/GenSvcPending.template b/dogtag/kra-ui/shared/webapps/kra/agent/GenSvcPending.template
index 66a524912..66a524912 100644
--- a/pki/dogtag/kra-ui/shared/webapps/kra/agent/GenSvcPending.template
+++ b/dogtag/kra-ui/shared/webapps/kra/agent/GenSvcPending.template
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/GenUnauthorized.template b/dogtag/kra-ui/shared/webapps/kra/agent/GenUnauthorized.template
index fc137d06b..fc137d06b 100644
--- a/pki/dogtag/kra-ui/shared/webapps/kra/agent/GenUnauthorized.template
+++ b/dogtag/kra-ui/shared/webapps/kra/agent/GenUnauthorized.template
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/GenUnexpectedError.template b/dogtag/kra-ui/shared/webapps/kra/agent/GenUnexpectedError.template
index 0af3aa15d..0af3aa15d 100644
--- a/pki/dogtag/kra-ui/shared/webapps/kra/agent/GenUnexpectedError.template
+++ b/dogtag/kra-ui/shared/webapps/kra/agent/GenUnexpectedError.template
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/cms-funcs.js b/dogtag/kra-ui/shared/webapps/kra/agent/cms-funcs.js
index c8ffd51c7..c8ffd51c7 100644
--- a/pki/dogtag/kra-ui/shared/webapps/kra/agent/cms-funcs.js
+++ b/dogtag/kra-ui/shared/webapps/kra/agent/cms-funcs.js
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/funcs.js b/dogtag/kra-ui/shared/webapps/kra/agent/funcs.js
index daef83d17..daef83d17 100644
--- a/pki/dogtag/kra-ui/shared/webapps/kra/agent/funcs.js
+++ b/dogtag/kra-ui/shared/webapps/kra/agent/funcs.js
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/graphics/dgLeftTab.gif b/dogtag/kra-ui/shared/webapps/kra/agent/graphics/dgLeftTab.gif
index 35a76c859..35a76c859 100644
--- a/pki/dogtag/kra-ui/shared/webapps/kra/agent/graphics/dgLeftTab.gif
+++ b/dogtag/kra-ui/shared/webapps/kra/agent/graphics/dgLeftTab.gif
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/graphics/dgRightTab.gif b/dogtag/kra-ui/shared/webapps/kra/agent/graphics/dgRightTab.gif
index a519bc759..a519bc759 100644
--- a/pki/dogtag/kra-ui/shared/webapps/kra/agent/graphics/dgRightTab.gif
+++ b/dogtag/kra-ui/shared/webapps/kra/agent/graphics/dgRightTab.gif
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/graphics/favicon.ico b/dogtag/kra-ui/shared/webapps/kra/agent/graphics/favicon.ico
index efc1d33f4..efc1d33f4 100644
--- a/pki/dogtag/kra-ui/shared/webapps/kra/agent/graphics/favicon.ico
+++ b/dogtag/kra-ui/shared/webapps/kra/agent/graphics/favicon.ico
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/graphics/goto-tall.gif b/dogtag/kra-ui/shared/webapps/kra/agent/graphics/goto-tall.gif
index 6eea3ef5c..6eea3ef5c 100644
--- a/pki/dogtag/kra-ui/shared/webapps/kra/agent/graphics/goto-tall.gif
+++ b/dogtag/kra-ui/shared/webapps/kra/agent/graphics/goto-tall.gif
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/graphics/gray90.gif b/dogtag/kra-ui/shared/webapps/kra/agent/graphics/gray90.gif
index c6f811102..c6f811102 100644
--- a/pki/dogtag/kra-ui/shared/webapps/kra/agent/graphics/gray90.gif
+++ b/dogtag/kra-ui/shared/webapps/kra/agent/graphics/gray90.gif
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/graphics/hr.gif b/dogtag/kra-ui/shared/webapps/kra/agent/graphics/hr.gif
index 14f8acf92..14f8acf92 100644
--- a/pki/dogtag/kra-ui/shared/webapps/kra/agent/graphics/hr.gif
+++ b/dogtag/kra-ui/shared/webapps/kra/agent/graphics/hr.gif
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/graphics/lgLeftTab.gif b/dogtag/kra-ui/shared/webapps/kra/agent/graphics/lgLeftTab.gif
index a78fbc89d..a78fbc89d 100644
--- a/pki/dogtag/kra-ui/shared/webapps/kra/agent/graphics/lgLeftTab.gif
+++ b/dogtag/kra-ui/shared/webapps/kra/agent/graphics/lgLeftTab.gif
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/graphics/lgRightTab.gif b/dogtag/kra-ui/shared/webapps/kra/agent/graphics/lgRightTab.gif
index 71852402d..71852402d 100644
--- a/pki/dogtag/kra-ui/shared/webapps/kra/agent/graphics/lgRightTab.gif
+++ b/dogtag/kra-ui/shared/webapps/kra/agent/graphics/lgRightTab.gif
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/graphics/logo_header.gif b/dogtag/kra-ui/shared/webapps/kra/agent/graphics/logo_header.gif
index 573482227..573482227 100644
--- a/pki/dogtag/kra-ui/shared/webapps/kra/agent/graphics/logo_header.gif
+++ b/dogtag/kra-ui/shared/webapps/kra/agent/graphics/logo_header.gif
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/graphics/spacer.gif b/dogtag/kra-ui/shared/webapps/kra/agent/graphics/spacer.gif
index 13acffe53..13acffe53 100644
--- a/pki/dogtag/kra-ui/shared/webapps/kra/agent/graphics/spacer.gif
+++ b/dogtag/kra-ui/shared/webapps/kra/agent/graphics/spacer.gif
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/header.template b/dogtag/kra-ui/shared/webapps/kra/agent/header.template
index 0de93919a..0de93919a 100644
--- a/pki/dogtag/kra-ui/shared/webapps/kra/agent/header.template
+++ b/dogtag/kra-ui/shared/webapps/kra/agent/header.template
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/helpfun.js b/dogtag/kra-ui/shared/webapps/kra/agent/helpfun.js
index 14a80bb95..14a80bb95 100644
--- a/pki/dogtag/kra-ui/shared/webapps/kra/agent/helpfun.js
+++ b/dogtag/kra-ui/shared/webapps/kra/agent/helpfun.js
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/index.html b/dogtag/kra-ui/shared/webapps/kra/agent/index.html
index 30662d47a..30662d47a 100644
--- a/pki/dogtag/kra-ui/shared/webapps/kra/agent/index.html
+++ b/dogtag/kra-ui/shared/webapps/kra/agent/index.html
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/index.template b/dogtag/kra-ui/shared/webapps/kra/agent/index.template
index 2a6c6b972..2a6c6b972 100644
--- a/pki/dogtag/kra-ui/shared/webapps/kra/agent/index.template
+++ b/dogtag/kra-ui/shared/webapps/kra/agent/index.template
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/GrantRecovery.html b/dogtag/kra-ui/shared/webapps/kra/agent/kra/GrantRecovery.html
index 225bbdb30..225bbdb30 100644
--- a/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/GrantRecovery.html
+++ b/dogtag/kra-ui/shared/webapps/kra/agent/kra/GrantRecovery.html
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/ListRequests.html b/dogtag/kra-ui/shared/webapps/kra/agent/kra/ListRequests.html
index 11c1b5ef8..11c1b5ef8 100644
--- a/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/ListRequests.html
+++ b/dogtag/kra-ui/shared/webapps/kra/agent/kra/ListRequests.html
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/SrchKey.html b/dogtag/kra-ui/shared/webapps/kra/agent/kra/SrchKey.html
index 685405465..685405465 100644
--- a/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/SrchKey.html
+++ b/dogtag/kra-ui/shared/webapps/kra/agent/kra/SrchKey.html
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/SrchRecoverKey.html b/dogtag/kra-ui/shared/webapps/kra/agent/kra/SrchRecoverKey.html
index f4de8ca1f..f4de8ca1f 100644
--- a/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/SrchRecoverKey.html
+++ b/dogtag/kra-ui/shared/webapps/kra/agent/kra/SrchRecoverKey.html
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/blank.html b/dogtag/kra-ui/shared/webapps/kra/agent/kra/blank.html
index d2c04a676..d2c04a676 100644
--- a/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/blank.html
+++ b/dogtag/kra-ui/shared/webapps/kra/agent/kra/blank.html
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/confirmRecover.html b/dogtag/kra-ui/shared/webapps/kra/agent/kra/confirmRecover.html
index 94df8b7f7..94df8b7f7 100644
--- a/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/confirmRecover.html
+++ b/dogtag/kra-ui/shared/webapps/kra/agent/kra/confirmRecover.html
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/confirmRecoverBySerial.template b/dogtag/kra-ui/shared/webapps/kra/agent/kra/confirmRecoverBySerial.template
index 88a8d5c84..88a8d5c84 100644
--- a/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/confirmRecoverBySerial.template
+++ b/dogtag/kra-ui/shared/webapps/kra/agent/kra/confirmRecoverBySerial.template
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/displayBySerial.template b/dogtag/kra-ui/shared/webapps/kra/agent/kra/displayBySerial.template
index a88599ede..a88599ede 100644
--- a/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/displayBySerial.template
+++ b/dogtag/kra-ui/shared/webapps/kra/agent/kra/displayBySerial.template
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/displayBySerial2.template b/dogtag/kra-ui/shared/webapps/kra/agent/kra/displayBySerial2.template
index 332d205c2..332d205c2 100644
--- a/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/displayBySerial2.template
+++ b/dogtag/kra-ui/shared/webapps/kra/agent/kra/displayBySerial2.template
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/displayBySerialForRecovery.template b/dogtag/kra-ui/shared/webapps/kra/agent/kra/displayBySerialForRecovery.template
index 717d1d7d6..717d1d7d6 100644
--- a/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/displayBySerialForRecovery.template
+++ b/dogtag/kra-ui/shared/webapps/kra/agent/kra/displayBySerialForRecovery.template
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/examineRecovery.template b/dogtag/kra-ui/shared/webapps/kra/agent/kra/examineRecovery.template
index 240f7e9e4..240f7e9e4 100644
--- a/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/examineRecovery.template
+++ b/dogtag/kra-ui/shared/webapps/kra/agent/kra/examineRecovery.template
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/finishAsyncRecovery.template b/dogtag/kra-ui/shared/webapps/kra/agent/kra/finishAsyncRecovery.template
index 0d2caf676..0d2caf676 100644
--- a/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/finishAsyncRecovery.template
+++ b/dogtag/kra-ui/shared/webapps/kra/agent/kra/finishAsyncRecovery.template
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/finishRecovery.template b/dogtag/kra-ui/shared/webapps/kra/agent/kra/finishRecovery.template
index e73a26237..e73a26237 100644
--- a/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/finishRecovery.template
+++ b/dogtag/kra-ui/shared/webapps/kra/agent/kra/finishRecovery.template
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/frameGrant.html b/dogtag/kra-ui/shared/webapps/kra/agent/kra/frameGrant.html
index 14b3ced02..14b3ced02 100644
--- a/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/frameGrant.html
+++ b/dogtag/kra-ui/shared/webapps/kra/agent/kra/frameGrant.html
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/frameRecover.html b/dogtag/kra-ui/shared/webapps/kra/agent/kra/frameRecover.html
index 60cd76f41..60cd76f41 100644
--- a/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/frameRecover.html
+++ b/dogtag/kra-ui/shared/webapps/kra/agent/kra/frameRecover.html
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/frameRequest.html b/dogtag/kra-ui/shared/webapps/kra/agent/kra/frameRequest.html
index ae544e34b..ae544e34b 100644
--- a/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/frameRequest.html
+++ b/dogtag/kra-ui/shared/webapps/kra/agent/kra/frameRequest.html
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/frameSearch.html b/dogtag/kra-ui/shared/webapps/kra/agent/kra/frameSearch.html
index a48fee2e6..a48fee2e6 100644
--- a/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/frameSearch.html
+++ b/dogtag/kra-ui/shared/webapps/kra/agent/kra/frameSearch.html
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/frameStats.html b/dogtag/kra-ui/shared/webapps/kra/agent/kra/frameStats.html
index 57a24de47..57a24de47 100644
--- a/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/frameStats.html
+++ b/dogtag/kra-ui/shared/webapps/kra/agent/kra/frameStats.html
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/getApprovalStatus.template b/dogtag/kra-ui/shared/webapps/kra/agent/kra/getApprovalStatus.template
index 5a6a1114a..5a6a1114a 100644
--- a/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/getApprovalStatus.template
+++ b/dogtag/kra-ui/shared/webapps/kra/agent/kra/getApprovalStatus.template
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/getStats.template b/dogtag/kra-ui/shared/webapps/kra/agent/kra/getStats.template
index cfd2f3193..cfd2f3193 100644
--- a/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/getStats.template
+++ b/dogtag/kra-ui/shared/webapps/kra/agent/kra/getStats.template
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/grantAsyncRecovery.template b/dogtag/kra-ui/shared/webapps/kra/agent/kra/grantAsyncRecovery.template
index c76e61ac4..c76e61ac4 100644
--- a/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/grantAsyncRecovery.template
+++ b/dogtag/kra-ui/shared/webapps/kra/agent/kra/grantAsyncRecovery.template
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/grantRecovery.template b/dogtag/kra-ui/shared/webapps/kra/agent/kra/grantRecovery.template
index 906da8338..906da8338 100644
--- a/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/grantRecovery.template
+++ b/dogtag/kra-ui/shared/webapps/kra/agent/kra/grantRecovery.template
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/index.html b/dogtag/kra-ui/shared/webapps/kra/agent/kra/index.html
index 3ca0f8959..3ca0f8959 100644
--- a/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/index.html
+++ b/dogtag/kra-ui/shared/webapps/kra/agent/kra/index.html
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/menuCheck.html b/dogtag/kra-ui/shared/webapps/kra/agent/kra/menuCheck.html
index 0787f104c..0787f104c 100644
--- a/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/menuCheck.html
+++ b/dogtag/kra-ui/shared/webapps/kra/agent/kra/menuCheck.html
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/menuGrant.html b/dogtag/kra-ui/shared/webapps/kra/agent/kra/menuGrant.html
index 594dfaf06..594dfaf06 100644
--- a/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/menuGrant.html
+++ b/dogtag/kra-ui/shared/webapps/kra/agent/kra/menuGrant.html
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/menuRecover.html b/dogtag/kra-ui/shared/webapps/kra/agent/kra/menuRecover.html
index 1439917d4..1439917d4 100644
--- a/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/menuRecover.html
+++ b/dogtag/kra-ui/shared/webapps/kra/agent/kra/menuRecover.html
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/menuRequest.html b/dogtag/kra-ui/shared/webapps/kra/agent/kra/menuRequest.html
index 69a5300a6..69a5300a6 100644
--- a/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/menuRequest.html
+++ b/dogtag/kra-ui/shared/webapps/kra/agent/kra/menuRequest.html
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/menuSearch.html b/dogtag/kra-ui/shared/webapps/kra/agent/kra/menuSearch.html
index e3f23d53f..e3f23d53f 100644
--- a/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/menuSearch.html
+++ b/dogtag/kra-ui/shared/webapps/kra/agent/kra/menuSearch.html
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/menuStats.html b/dogtag/kra-ui/shared/webapps/kra/agent/kra/menuStats.html
index 2d132b185..2d132b185 100644
--- a/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/menuStats.html
+++ b/dogtag/kra-ui/shared/webapps/kra/agent/kra/menuStats.html
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/monitor.template b/dogtag/kra-ui/shared/webapps/kra/agent/kra/monitor.template
index 27fa7f84a..27fa7f84a 100644
--- a/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/monitor.template
+++ b/dogtag/kra-ui/shared/webapps/kra/agent/kra/monitor.template
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/processReq.template b/dogtag/kra-ui/shared/webapps/kra/agent/kra/processReq.template
index a5292102d..a5292102d 100644
--- a/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/processReq.template
+++ b/dogtag/kra-ui/shared/webapps/kra/agent/kra/processReq.template
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/queryKey.template b/dogtag/kra-ui/shared/webapps/kra/agent/kra/queryKey.template
index 0bea5f140..0bea5f140 100644
--- a/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/queryKey.template
+++ b/dogtag/kra-ui/shared/webapps/kra/agent/kra/queryKey.template
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/queryKeyForRecovery.template b/dogtag/kra-ui/shared/webapps/kra/agent/kra/queryKeyForRecovery.template
index 09e873377..09e873377 100644
--- a/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/queryKeyForRecovery.template
+++ b/dogtag/kra-ui/shared/webapps/kra/agent/kra/queryKeyForRecovery.template
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/queryReq.template b/dogtag/kra-ui/shared/webapps/kra/agent/kra/queryReq.template
index 47db884fa..47db884fa 100644
--- a/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/queryReq.template
+++ b/dogtag/kra-ui/shared/webapps/kra/agent/kra/queryReq.template
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/recoverBySerial.template b/dogtag/kra-ui/shared/webapps/kra/agent/kra/recoverBySerial.template
index a1209f32b..a1209f32b 100644
--- a/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/recoverBySerial.template
+++ b/dogtag/kra-ui/shared/webapps/kra/agent/kra/recoverBySerial.template
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/srchKey.template b/dogtag/kra-ui/shared/webapps/kra/agent/kra/srchKey.template
index a06999996..a06999996 100644
--- a/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/srchKey.template
+++ b/dogtag/kra-ui/shared/webapps/kra/agent/kra/srchKey.template
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/srchKeyForRecovery.template b/dogtag/kra-ui/shared/webapps/kra/agent/kra/srchKeyForRecovery.template
index 4c5387c32..4c5387c32 100644
--- a/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/srchKeyForRecovery.template
+++ b/dogtag/kra-ui/shared/webapps/kra/agent/kra/srchKeyForRecovery.template
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/top.html b/dogtag/kra-ui/shared/webapps/kra/agent/kra/top.html
index 5e7a2a40e..5e7a2a40e 100644
--- a/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/top.html
+++ b/dogtag/kra-ui/shared/webapps/kra/agent/kra/top.html
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/index.html b/dogtag/kra-ui/shared/webapps/kra/index.html
index 30662d47a..30662d47a 100644
--- a/pki/dogtag/kra-ui/shared/webapps/kra/index.html
+++ b/dogtag/kra-ui/shared/webapps/kra/index.html
diff --git a/pki/dogtag/kra-ui/shared/webapps/kra/services.template b/dogtag/kra-ui/shared/webapps/kra/services.template
index e28887b70..e28887b70 100644
--- a/pki/dogtag/kra-ui/shared/webapps/kra/services.template
+++ b/dogtag/kra-ui/shared/webapps/kra/services.template
diff --git a/pki/dogtag/ocsp-ui/CMakeLists.txt b/dogtag/ocsp-ui/CMakeLists.txt
index 5a40de3d5..5a40de3d5 100644
--- a/pki/dogtag/ocsp-ui/CMakeLists.txt
+++ b/dogtag/ocsp-ui/CMakeLists.txt
diff --git a/pki/dogtag/ocsp-ui/LICENSE b/dogtag/ocsp-ui/LICENSE
index e281f4362..e281f4362 100644
--- a/pki/dogtag/ocsp-ui/LICENSE
+++ b/dogtag/ocsp-ui/LICENSE
diff --git a/pki/dogtag/ocsp-ui/build.xml b/dogtag/ocsp-ui/build.xml
index babdbcae6..babdbcae6 100644
--- a/pki/dogtag/ocsp-ui/build.xml
+++ b/dogtag/ocsp-ui/build.xml
diff --git a/pki/dogtag/ocsp-ui/build_dogtag b/dogtag/ocsp-ui/build_dogtag
index 27066ed2b..27066ed2b 100755
--- a/pki/dogtag/ocsp-ui/build_dogtag
+++ b/dogtag/ocsp-ui/build_dogtag
diff --git a/pki/dogtag/ocsp-ui/dogtag-pki-ocsp-ui.spec b/dogtag/ocsp-ui/dogtag-pki-ocsp-ui.spec
index 5ea461007..5ea461007 100644
--- a/pki/dogtag/ocsp-ui/dogtag-pki-ocsp-ui.spec
+++ b/dogtag/ocsp-ui/dogtag-pki-ocsp-ui.spec
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/404.html b/dogtag/ocsp-ui/shared/webapps/ocsp/404.html
index a337de323..a337de323 100755
--- a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/404.html
+++ b/dogtag/ocsp-ui/shared/webapps/ocsp/404.html
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/500.html b/dogtag/ocsp-ui/shared/webapps/ocsp/500.html
index 1e7fbb43a..1e7fbb43a 100755
--- a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/500.html
+++ b/dogtag/ocsp-ui/shared/webapps/ocsp/500.html
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/GenUnexpectedError.template b/dogtag/ocsp-ui/shared/webapps/ocsp/GenUnexpectedError.template
index b78424626..b78424626 100644
--- a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/GenUnexpectedError.template
+++ b/dogtag/ocsp-ui/shared/webapps/ocsp/GenUnexpectedError.template
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenError.template b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenError.template
index c2b45826e..c2b45826e 100644
--- a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenError.template
+++ b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenError.template
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenPending.template b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenPending.template
index 9264d1bd0..9264d1bd0 100644
--- a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenPending.template
+++ b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenPending.template
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenRejected.template b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenRejected.template
index 5e5155541..5e5155541 100644
--- a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenRejected.template
+++ b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenRejected.template
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenSuccess.template b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenSuccess.template
index 9d9022b2b..9d9022b2b 100644
--- a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenSuccess.template
+++ b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenSuccess.template
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenSvcPending.template b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenSvcPending.template
index 248f3e592..248f3e592 100644
--- a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenSvcPending.template
+++ b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenSvcPending.template
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenUnauthorized.template b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenUnauthorized.template
index af2aede06..af2aede06 100644
--- a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenUnauthorized.template
+++ b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenUnauthorized.template
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenUnexpectedError.template b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenUnexpectedError.template
index d68d10a19..d68d10a19 100644
--- a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenUnexpectedError.template
+++ b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenUnexpectedError.template
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/cms-funcs.js b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/cms-funcs.js
index 473fb1795..473fb1795 100644
--- a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/cms-funcs.js
+++ b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/cms-funcs.js
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/funcs.js b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/funcs.js
index daef83d17..daef83d17 100644
--- a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/funcs.js
+++ b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/funcs.js
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/graphics/dgLeftTab.gif b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/graphics/dgLeftTab.gif
index 35a76c859..35a76c859 100644
--- a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/graphics/dgLeftTab.gif
+++ b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/graphics/dgLeftTab.gif
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/graphics/dgRightTab.gif b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/graphics/dgRightTab.gif
index a519bc759..a519bc759 100644
--- a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/graphics/dgRightTab.gif
+++ b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/graphics/dgRightTab.gif
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/graphics/favicon.ico b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/graphics/favicon.ico
index efc1d33f4..efc1d33f4 100644
--- a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/graphics/favicon.ico
+++ b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/graphics/favicon.ico
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/graphics/goto-tall.gif b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/graphics/goto-tall.gif
index 6eea3ef5c..6eea3ef5c 100644
--- a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/graphics/goto-tall.gif
+++ b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/graphics/goto-tall.gif
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/graphics/gray90.gif b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/graphics/gray90.gif
index c6f811102..c6f811102 100644
--- a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/graphics/gray90.gif
+++ b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/graphics/gray90.gif
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/graphics/hr.gif b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/graphics/hr.gif
index 14f8acf92..14f8acf92 100644
--- a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/graphics/hr.gif
+++ b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/graphics/hr.gif
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/graphics/lgLeftTab.gif b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/graphics/lgLeftTab.gif
index a78fbc89d..a78fbc89d 100644
--- a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/graphics/lgLeftTab.gif
+++ b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/graphics/lgLeftTab.gif
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/graphics/lgRightTab.gif b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/graphics/lgRightTab.gif
index 71852402d..71852402d 100644
--- a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/graphics/lgRightTab.gif
+++ b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/graphics/lgRightTab.gif
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/graphics/logo_header.gif b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/graphics/logo_header.gif
index 573482227..573482227 100644
--- a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/graphics/logo_header.gif
+++ b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/graphics/logo_header.gif
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/graphics/spacer.gif b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/graphics/spacer.gif
index 13acffe53..13acffe53 100644
--- a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/graphics/spacer.gif
+++ b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/graphics/spacer.gif
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/header.template b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/header.template
index 4697e78f7..4697e78f7 100644
--- a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/header.template
+++ b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/header.template
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/helpfun.js b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/helpfun.js
index 14a80bb95..14a80bb95 100644
--- a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/helpfun.js
+++ b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/helpfun.js
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/index.html b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/index.html
index 30662d47a..30662d47a 100644
--- a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/index.html
+++ b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/index.html
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/index.template b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/index.template
index 79f6f592e..79f6f592e 100644
--- a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/index.template
+++ b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/index.template
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/AddCA.html b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/AddCA.html
index 79fe51529..79fe51529 100644
--- a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/AddCA.html
+++ b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/AddCA.html
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/AddCRL.html b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/AddCRL.html
index 98f4b0771..98f4b0771 100644
--- a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/AddCRL.html
+++ b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/AddCRL.html
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/CheckCert.html b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/CheckCert.html
index 6e614c87f..6e614c87f 100644
--- a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/CheckCert.html
+++ b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/CheckCert.html
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/addCA.template b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/addCA.template
index 5d71adca8..5d71adca8 100644
--- a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/addCA.template
+++ b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/addCA.template
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/addCRL.template b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/addCRL.template
index 12f4ce1d3..12f4ce1d3 100644
--- a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/addCRL.template
+++ b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/addCRL.template
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/checkCert.template b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/checkCert.template
index d00e15c31..d00e15c31 100644
--- a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/checkCert.template
+++ b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/checkCert.template
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/frameAddCA.html b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/frameAddCA.html
index afb888caf..afb888caf 100644
--- a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/frameAddCA.html
+++ b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/frameAddCA.html
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/frameAddCRL.html b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/frameAddCRL.html
index 28be03545..28be03545 100644
--- a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/frameAddCRL.html
+++ b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/frameAddCRL.html
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/frameCheckCert.html b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/frameCheckCert.html
index 21335c8a0..21335c8a0 100644
--- a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/frameCheckCert.html
+++ b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/frameCheckCert.html
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/frameListCA.html b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/frameListCA.html
index 90530fd42..90530fd42 100644
--- a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/frameListCA.html
+++ b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/frameListCA.html
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/frameOCSP.html b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/frameOCSP.html
index 00fad0f36..00fad0f36 100644
--- a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/frameOCSP.html
+++ b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/frameOCSP.html
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/frameStats.html b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/frameStats.html
index 8efa27a78..8efa27a78 100644
--- a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/frameStats.html
+++ b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/frameStats.html
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/getOCSPInfo.template b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/getOCSPInfo.template
index 8b739b45d..8b739b45d 100644
--- a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/getOCSPInfo.template
+++ b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/getOCSPInfo.template
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/getStats.template b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/getStats.template
index a08a6fe60..a08a6fe60 100644
--- a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/getStats.template
+++ b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/getStats.template
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/index.html b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/index.html
index cd4ea326a..cd4ea326a 100644
--- a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/index.html
+++ b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/index.html
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/listCAs.template b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/listCAs.template
index 6fbf5fd73..6fbf5fd73 100644
--- a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/listCAs.template
+++ b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/listCAs.template
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/menuAddCA.html b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/menuAddCA.html
index 6b4419f78..6b4419f78 100644
--- a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/menuAddCA.html
+++ b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/menuAddCA.html
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/menuAddCRL.html b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/menuAddCRL.html
index 7da3025e3..7da3025e3 100644
--- a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/menuAddCRL.html
+++ b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/menuAddCRL.html
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/menuCheckCert.html b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/menuCheckCert.html
index 2e4773a28..2e4773a28 100644
--- a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/menuCheckCert.html
+++ b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/menuCheckCert.html
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/menuListCA.html b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/menuListCA.html
index ac99b752a..ac99b752a 100644
--- a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/menuListCA.html
+++ b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/menuListCA.html
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/menuOCSP.html b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/menuOCSP.html
index b019fe81f..b019fe81f 100644
--- a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/menuOCSP.html
+++ b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/menuOCSP.html
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/menuStats.html b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/menuStats.html
index f86dd059e..f86dd059e 100644
--- a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/menuStats.html
+++ b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/menuStats.html
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/removeCA.template b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/removeCA.template
index 1b85bba95..1b85bba95 100755
--- a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/removeCA.template
+++ b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/removeCA.template
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ports.template b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ports.template
index c4b21fca7..c4b21fca7 100644
--- a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ports.template
+++ b/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ports.template
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/index.html b/dogtag/ocsp-ui/shared/webapps/ocsp/index.html
index 30662d47a..30662d47a 100644
--- a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/index.html
+++ b/dogtag/ocsp-ui/shared/webapps/ocsp/index.html
diff --git a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/services.template b/dogtag/ocsp-ui/shared/webapps/ocsp/services.template
index 74783cd3b..74783cd3b 100644
--- a/pki/dogtag/ocsp-ui/shared/webapps/ocsp/services.template
+++ b/dogtag/ocsp-ui/shared/webapps/ocsp/services.template
diff --git a/pki/dogtag/ra-ui/CMakeLists.txt b/dogtag/ra-ui/CMakeLists.txt
index 3bdbb46ae..3bdbb46ae 100644
--- a/pki/dogtag/ra-ui/CMakeLists.txt
+++ b/dogtag/ra-ui/CMakeLists.txt
diff --git a/pki/dogtag/ra-ui/LICENSE b/dogtag/ra-ui/LICENSE
index e281f4362..e281f4362 100644
--- a/pki/dogtag/ra-ui/LICENSE
+++ b/dogtag/ra-ui/LICENSE
diff --git a/pki/dogtag/ra-ui/build.xml b/dogtag/ra-ui/build.xml
index 512a622f8..512a622f8 100644
--- a/pki/dogtag/ra-ui/build.xml
+++ b/dogtag/ra-ui/build.xml
diff --git a/pki/dogtag/ra-ui/build_dogtag b/dogtag/ra-ui/build_dogtag
index f88e9838c..f88e9838c 100755
--- a/pki/dogtag/ra-ui/build_dogtag
+++ b/dogtag/ra-ui/build_dogtag
diff --git a/pki/dogtag/ra-ui/dogtag-pki-ra-ui.spec b/dogtag/ra-ui/dogtag-pki-ra-ui.spec
index 32e9a72a6..32e9a72a6 100644
--- a/pki/dogtag/ra-ui/dogtag-pki-ra-ui.spec
+++ b/dogtag/ra-ui/dogtag-pki-ra-ui.spec
diff --git a/pki/dogtag/ra-ui/shared/docroot/404.html b/dogtag/ra-ui/shared/docroot/404.html
index ec42699f2..ec42699f2 100755
--- a/pki/dogtag/ra-ui/shared/docroot/404.html
+++ b/dogtag/ra-ui/shared/docroot/404.html
diff --git a/pki/dogtag/ra-ui/shared/docroot/500.html b/dogtag/ra-ui/shared/docroot/500.html
index f25ba430a..f25ba430a 100755
--- a/pki/dogtag/ra-ui/shared/docroot/500.html
+++ b/dogtag/ra-ui/shared/docroot/500.html
diff --git a/pki/dogtag/ra-ui/shared/docroot/admin/group/add_new.vm b/dogtag/ra-ui/shared/docroot/admin/group/add_new.vm
index 70d0d16ac..70d0d16ac 100644
--- a/pki/dogtag/ra-ui/shared/docroot/admin/group/add_new.vm
+++ b/dogtag/ra-ui/shared/docroot/admin/group/add_new.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/admin/group/index.vm b/dogtag/ra-ui/shared/docroot/admin/group/index.vm
index 6f25e3740..6f25e3740 100644
--- a/pki/dogtag/ra-ui/shared/docroot/admin/group/index.vm
+++ b/dogtag/ra-ui/shared/docroot/admin/group/index.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/admin/group/read.vm b/dogtag/ra-ui/shared/docroot/admin/group/read.vm
index c780ab09a..c780ab09a 100644
--- a/pki/dogtag/ra-ui/shared/docroot/admin/group/read.vm
+++ b/dogtag/ra-ui/shared/docroot/admin/group/read.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/admin/index.vm b/dogtag/ra-ui/shared/docroot/admin/index.vm
index b14712e9d..b14712e9d 100644
--- a/pki/dogtag/ra-ui/shared/docroot/admin/index.vm
+++ b/dogtag/ra-ui/shared/docroot/admin/index.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/admin/user/add_new.vm b/dogtag/ra-ui/shared/docroot/admin/user/add_new.vm
index 2915c8ff3..2915c8ff3 100644
--- a/pki/dogtag/ra-ui/shared/docroot/admin/user/add_new.vm
+++ b/dogtag/ra-ui/shared/docroot/admin/user/add_new.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/admin/user/index.vm b/dogtag/ra-ui/shared/docroot/admin/user/index.vm
index a6ff73721..a6ff73721 100644
--- a/pki/dogtag/ra-ui/shared/docroot/admin/user/index.vm
+++ b/dogtag/ra-ui/shared/docroot/admin/user/index.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/admin/user/read.vm b/dogtag/ra-ui/shared/docroot/admin/user/read.vm
index 1fb6358aa..1fb6358aa 100644
--- a/pki/dogtag/ra-ui/shared/docroot/admin/user/read.vm
+++ b/dogtag/ra-ui/shared/docroot/admin/user/read.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/agent/cert/index.vm b/dogtag/ra-ui/shared/docroot/agent/cert/index.vm
index 77c73f69a..77c73f69a 100644
--- a/pki/dogtag/ra-ui/shared/docroot/agent/cert/index.vm
+++ b/dogtag/ra-ui/shared/docroot/agent/cert/index.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/agent/cert/read.vm b/dogtag/ra-ui/shared/docroot/agent/cert/read.vm
index f315dd7b0..f315dd7b0 100644
--- a/pki/dogtag/ra-ui/shared/docroot/agent/cert/read.vm
+++ b/dogtag/ra-ui/shared/docroot/agent/cert/read.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/agent/cert/revoke.vm b/dogtag/ra-ui/shared/docroot/agent/cert/revoke.vm
index 14358b485..14358b485 100644
--- a/pki/dogtag/ra-ui/shared/docroot/agent/cert/revoke.vm
+++ b/dogtag/ra-ui/shared/docroot/agent/cert/revoke.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/agent/cert/submit.vm b/dogtag/ra-ui/shared/docroot/agent/cert/submit.vm
index 6e7b90e2a..6e7b90e2a 100644
--- a/pki/dogtag/ra-ui/shared/docroot/agent/cert/submit.vm
+++ b/dogtag/ra-ui/shared/docroot/agent/cert/submit.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/agent/error.vm b/dogtag/ra-ui/shared/docroot/agent/error.vm
index 9dd0f28ad..9dd0f28ad 100644
--- a/pki/dogtag/ra-ui/shared/docroot/agent/error.vm
+++ b/dogtag/ra-ui/shared/docroot/agent/error.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/agent/index.vm b/dogtag/ra-ui/shared/docroot/agent/index.vm
index dd6b19fae..dd6b19fae 100644
--- a/pki/dogtag/ra-ui/shared/docroot/agent/index.vm
+++ b/dogtag/ra-ui/shared/docroot/agent/index.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/agent/request/index.vm b/dogtag/ra-ui/shared/docroot/agent/request/index.vm
index 5785718b3..5785718b3 100644
--- a/pki/dogtag/ra-ui/shared/docroot/agent/request/index.vm
+++ b/dogtag/ra-ui/shared/docroot/agent/request/index.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/agent/request/op.vm b/dogtag/ra-ui/shared/docroot/agent/request/op.vm
index 2d8963634..2d8963634 100644
--- a/pki/dogtag/ra-ui/shared/docroot/agent/request/op.vm
+++ b/dogtag/ra-ui/shared/docroot/agent/request/op.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/agent/request/read.vm b/dogtag/ra-ui/shared/docroot/agent/request/read.vm
index dd5879ae3..dd5879ae3 100644
--- a/pki/dogtag/ra-ui/shared/docroot/agent/request/read.vm
+++ b/dogtag/ra-ui/shared/docroot/agent/request/read.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/css/pki-360.css b/dogtag/ra-ui/shared/docroot/css/pki-360.css
index bdcd7ed3b..bdcd7ed3b 100644
--- a/pki/dogtag/ra-ui/shared/docroot/css/pki-360.css
+++ b/dogtag/ra-ui/shared/docroot/css/pki-360.css
diff --git a/pki/dogtag/ra-ui/shared/docroot/css/pki-base.css b/dogtag/ra-ui/shared/docroot/css/pki-base.css
index 1892b75dc..1892b75dc 100644
--- a/pki/dogtag/ra-ui/shared/docroot/css/pki-base.css
+++ b/dogtag/ra-ui/shared/docroot/css/pki-base.css
diff --git a/pki/dogtag/ra-ui/shared/docroot/css/pki.css b/dogtag/ra-ui/shared/docroot/css/pki.css
index 8149eccf4..8149eccf4 100644
--- a/pki/dogtag/ra-ui/shared/docroot/css/pki.css
+++ b/dogtag/ra-ui/shared/docroot/css/pki.css
diff --git a/pki/dogtag/ra-ui/shared/docroot/ee/agent/enroll.vm b/dogtag/ra-ui/shared/docroot/ee/agent/enroll.vm
index a8dacbfbe..a8dacbfbe 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ee/agent/enroll.vm
+++ b/dogtag/ra-ui/shared/docroot/ee/agent/enroll.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/ee/agent/index.vm b/dogtag/ra-ui/shared/docroot/ee/agent/index.vm
index 003ce2ca2..003ce2ca2 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ee/agent/index.vm
+++ b/dogtag/ra-ui/shared/docroot/ee/agent/index.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/ee/agent/new.vm b/dogtag/ra-ui/shared/docroot/ee/agent/new.vm
index 3cbf754b0..3cbf754b0 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ee/agent/new.vm
+++ b/dogtag/ra-ui/shared/docroot/ee/agent/new.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/ee/agent/start.vm b/dogtag/ra-ui/shared/docroot/ee/agent/start.vm
index 32adbb57f..32adbb57f 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ee/agent/start.vm
+++ b/dogtag/ra-ui/shared/docroot/ee/agent/start.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/ee/agent/submit.vm b/dogtag/ra-ui/shared/docroot/ee/agent/submit.vm
index 3bbdf9ad0..3bbdf9ad0 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ee/agent/submit.vm
+++ b/dogtag/ra-ui/shared/docroot/ee/agent/submit.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/ee/error.vm b/dogtag/ra-ui/shared/docroot/ee/error.vm
index 1ca3a37ed..1ca3a37ed 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ee/error.vm
+++ b/dogtag/ra-ui/shared/docroot/ee/error.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/ee/index.vm b/dogtag/ra-ui/shared/docroot/ee/index.vm
index c63d186c5..c63d186c5 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ee/index.vm
+++ b/dogtag/ra-ui/shared/docroot/ee/index.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/ee/request/getcert.vm b/dogtag/ra-ui/shared/docroot/ee/request/getcert.vm
index 44d5bd6b9..44d5bd6b9 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ee/request/getcert.vm
+++ b/dogtag/ra-ui/shared/docroot/ee/request/getcert.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/ee/request/index.vm b/dogtag/ra-ui/shared/docroot/ee/request/index.vm
index 003b0c8c3..003b0c8c3 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ee/request/index.vm
+++ b/dogtag/ra-ui/shared/docroot/ee/request/index.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/ee/request/status.vm b/dogtag/ra-ui/shared/docroot/ee/request/status.vm
index 0b76168ea..0b76168ea 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ee/request/status.vm
+++ b/dogtag/ra-ui/shared/docroot/ee/request/status.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/ee/scep/enroll.vm b/dogtag/ra-ui/shared/docroot/ee/scep/enroll.vm
index 0864f0aba..0864f0aba 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ee/scep/enroll.vm
+++ b/dogtag/ra-ui/shared/docroot/ee/scep/enroll.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/ee/scep/index.vm b/dogtag/ra-ui/shared/docroot/ee/scep/index.vm
index 5c5b0db1a..5c5b0db1a 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ee/scep/index.vm
+++ b/dogtag/ra-ui/shared/docroot/ee/scep/index.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/ee/scep/installer.vm b/dogtag/ra-ui/shared/docroot/ee/scep/installer.vm
index 567544495..567544495 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ee/scep/installer.vm
+++ b/dogtag/ra-ui/shared/docroot/ee/scep/installer.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/ee/scep/manager.vm b/dogtag/ra-ui/shared/docroot/ee/scep/manager.vm
index a9b0717bb..a9b0717bb 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ee/scep/manager.vm
+++ b/dogtag/ra-ui/shared/docroot/ee/scep/manager.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/ee/scep/submit.vm b/dogtag/ra-ui/shared/docroot/ee/scep/submit.vm
index 41a186a49..41a186a49 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ee/scep/submit.vm
+++ b/dogtag/ra-ui/shared/docroot/ee/scep/submit.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/ee/server/admin.vm b/dogtag/ra-ui/shared/docroot/ee/server/admin.vm
index 7307aaf50..7307aaf50 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ee/server/admin.vm
+++ b/dogtag/ra-ui/shared/docroot/ee/server/admin.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/ee/server/index.vm b/dogtag/ra-ui/shared/docroot/ee/server/index.vm
index 7d3ca76d5..7d3ca76d5 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ee/server/index.vm
+++ b/dogtag/ra-ui/shared/docroot/ee/server/index.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/ee/server/submit.vm b/dogtag/ra-ui/shared/docroot/ee/server/submit.vm
index 2afb4b891..2afb4b891 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ee/server/submit.vm
+++ b/dogtag/ra-ui/shared/docroot/ee/server/submit.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/ee/user/index.vm b/dogtag/ra-ui/shared/docroot/ee/user/index.vm
index 0a6766f1b..0a6766f1b 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ee/user/index.vm
+++ b/dogtag/ra-ui/shared/docroot/ee/user/index.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/ee/user/renew.vm b/dogtag/ra-ui/shared/docroot/ee/user/renew.vm
index e8b0c90fc..e8b0c90fc 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ee/user/renew.vm
+++ b/dogtag/ra-ui/shared/docroot/ee/user/renew.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/ee/user/renewal.vm b/dogtag/ra-ui/shared/docroot/ee/user/renewal.vm
index 592468445..592468445 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ee/user/renewal.vm
+++ b/dogtag/ra-ui/shared/docroot/ee/user/renewal.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/ee/user/submit.vm b/dogtag/ra-ui/shared/docroot/ee/user/submit.vm
index 02edb6d58..02edb6d58 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ee/user/submit.vm
+++ b/dogtag/ra-ui/shared/docroot/ee/user/submit.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/ee/user/user.vm b/dogtag/ra-ui/shared/docroot/ee/user/user.vm
index 2da3d3606..2da3d3606 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ee/user/user.vm
+++ b/dogtag/ra-ui/shared/docroot/ee/user/user.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/footer.vm b/dogtag/ra-ui/shared/docroot/footer.vm
index a596e45b1..a596e45b1 100644
--- a/pki/dogtag/ra-ui/shared/docroot/footer.vm
+++ b/dogtag/ra-ui/shared/docroot/footer.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/header.vm b/dogtag/ra-ui/shared/docroot/header.vm
index 18862497b..18862497b 100644
--- a/pki/dogtag/ra-ui/shared/docroot/header.vm
+++ b/dogtag/ra-ui/shared/docroot/header.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/images/logo_header.gif b/dogtag/ra-ui/shared/docroot/images/logo_header.gif
index 573482227..573482227 100644
--- a/pki/dogtag/ra-ui/shared/docroot/images/logo_header.gif
+++ b/dogtag/ra-ui/shared/docroot/images/logo_header.gif
diff --git a/pki/dogtag/ra-ui/shared/docroot/images/pki-icon-help.gif b/dogtag/ra-ui/shared/docroot/images/pki-icon-help.gif
index 21d9f13d6..21d9f13d6 100644
--- a/pki/dogtag/ra-ui/shared/docroot/images/pki-icon-help.gif
+++ b/dogtag/ra-ui/shared/docroot/images/pki-icon-help.gif
diff --git a/pki/dogtag/ra-ui/shared/docroot/images/pki-icon-home.gif b/dogtag/ra-ui/shared/docroot/images/pki-icon-home.gif
index ef1726b74..ef1726b74 100644
--- a/pki/dogtag/ra-ui/shared/docroot/images/pki-icon-home.gif
+++ b/dogtag/ra-ui/shared/docroot/images/pki-icon-home.gif
diff --git a/pki/dogtag/ra-ui/shared/docroot/images/pki-icon-software.gif b/dogtag/ra-ui/shared/docroot/images/pki-icon-software.gif
index dd64b485c..dd64b485c 100644
--- a/pki/dogtag/ra-ui/shared/docroot/images/pki-icon-software.gif
+++ b/dogtag/ra-ui/shared/docroot/images/pki-icon-software.gif
diff --git a/pki/dogtag/ra-ui/shared/docroot/index.vm b/dogtag/ra-ui/shared/docroot/index.vm
index 2b9677f20..2b9677f20 100644
--- a/pki/dogtag/ra-ui/shared/docroot/index.vm
+++ b/dogtag/ra-ui/shared/docroot/index.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/adminauthenticatepanel.vm b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/adminauthenticatepanel.vm
index 7d5aade5f..7d5aade5f 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/adminauthenticatepanel.vm
+++ b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/adminauthenticatepanel.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/adminpanel.vm b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/adminpanel.vm
index 36e99097b..36e99097b 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/adminpanel.vm
+++ b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/adminpanel.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/agentauthenticatepanel.vm b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/agentauthenticatepanel.vm
index 2124e7a36..2124e7a36 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/agentauthenticatepanel.vm
+++ b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/agentauthenticatepanel.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/authdbpanel.vm b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/authdbpanel.vm
index 43c0ed544..43c0ed544 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/authdbpanel.vm
+++ b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/authdbpanel.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/cainfopanel.vm b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/cainfopanel.vm
index 6bea8a184..6bea8a184 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/cainfopanel.vm
+++ b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/cainfopanel.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/certchainpanel.vm b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/certchainpanel.vm
index 08bcc1331..08bcc1331 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/certchainpanel.vm
+++ b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/certchainpanel.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/certprettyprintpanel.vm b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/certprettyprintpanel.vm
index ac8da10ee..ac8da10ee 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/certprettyprintpanel.vm
+++ b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/certprettyprintpanel.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/certrequestpanel.vm b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/certrequestpanel.vm
index 883cb6589..883cb6589 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/certrequestpanel.vm
+++ b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/certrequestpanel.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/config_addhsm.vm b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/config_addhsm.vm
index 45002f9cd..45002f9cd 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/config_addhsm.vm
+++ b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/config_addhsm.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/config_db.vm b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/config_db.vm
index 4db7b3e53..4db7b3e53 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/config_db.vm
+++ b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/config_db.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/config_hsm.vm b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/config_hsm.vm
index ac452893b..ac452893b 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/config_hsm.vm
+++ b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/config_hsm.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/config_hsmloginpanel.vm b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/config_hsmloginpanel.vm
index 46d8ae0ea..46d8ae0ea 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/config_hsmloginpanel.vm
+++ b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/config_hsmloginpanel.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/config_join.vm b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/config_join.vm
index bed838ef6..bed838ef6 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/config_join.vm
+++ b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/config_join.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/config_rootca.vm b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/config_rootca.vm
index 747024acf..747024acf 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/config_rootca.vm
+++ b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/config_rootca.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/createsubsystempanel.vm b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/createsubsystempanel.vm
index 18af9c523..18af9c523 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/createsubsystempanel.vm
+++ b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/createsubsystempanel.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/databasepanel.vm b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/databasepanel.vm
index 76c3c887d..76c3c887d 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/databasepanel.vm
+++ b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/databasepanel.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/displaycertchain2panel.vm b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/displaycertchain2panel.vm
index 068fd9283..068fd9283 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/displaycertchain2panel.vm
+++ b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/displaycertchain2panel.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/displaycertchainpanel.vm b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/displaycertchainpanel.vm
index 829ee24cb..829ee24cb 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/displaycertchainpanel.vm
+++ b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/displaycertchainpanel.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/donepanel.vm b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/donepanel.vm
index bc7ccfc01..bc7ccfc01 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/donepanel.vm
+++ b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/donepanel.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/drminfopanel.vm b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/drminfopanel.vm
index e4e6842ba..e4e6842ba 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/drminfopanel.vm
+++ b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/drminfopanel.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/footer.vm b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/footer.vm
index 22d7213ba..22d7213ba 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/footer.vm
+++ b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/footer.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/header.vm b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/header.vm
index d4cea30c2..d4cea30c2 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/header.vm
+++ b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/header.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/hierarchypanel.vm b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/hierarchypanel.vm
index bde310882..bde310882 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/hierarchypanel.vm
+++ b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/hierarchypanel.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/importadmincertpanel.vm b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/importadmincertpanel.vm
index d64d4a344..d64d4a344 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/importadmincertpanel.vm
+++ b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/importadmincertpanel.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/login.vm b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/login.vm
index dac518e9f..dac518e9f 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/login.vm
+++ b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/login.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/modulepanel.vm b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/modulepanel.vm
index cb9a1eaf8..cb9a1eaf8 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/modulepanel.vm
+++ b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/modulepanel.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/namepanel.vm b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/namepanel.vm
index 798f16598..798f16598 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/namepanel.vm
+++ b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/namepanel.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/securitydomainloginpanel.vm b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/securitydomainloginpanel.vm
index 25134303f..25134303f 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/securitydomainloginpanel.vm
+++ b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/securitydomainloginpanel.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/securitydomainpanel.vm b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/securitydomainpanel.vm
index 3bd19c520..3bd19c520 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/securitydomainpanel.vm
+++ b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/securitydomainpanel.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/sidemenu.vm b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/sidemenu.vm
index 09fe16870..09fe16870 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/sidemenu.vm
+++ b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/sidemenu.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/sizepanel.vm b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/sizepanel.vm
index b7a7a820c..b7a7a820c 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/sizepanel.vm
+++ b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/sizepanel.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/tksinfopanel.vm b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/tksinfopanel.vm
index f4cb5eb6b..f4cb5eb6b 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/tksinfopanel.vm
+++ b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/tksinfopanel.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/topmenu.vm b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/topmenu.vm
index 64881066f..64881066f 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/topmenu.vm
+++ b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/topmenu.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/welcomepanel.vm b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/welcomepanel.vm
index fd478d1a8..fd478d1a8 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/welcomepanel.vm
+++ b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/welcomepanel.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/wizard.vm b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/wizard.vm
index 6256703e3..6256703e3 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/wizard.vm
+++ b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/wizard.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/xml.vm b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/xml.vm
index 31ff72aa2..31ff72aa2 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/xml.vm
+++ b/dogtag/ra-ui/shared/docroot/ra/admin/console/config/xml.vm
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/img/badge.png b/dogtag/ra-ui/shared/docroot/ra/admin/console/img/badge.png
index 5fe0223b5..5fe0223b5 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/img/badge.png
+++ b/dogtag/ra-ui/shared/docroot/ra/admin/console/img/badge.png
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/img/bigrotation2.gif b/dogtag/ra-ui/shared/docroot/ra/admin/console/img/bigrotation2.gif
index 5bb90fd6a..5bb90fd6a 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/img/bigrotation2.gif
+++ b/dogtag/ra-ui/shared/docroot/ra/admin/console/img/bigrotation2.gif
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/img/button-clear.gif b/dogtag/ra-ui/shared/docroot/ra/admin/console/img/button-clear.gif
index 336e6e5d9..336e6e5d9 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/img/button-clear.gif
+++ b/dogtag/ra-ui/shared/docroot/ra/admin/console/img/button-clear.gif
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/img/button-manage.gif b/dogtag/ra-ui/shared/docroot/ra/admin/console/img/button-manage.gif
index 8f2f3db5e..8f2f3db5e 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/img/button-manage.gif
+++ b/dogtag/ra-ui/shared/docroot/ra/admin/console/img/button-manage.gif
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/img/button-search.gif b/dogtag/ra-ui/shared/docroot/ra/admin/console/img/button-search.gif
index b015c82a9..b015c82a9 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/img/button-search.gif
+++ b/dogtag/ra-ui/shared/docroot/ra/admin/console/img/button-search.gif
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/img/certificate.png b/dogtag/ra-ui/shared/docroot/ra/admin/console/img/certificate.png
index 2ea9f88bb..2ea9f88bb 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/img/certificate.png
+++ b/dogtag/ra-ui/shared/docroot/ra/admin/console/img/certificate.png
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/img/clearpixel.gif b/dogtag/ra-ui/shared/docroot/ra/admin/console/img/clearpixel.gif
index ae710460b..ae710460b 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/img/clearpixel.gif
+++ b/dogtag/ra-ui/shared/docroot/ra/admin/console/img/clearpixel.gif
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/img/favicon.ico b/dogtag/ra-ui/shared/docroot/ra/admin/console/img/favicon.ico
index efc1d33f4..efc1d33f4 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/img/favicon.ico
+++ b/dogtag/ra-ui/shared/docroot/ra/admin/console/img/favicon.ico
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/img/icon_crit_update.gif b/dogtag/ra-ui/shared/docroot/ra/admin/console/img/icon_crit_update.gif
index cf3c47907..cf3c47907 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/img/icon_crit_update.gif
+++ b/dogtag/ra-ui/shared/docroot/ra/admin/console/img/icon_crit_update.gif
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/img/id.png b/dogtag/ra-ui/shared/docroot/ra/admin/console/img/id.png
index 2c54191e1..2c54191e1 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/img/id.png
+++ b/dogtag/ra-ui/shared/docroot/ra/admin/console/img/id.png
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/img/idkey.png b/dogtag/ra-ui/shared/docroot/ra/admin/console/img/idkey.png
index 3e27d2d05..3e27d2d05 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/img/idkey.png
+++ b/dogtag/ra-ui/shared/docroot/ra/admin/console/img/idkey.png
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/img/key.png b/dogtag/ra-ui/shared/docroot/ra/admin/console/img/key.png
index db2896248..db2896248 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/img/key.png
+++ b/dogtag/ra-ui/shared/docroot/ra/admin/console/img/key.png
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/img/lock.png b/dogtag/ra-ui/shared/docroot/ra/admin/console/img/lock.png
index 56be3b755..56be3b755 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/img/lock.png
+++ b/dogtag/ra-ui/shared/docroot/ra/admin/console/img/lock.png
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/img/logo_header.gif b/dogtag/ra-ui/shared/docroot/ra/admin/console/img/logo_header.gif
index 573482227..573482227 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/img/logo_header.gif
+++ b/dogtag/ra-ui/shared/docroot/ra/admin/console/img/logo_header.gif
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/img/no-certificate.png b/dogtag/ra-ui/shared/docroot/ra/admin/console/img/no-certificate.png
index 7d93a41c3..7d93a41c3 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/img/no-certificate.png
+++ b/dogtag/ra-ui/shared/docroot/ra/admin/console/img/no-certificate.png
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/img/pki-icon-help.gif b/dogtag/ra-ui/shared/docroot/ra/admin/console/img/pki-icon-help.gif
index 21d9f13d6..21d9f13d6 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/img/pki-icon-help.gif
+++ b/dogtag/ra-ui/shared/docroot/ra/admin/console/img/pki-icon-help.gif
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/img/pki-icon-home.gif b/dogtag/ra-ui/shared/docroot/ra/admin/console/img/pki-icon-home.gif
index ef1726b74..ef1726b74 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/img/pki-icon-home.gif
+++ b/dogtag/ra-ui/shared/docroot/ra/admin/console/img/pki-icon-home.gif
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/img/pki-icon-software.gif b/dogtag/ra-ui/shared/docroot/ra/admin/console/img/pki-icon-software.gif
index dd64b485c..dd64b485c 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/img/pki-icon-software.gif
+++ b/dogtag/ra-ui/shared/docroot/ra/admin/console/img/pki-icon-software.gif
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/js/misc.js b/dogtag/ra-ui/shared/docroot/ra/admin/console/js/misc.js
index d4dc336ab..d4dc336ab 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/js/misc.js
+++ b/dogtag/ra-ui/shared/docroot/ra/admin/console/js/misc.js
diff --git a/pki/dogtag/tks-ui/CMakeLists.txt b/dogtag/tks-ui/CMakeLists.txt
index 31d58dfba..31d58dfba 100644
--- a/pki/dogtag/tks-ui/CMakeLists.txt
+++ b/dogtag/tks-ui/CMakeLists.txt
diff --git a/pki/dogtag/tks-ui/LICENSE b/dogtag/tks-ui/LICENSE
index e281f4362..e281f4362 100644
--- a/pki/dogtag/tks-ui/LICENSE
+++ b/dogtag/tks-ui/LICENSE
diff --git a/pki/dogtag/tks-ui/build.xml b/dogtag/tks-ui/build.xml
index 26d16c67b..26d16c67b 100644
--- a/pki/dogtag/tks-ui/build.xml
+++ b/dogtag/tks-ui/build.xml
diff --git a/pki/dogtag/tks-ui/build_dogtag b/dogtag/tks-ui/build_dogtag
index e769ab5d8..e769ab5d8 100755
--- a/pki/dogtag/tks-ui/build_dogtag
+++ b/dogtag/tks-ui/build_dogtag
diff --git a/pki/dogtag/tks-ui/dogtag-pki-tks-ui.spec b/dogtag/tks-ui/dogtag-pki-tks-ui.spec
index f51d903a7..f51d903a7 100644
--- a/pki/dogtag/tks-ui/dogtag-pki-tks-ui.spec
+++ b/dogtag/tks-ui/dogtag-pki-tks-ui.spec
diff --git a/pki/dogtag/tks-ui/shared/webapps/tks/404.html b/dogtag/tks-ui/shared/webapps/tks/404.html
index 2fc48f1c0..2fc48f1c0 100755
--- a/pki/dogtag/tks-ui/shared/webapps/tks/404.html
+++ b/dogtag/tks-ui/shared/webapps/tks/404.html
diff --git a/pki/dogtag/tks-ui/shared/webapps/tks/500.html b/dogtag/tks-ui/shared/webapps/tks/500.html
index 88829b9bd..88829b9bd 100755
--- a/pki/dogtag/tks-ui/shared/webapps/tks/500.html
+++ b/dogtag/tks-ui/shared/webapps/tks/500.html
diff --git a/pki/dogtag/tks-ui/shared/webapps/tks/GenUnexpectedError.template b/dogtag/tks-ui/shared/webapps/tks/GenUnexpectedError.template
index 53e975d14..53e975d14 100644
--- a/pki/dogtag/tks-ui/shared/webapps/tks/GenUnexpectedError.template
+++ b/dogtag/tks-ui/shared/webapps/tks/GenUnexpectedError.template
diff --git a/pki/dogtag/tks-ui/shared/webapps/tks/agent/GenError.template b/dogtag/tks-ui/shared/webapps/tks/agent/GenError.template
index e4a49ae07..e4a49ae07 100644
--- a/pki/dogtag/tks-ui/shared/webapps/tks/agent/GenError.template
+++ b/dogtag/tks-ui/shared/webapps/tks/agent/GenError.template
diff --git a/pki/dogtag/tks-ui/shared/webapps/tks/agent/GenPending.template b/dogtag/tks-ui/shared/webapps/tks/agent/GenPending.template
index a75a5ebdc..a75a5ebdc 100644
--- a/pki/dogtag/tks-ui/shared/webapps/tks/agent/GenPending.template
+++ b/dogtag/tks-ui/shared/webapps/tks/agent/GenPending.template
diff --git a/pki/dogtag/tks-ui/shared/webapps/tks/agent/GenRejected.template b/dogtag/tks-ui/shared/webapps/tks/agent/GenRejected.template
index 112717a7e..112717a7e 100644
--- a/pki/dogtag/tks-ui/shared/webapps/tks/agent/GenRejected.template
+++ b/dogtag/tks-ui/shared/webapps/tks/agent/GenRejected.template
diff --git a/pki/dogtag/tks-ui/shared/webapps/tks/agent/GenSuccess.template b/dogtag/tks-ui/shared/webapps/tks/agent/GenSuccess.template
index 02a9b9b8b..02a9b9b8b 100644
--- a/pki/dogtag/tks-ui/shared/webapps/tks/agent/GenSuccess.template
+++ b/dogtag/tks-ui/shared/webapps/tks/agent/GenSuccess.template
diff --git a/pki/dogtag/tks-ui/shared/webapps/tks/agent/GenSvcPending.template b/dogtag/tks-ui/shared/webapps/tks/agent/GenSvcPending.template
index cb36a5881..cb36a5881 100644
--- a/pki/dogtag/tks-ui/shared/webapps/tks/agent/GenSvcPending.template
+++ b/dogtag/tks-ui/shared/webapps/tks/agent/GenSvcPending.template
diff --git a/pki/dogtag/tks-ui/shared/webapps/tks/agent/GenUnauthorized.template b/dogtag/tks-ui/shared/webapps/tks/agent/GenUnauthorized.template
index c6e62f841..c6e62f841 100644
--- a/pki/dogtag/tks-ui/shared/webapps/tks/agent/GenUnauthorized.template
+++ b/dogtag/tks-ui/shared/webapps/tks/agent/GenUnauthorized.template
diff --git a/pki/dogtag/tks-ui/shared/webapps/tks/agent/GenUnexpectedError.template b/dogtag/tks-ui/shared/webapps/tks/agent/GenUnexpectedError.template
index 53287a8a0..53287a8a0 100644
--- a/pki/dogtag/tks-ui/shared/webapps/tks/agent/GenUnexpectedError.template
+++ b/dogtag/tks-ui/shared/webapps/tks/agent/GenUnexpectedError.template
diff --git a/pki/dogtag/tks-ui/shared/webapps/tks/agent/cms-funcs.js b/dogtag/tks-ui/shared/webapps/tks/agent/cms-funcs.js
index c8ffd51c7..c8ffd51c7 100644
--- a/pki/dogtag/tks-ui/shared/webapps/tks/agent/cms-funcs.js
+++ b/dogtag/tks-ui/shared/webapps/tks/agent/cms-funcs.js
diff --git a/pki/dogtag/tks-ui/shared/webapps/tks/agent/funcs.js b/dogtag/tks-ui/shared/webapps/tks/agent/funcs.js
index daef83d17..daef83d17 100644
--- a/pki/dogtag/tks-ui/shared/webapps/tks/agent/funcs.js
+++ b/dogtag/tks-ui/shared/webapps/tks/agent/funcs.js
diff --git a/pki/dogtag/tks-ui/shared/webapps/tks/agent/graphics/dgLeftTab.gif b/dogtag/tks-ui/shared/webapps/tks/agent/graphics/dgLeftTab.gif
index 35a76c859..35a76c859 100644
--- a/pki/dogtag/tks-ui/shared/webapps/tks/agent/graphics/dgLeftTab.gif
+++ b/dogtag/tks-ui/shared/webapps/tks/agent/graphics/dgLeftTab.gif
diff --git a/pki/dogtag/tks-ui/shared/webapps/tks/agent/graphics/dgRightTab.gif b/dogtag/tks-ui/shared/webapps/tks/agent/graphics/dgRightTab.gif
index a519bc759..a519bc759 100644
--- a/pki/dogtag/tks-ui/shared/webapps/tks/agent/graphics/dgRightTab.gif
+++ b/dogtag/tks-ui/shared/webapps/tks/agent/graphics/dgRightTab.gif
diff --git a/pki/dogtag/tks-ui/shared/webapps/tks/agent/graphics/favicon.ico b/dogtag/tks-ui/shared/webapps/tks/agent/graphics/favicon.ico
index efc1d33f4..efc1d33f4 100644
--- a/pki/dogtag/tks-ui/shared/webapps/tks/agent/graphics/favicon.ico
+++ b/dogtag/tks-ui/shared/webapps/tks/agent/graphics/favicon.ico
diff --git a/pki/dogtag/tks-ui/shared/webapps/tks/agent/graphics/goto-tall.gif b/dogtag/tks-ui/shared/webapps/tks/agent/graphics/goto-tall.gif
index 6eea3ef5c..6eea3ef5c 100644
--- a/pki/dogtag/tks-ui/shared/webapps/tks/agent/graphics/goto-tall.gif
+++ b/dogtag/tks-ui/shared/webapps/tks/agent/graphics/goto-tall.gif
diff --git a/pki/dogtag/tks-ui/shared/webapps/tks/agent/graphics/gray90.gif b/dogtag/tks-ui/shared/webapps/tks/agent/graphics/gray90.gif
index c6f811102..c6f811102 100644
--- a/pki/dogtag/tks-ui/shared/webapps/tks/agent/graphics/gray90.gif
+++ b/dogtag/tks-ui/shared/webapps/tks/agent/graphics/gray90.gif
diff --git a/pki/dogtag/tks-ui/shared/webapps/tks/agent/graphics/hr.gif b/dogtag/tks-ui/shared/webapps/tks/agent/graphics/hr.gif
index 14f8acf92..14f8acf92 100644
--- a/pki/dogtag/tks-ui/shared/webapps/tks/agent/graphics/hr.gif
+++ b/dogtag/tks-ui/shared/webapps/tks/agent/graphics/hr.gif
diff --git a/pki/dogtag/tks-ui/shared/webapps/tks/agent/graphics/lgLeftTab.gif b/dogtag/tks-ui/shared/webapps/tks/agent/graphics/lgLeftTab.gif
index a78fbc89d..a78fbc89d 100644
--- a/pki/dogtag/tks-ui/shared/webapps/tks/agent/graphics/lgLeftTab.gif
+++ b/dogtag/tks-ui/shared/webapps/tks/agent/graphics/lgLeftTab.gif
diff --git a/pki/dogtag/tks-ui/shared/webapps/tks/agent/graphics/lgRightTab.gif b/dogtag/tks-ui/shared/webapps/tks/agent/graphics/lgRightTab.gif
index 71852402d..71852402d 100644
--- a/pki/dogtag/tks-ui/shared/webapps/tks/agent/graphics/lgRightTab.gif
+++ b/dogtag/tks-ui/shared/webapps/tks/agent/graphics/lgRightTab.gif
diff --git a/pki/dogtag/tks-ui/shared/webapps/tks/agent/graphics/logo_header.gif b/dogtag/tks-ui/shared/webapps/tks/agent/graphics/logo_header.gif
index 573482227..573482227 100644
--- a/pki/dogtag/tks-ui/shared/webapps/tks/agent/graphics/logo_header.gif
+++ b/dogtag/tks-ui/shared/webapps/tks/agent/graphics/logo_header.gif
diff --git a/pki/dogtag/tks-ui/shared/webapps/tks/agent/graphics/spacer.gif b/dogtag/tks-ui/shared/webapps/tks/agent/graphics/spacer.gif
index 13acffe53..13acffe53 100644
--- a/pki/dogtag/tks-ui/shared/webapps/tks/agent/graphics/spacer.gif
+++ b/dogtag/tks-ui/shared/webapps/tks/agent/graphics/spacer.gif
diff --git a/pki/dogtag/tks-ui/shared/webapps/tks/agent/header.template b/dogtag/tks-ui/shared/webapps/tks/agent/header.template
index dc92d82ad..dc92d82ad 100644
--- a/pki/dogtag/tks-ui/shared/webapps/tks/agent/header.template
+++ b/dogtag/tks-ui/shared/webapps/tks/agent/header.template
diff --git a/pki/dogtag/tks-ui/shared/webapps/tks/agent/helpfun.js b/dogtag/tks-ui/shared/webapps/tks/agent/helpfun.js
index f9580279a..f9580279a 100644
--- a/pki/dogtag/tks-ui/shared/webapps/tks/agent/helpfun.js
+++ b/dogtag/tks-ui/shared/webapps/tks/agent/helpfun.js
diff --git a/pki/dogtag/tks-ui/shared/webapps/tks/agent/index.html b/dogtag/tks-ui/shared/webapps/tks/agent/index.html
index 30662d47a..30662d47a 100644
--- a/pki/dogtag/tks-ui/shared/webapps/tks/agent/index.html
+++ b/dogtag/tks-ui/shared/webapps/tks/agent/index.html
diff --git a/pki/dogtag/tks-ui/shared/webapps/tks/agent/index.template b/dogtag/tks-ui/shared/webapps/tks/agent/index.template
index 588712364..588712364 100644
--- a/pki/dogtag/tks-ui/shared/webapps/tks/agent/index.template
+++ b/dogtag/tks-ui/shared/webapps/tks/agent/index.template
diff --git a/pki/dogtag/tks-ui/shared/webapps/tks/agent/ports.template b/dogtag/tks-ui/shared/webapps/tks/agent/ports.template
index e1f1ee73e..e1f1ee73e 100644
--- a/pki/dogtag/tks-ui/shared/webapps/tks/agent/ports.template
+++ b/dogtag/tks-ui/shared/webapps/tks/agent/ports.template
diff --git a/pki/dogtag/tks-ui/shared/webapps/tks/agent/tks/getStats.template b/dogtag/tks-ui/shared/webapps/tks/agent/tks/getStats.template
index a08a6fe60..a08a6fe60 100644
--- a/pki/dogtag/tks-ui/shared/webapps/tks/agent/tks/getStats.template
+++ b/dogtag/tks-ui/shared/webapps/tks/agent/tks/getStats.template
diff --git a/pki/dogtag/tks-ui/shared/webapps/tks/agent/tks/index.html b/dogtag/tks-ui/shared/webapps/tks/agent/tks/index.html
index 615afae2c..615afae2c 100644
--- a/pki/dogtag/tks-ui/shared/webapps/tks/agent/tks/index.html
+++ b/dogtag/tks-ui/shared/webapps/tks/agent/tks/index.html
diff --git a/pki/dogtag/tks-ui/shared/webapps/tks/index.html b/dogtag/tks-ui/shared/webapps/tks/index.html
index 30662d47a..30662d47a 100644
--- a/pki/dogtag/tks-ui/shared/webapps/tks/index.html
+++ b/dogtag/tks-ui/shared/webapps/tks/index.html
diff --git a/pki/dogtag/tks-ui/shared/webapps/tks/services.template b/dogtag/tks-ui/shared/webapps/tks/services.template
index be72e2cdc..be72e2cdc 100644
--- a/pki/dogtag/tks-ui/shared/webapps/tks/services.template
+++ b/dogtag/tks-ui/shared/webapps/tks/services.template
diff --git a/pki/dogtag/tps-ui/CMakeLists.txt b/dogtag/tps-ui/CMakeLists.txt
index 1164a7ca0..1164a7ca0 100644
--- a/pki/dogtag/tps-ui/CMakeLists.txt
+++ b/dogtag/tps-ui/CMakeLists.txt
diff --git a/pki/dogtag/tps-ui/LICENSE b/dogtag/tps-ui/LICENSE
index e281f4362..e281f4362 100644
--- a/pki/dogtag/tps-ui/LICENSE
+++ b/dogtag/tps-ui/LICENSE
diff --git a/pki/dogtag/tps-ui/build.xml b/dogtag/tps-ui/build.xml
index 2fc35e8e4..2fc35e8e4 100644
--- a/pki/dogtag/tps-ui/build.xml
+++ b/dogtag/tps-ui/build.xml
diff --git a/pki/dogtag/tps-ui/build_dogtag b/dogtag/tps-ui/build_dogtag
index 0e2bf56f5..0e2bf56f5 100755
--- a/pki/dogtag/tps-ui/build_dogtag
+++ b/dogtag/tps-ui/build_dogtag
diff --git a/pki/dogtag/tps-ui/dogtag-pki-tps-ui.spec b/dogtag/tps-ui/dogtag-pki-tps-ui.spec
index 414967e4d..414967e4d 100644
--- a/pki/dogtag/tps-ui/dogtag-pki-tps-ui.spec
+++ b/dogtag/tps-ui/dogtag-pki-tps-ui.spec
diff --git a/pki/dogtag/tps-ui/shared/cgi-bin/demo/Enroll.html b/dogtag/tps-ui/shared/cgi-bin/demo/Enroll.html
index d366f1a85..d366f1a85 100755
--- a/pki/dogtag/tps-ui/shared/cgi-bin/demo/Enroll.html
+++ b/dogtag/tps-ui/shared/cgi-bin/demo/Enroll.html
diff --git a/pki/dogtag/tps-ui/shared/cgi-bin/home/Enroll.html b/dogtag/tps-ui/shared/cgi-bin/home/Enroll.html
index daa5fead8..daa5fead8 100755
--- a/pki/dogtag/tps-ui/shared/cgi-bin/home/Enroll.html
+++ b/dogtag/tps-ui/shared/cgi-bin/home/Enroll.html
diff --git a/pki/dogtag/tps-ui/shared/cgi-bin/so/Enroll.html b/dogtag/tps-ui/shared/cgi-bin/so/Enroll.html
index c35a53008..c35a53008 100755
--- a/pki/dogtag/tps-ui/shared/cgi-bin/so/Enroll.html
+++ b/dogtag/tps-ui/shared/cgi-bin/so/Enroll.html
diff --git a/pki/dogtag/tps-ui/shared/cgi-bin/sow/cfg.pl b/dogtag/tps-ui/shared/cgi-bin/sow/cfg.pl
index 64e612aaa..64e612aaa 100755
--- a/pki/dogtag/tps-ui/shared/cgi-bin/sow/cfg.pl
+++ b/dogtag/tps-ui/shared/cgi-bin/sow/cfg.pl
diff --git a/pki/dogtag/tps-ui/shared/cgi-bin/sow/enroll.html b/dogtag/tps-ui/shared/cgi-bin/sow/enroll.html
index 673035aeb..673035aeb 100755
--- a/pki/dogtag/tps-ui/shared/cgi-bin/sow/enroll.html
+++ b/dogtag/tps-ui/shared/cgi-bin/sow/enroll.html
diff --git a/pki/dogtag/tps-ui/shared/cgi-bin/sow/enroll_temp.html b/dogtag/tps-ui/shared/cgi-bin/sow/enroll_temp.html
index caa83fa19..caa83fa19 100755
--- a/pki/dogtag/tps-ui/shared/cgi-bin/sow/enroll_temp.html
+++ b/dogtag/tps-ui/shared/cgi-bin/sow/enroll_temp.html
diff --git a/pki/dogtag/tps-ui/shared/cgi-bin/sow/format.html b/dogtag/tps-ui/shared/cgi-bin/sow/format.html
index 372737c7f..372737c7f 100755
--- a/pki/dogtag/tps-ui/shared/cgi-bin/sow/format.html
+++ b/dogtag/tps-ui/shared/cgi-bin/sow/format.html
diff --git a/pki/dogtag/tps-ui/shared/cgi-bin/sow/formatso.html b/dogtag/tps-ui/shared/cgi-bin/sow/formatso.html
index 89038b4d1..89038b4d1 100755
--- a/pki/dogtag/tps-ui/shared/cgi-bin/sow/formatso.html
+++ b/dogtag/tps-ui/shared/cgi-bin/sow/formatso.html
diff --git a/pki/dogtag/tps-ui/shared/cgi-bin/sow/main.html b/dogtag/tps-ui/shared/cgi-bin/sow/main.html
index e7de688bc..e7de688bc 100755
--- a/pki/dogtag/tps-ui/shared/cgi-bin/sow/main.html
+++ b/dogtag/tps-ui/shared/cgi-bin/sow/main.html
diff --git a/pki/dogtag/tps-ui/shared/cgi-bin/sow/noaccess.html b/dogtag/tps-ui/shared/cgi-bin/sow/noaccess.html
index 06e9fa2d8..06e9fa2d8 100755
--- a/pki/dogtag/tps-ui/shared/cgi-bin/sow/noaccess.html
+++ b/dogtag/tps-ui/shared/cgi-bin/sow/noaccess.html
diff --git a/pki/dogtag/tps-ui/shared/cgi-bin/sow/read.html b/dogtag/tps-ui/shared/cgi-bin/sow/read.html
index 1e660c84f..1e660c84f 100755
--- a/pki/dogtag/tps-ui/shared/cgi-bin/sow/read.html
+++ b/dogtag/tps-ui/shared/cgi-bin/sow/read.html
diff --git a/pki/dogtag/tps-ui/shared/cgi-bin/sow/read_temp.html b/dogtag/tps-ui/shared/cgi-bin/sow/read_temp.html
index 1e660c84f..1e660c84f 100755
--- a/pki/dogtag/tps-ui/shared/cgi-bin/sow/read_temp.html
+++ b/dogtag/tps-ui/shared/cgi-bin/sow/read_temp.html
diff --git a/pki/dogtag/tps-ui/shared/cgi-bin/sow/search.html b/dogtag/tps-ui/shared/cgi-bin/sow/search.html
index 789a4a015..789a4a015 100755
--- a/pki/dogtag/tps-ui/shared/cgi-bin/sow/search.html
+++ b/dogtag/tps-ui/shared/cgi-bin/sow/search.html
diff --git a/pki/dogtag/tps-ui/shared/cgi-bin/sow/search_temp.html b/dogtag/tps-ui/shared/cgi-bin/sow/search_temp.html
index 507f223ef..507f223ef 100755
--- a/pki/dogtag/tps-ui/shared/cgi-bin/sow/search_temp.html
+++ b/dogtag/tps-ui/shared/cgi-bin/sow/search_temp.html
diff --git a/pki/dogtag/tps-ui/shared/cgi-bin/sow/seturl.html b/dogtag/tps-ui/shared/cgi-bin/sow/seturl.html
index 3a25380b1..3a25380b1 100755
--- a/pki/dogtag/tps-ui/shared/cgi-bin/sow/seturl.html
+++ b/dogtag/tps-ui/shared/cgi-bin/sow/seturl.html
diff --git a/pki/dogtag/tps-ui/shared/cgi-bin/sow/welcome.html b/dogtag/tps-ui/shared/cgi-bin/sow/welcome.html
index 718dce94b..718dce94b 100755
--- a/pki/dogtag/tps-ui/shared/cgi-bin/sow/welcome.html
+++ b/dogtag/tps-ui/shared/cgi-bin/sow/welcome.html
diff --git a/pki/dogtag/tps-ui/shared/docroot/404.html b/dogtag/tps-ui/shared/docroot/404.html
index b4181fcf9..b4181fcf9 100755
--- a/pki/dogtag/tps-ui/shared/docroot/404.html
+++ b/dogtag/tps-ui/shared/docroot/404.html
diff --git a/pki/dogtag/tps-ui/shared/docroot/500.html b/dogtag/tps-ui/shared/docroot/500.html
index b868922c7..b868922c7 100755
--- a/pki/dogtag/tps-ui/shared/docroot/500.html
+++ b/dogtag/tps-ui/shared/docroot/500.html
diff --git a/pki/dogtag/tps-ui/shared/docroot/css/pki-360.css b/dogtag/tps-ui/shared/docroot/css/pki-360.css
index bdcd7ed3b..bdcd7ed3b 100644
--- a/pki/dogtag/tps-ui/shared/docroot/css/pki-360.css
+++ b/dogtag/tps-ui/shared/docroot/css/pki-360.css
diff --git a/pki/dogtag/tps-ui/shared/docroot/css/pki-base.css b/dogtag/tps-ui/shared/docroot/css/pki-base.css
index 1892b75dc..1892b75dc 100644
--- a/pki/dogtag/tps-ui/shared/docroot/css/pki-base.css
+++ b/dogtag/tps-ui/shared/docroot/css/pki-base.css
diff --git a/pki/dogtag/tps-ui/shared/docroot/css/pki.css b/dogtag/tps-ui/shared/docroot/css/pki.css
index 8149eccf4..8149eccf4 100644
--- a/pki/dogtag/tps-ui/shared/docroot/css/pki.css
+++ b/dogtag/tps-ui/shared/docroot/css/pki.css
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/AdminEsc.html b/dogtag/tps-ui/shared/docroot/esc/AdminEsc.html
index 4b2e0ba3b..4b2e0ba3b 100755
--- a/pki/dogtag/tps-ui/shared/docroot/esc/AdminEsc.html
+++ b/dogtag/tps-ui/shared/docroot/esc/AdminEsc.html
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/AdvancePopup.html b/dogtag/tps-ui/shared/docroot/esc/AdvancePopup.html
index ba2767509..ba2767509 100755
--- a/pki/dogtag/tps-ui/shared/docroot/esc/AdvancePopup.html
+++ b/dogtag/tps-ui/shared/docroot/esc/AdvancePopup.html
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/EnrollPopup.html b/dogtag/tps-ui/shared/docroot/esc/EnrollPopup.html
index fe3b0fdd0..fe3b0fdd0 100755
--- a/pki/dogtag/tps-ui/shared/docroot/esc/EnrollPopup.html
+++ b/dogtag/tps-ui/shared/docroot/esc/EnrollPopup.html
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/GenericAuth.html b/dogtag/tps-ui/shared/docroot/esc/GenericAuth.html
index 7891a0cc3..7891a0cc3 100755
--- a/pki/dogtag/tps-ui/shared/docroot/esc/GenericAuth.html
+++ b/dogtag/tps-ui/shared/docroot/esc/GenericAuth.html
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/SettingsEsc.html b/dogtag/tps-ui/shared/docroot/esc/SettingsEsc.html
index 328df5792..328df5792 100755
--- a/pki/dogtag/tps-ui/shared/docroot/esc/SettingsEsc.html
+++ b/dogtag/tps-ui/shared/docroot/esc/SettingsEsc.html
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/TokenManager.html b/dogtag/tps-ui/shared/docroot/esc/TokenManager.html
index 8538316d4..8538316d4 100755
--- a/pki/dogtag/tps-ui/shared/docroot/esc/TokenManager.html
+++ b/dogtag/tps-ui/shared/docroot/esc/TokenManager.html
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/TokenPin.html b/dogtag/tps-ui/shared/docroot/esc/TokenPin.html
index 54bb8e8c0..54bb8e8c0 100755
--- a/pki/dogtag/tps-ui/shared/docroot/esc/TokenPin.html
+++ b/dogtag/tps-ui/shared/docroot/esc/TokenPin.html
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/demo/EnrollSuccess.html b/dogtag/tps-ui/shared/docroot/esc/demo/EnrollSuccess.html
index bcd3e34d0..bcd3e34d0 100644
--- a/pki/dogtag/tps-ui/shared/docroot/esc/demo/EnrollSuccess.html
+++ b/dogtag/tps-ui/shared/docroot/esc/demo/EnrollSuccess.html
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/demo/GenericAuth.html b/dogtag/tps-ui/shared/docroot/esc/demo/GenericAuth.html
index 38ccd3262..38ccd3262 100755
--- a/pki/dogtag/tps-ui/shared/docroot/esc/demo/GenericAuth.html
+++ b/dogtag/tps-ui/shared/docroot/esc/demo/GenericAuth.html
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/demo/logo.jpg b/dogtag/tps-ui/shared/docroot/esc/demo/logo.jpg
index 7cb31affc..7cb31affc 100644
--- a/pki/dogtag/tps-ui/shared/docroot/esc/demo/logo.jpg
+++ b/dogtag/tps-ui/shared/docroot/esc/demo/logo.jpg
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/demo/style.css b/dogtag/tps-ui/shared/docroot/esc/demo/style.css
index bcd289bdb..bcd289bdb 100755
--- a/pki/dogtag/tps-ui/shared/docroot/esc/demo/style.css
+++ b/dogtag/tps-ui/shared/docroot/esc/demo/style.css
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/demo/util.js b/dogtag/tps-ui/shared/docroot/esc/demo/util.js
index d5707e0f4..d5707e0f4 100755
--- a/pki/dogtag/tps-ui/shared/docroot/esc/demo/util.js
+++ b/dogtag/tps-ui/shared/docroot/esc/demo/util.js
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/home/EnrollSuccess.html b/dogtag/tps-ui/shared/docroot/esc/home/EnrollSuccess.html
index 0148daba9..0148daba9 100644
--- a/pki/dogtag/tps-ui/shared/docroot/esc/home/EnrollSuccess.html
+++ b/dogtag/tps-ui/shared/docroot/esc/home/EnrollSuccess.html
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/home/GenericAuth.html b/dogtag/tps-ui/shared/docroot/esc/home/GenericAuth.html
index 9b28a1145..9b28a1145 100755
--- a/pki/dogtag/tps-ui/shared/docroot/esc/home/GenericAuth.html
+++ b/dogtag/tps-ui/shared/docroot/esc/home/GenericAuth.html
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/home/logo.jpg b/dogtag/tps-ui/shared/docroot/esc/home/logo.jpg
index 7cb31affc..7cb31affc 100644
--- a/pki/dogtag/tps-ui/shared/docroot/esc/home/logo.jpg
+++ b/dogtag/tps-ui/shared/docroot/esc/home/logo.jpg
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/home/style.css b/dogtag/tps-ui/shared/docroot/esc/home/style.css
index bcd289bdb..bcd289bdb 100755
--- a/pki/dogtag/tps-ui/shared/docroot/esc/home/style.css
+++ b/dogtag/tps-ui/shared/docroot/esc/home/style.css
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/home/util.js b/dogtag/tps-ui/shared/docroot/esc/home/util.js
index 6e03a94af..6e03a94af 100755
--- a/pki/dogtag/tps-ui/shared/docroot/esc/home/util.js
+++ b/dogtag/tps-ui/shared/docroot/esc/home/util.js
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/images/BannerBackground.gif b/dogtag/tps-ui/shared/docroot/esc/images/BannerBackground.gif
index 55d41f6ea..55d41f6ea 100755
--- a/pki/dogtag/tps-ui/shared/docroot/esc/images/BannerBackground.gif
+++ b/dogtag/tps-ui/shared/docroot/esc/images/BannerBackground.gif
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/images/CancelButton.gif b/dogtag/tps-ui/shared/docroot/esc/images/CancelButton.gif
index 5b2f7e53a..5b2f7e53a 100755
--- a/pki/dogtag/tps-ui/shared/docroot/esc/images/CancelButton.gif
+++ b/dogtag/tps-ui/shared/docroot/esc/images/CancelButton.gif
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/images/CloseButton.gif b/dogtag/tps-ui/shared/docroot/esc/images/CloseButton.gif
index f0a8230a1..f0a8230a1 100755
--- a/pki/dogtag/tps-ui/shared/docroot/esc/images/CloseButton.gif
+++ b/dogtag/tps-ui/shared/docroot/esc/images/CloseButton.gif
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/images/ContinueButton.gif b/dogtag/tps-ui/shared/docroot/esc/images/ContinueButton.gif
index 3a6867258..3a6867258 100755
--- a/pki/dogtag/tps-ui/shared/docroot/esc/images/ContinueButton.gif
+++ b/dogtag/tps-ui/shared/docroot/esc/images/ContinueButton.gif
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/images/HelpButton.gif b/dogtag/tps-ui/shared/docroot/esc/images/HelpButton.gif
index 43e55dce2..43e55dce2 100755
--- a/pki/dogtag/tps-ui/shared/docroot/esc/images/HelpButton.gif
+++ b/dogtag/tps-ui/shared/docroot/esc/images/HelpButton.gif
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/images/NetKey-Small.gif b/dogtag/tps-ui/shared/docroot/esc/images/NetKey-Small.gif
index 6fed0d5ce..6fed0d5ce 100755
--- a/pki/dogtag/tps-ui/shared/docroot/esc/images/NetKey-Small.gif
+++ b/dogtag/tps-ui/shared/docroot/esc/images/NetKey-Small.gif
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/images/NetKeyInsert.gif b/dogtag/tps-ui/shared/docroot/esc/images/NetKeyInsert.gif
index 4fb74b2b7..4fb74b2b7 100755
--- a/pki/dogtag/tps-ui/shared/docroot/esc/images/NetKeyInsert.gif
+++ b/dogtag/tps-ui/shared/docroot/esc/images/NetKeyInsert.gif
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/images/NetKeyLogo.gif b/dogtag/tps-ui/shared/docroot/esc/images/NetKeyLogo.gif
index 53af00410..53af00410 100755
--- a/pki/dogtag/tps-ui/shared/docroot/esc/images/NetKeyLogo.gif
+++ b/dogtag/tps-ui/shared/docroot/esc/images/NetKeyLogo.gif
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/images/NetKeyPair.gif b/dogtag/tps-ui/shared/docroot/esc/images/NetKeyPair.gif
index b1ff91b5e..b1ff91b5e 100755
--- a/pki/dogtag/tps-ui/shared/docroot/esc/images/NetKeyPair.gif
+++ b/dogtag/tps-ui/shared/docroot/esc/images/NetKeyPair.gif
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/images/NetKeyProgress.gif b/dogtag/tps-ui/shared/docroot/esc/images/NetKeyProgress.gif
index aaadf358f..aaadf358f 100755
--- a/pki/dogtag/tps-ui/shared/docroot/esc/images/NetKeyProgress.gif
+++ b/dogtag/tps-ui/shared/docroot/esc/images/NetKeyProgress.gif
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/images/NetKeyQuestionMark.gif b/dogtag/tps-ui/shared/docroot/esc/images/NetKeyQuestionMark.gif
index b12a77908..b12a77908 100755
--- a/pki/dogtag/tps-ui/shared/docroot/esc/images/NetKeyQuestionMark.gif
+++ b/dogtag/tps-ui/shared/docroot/esc/images/NetKeyQuestionMark.gif
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/images/OKButton.gif b/dogtag/tps-ui/shared/docroot/esc/images/OKButton.gif
index 64d69e440..64d69e440 100755
--- a/pki/dogtag/tps-ui/shared/docroot/esc/images/OKButton.gif
+++ b/dogtag/tps-ui/shared/docroot/esc/images/OKButton.gif
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/images/PadLock.gif b/dogtag/tps-ui/shared/docroot/esc/images/PadLock.gif
index 5e4e044c8..5e4e044c8 100755
--- a/pki/dogtag/tps-ui/shared/docroot/esc/images/PadLock.gif
+++ b/dogtag/tps-ui/shared/docroot/esc/images/PadLock.gif
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/images/PurchaseButton.gif b/dogtag/tps-ui/shared/docroot/esc/images/PurchaseButton.gif
index beb0dacab..beb0dacab 100755
--- a/pki/dogtag/tps-ui/shared/docroot/esc/images/PurchaseButton.gif
+++ b/dogtag/tps-ui/shared/docroot/esc/images/PurchaseButton.gif
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/images/ReactivateButton.gif b/dogtag/tps-ui/shared/docroot/esc/images/ReactivateButton.gif
index 86de2eb68..86de2eb68 100755
--- a/pki/dogtag/tps-ui/shared/docroot/esc/images/ReactivateButton.gif
+++ b/dogtag/tps-ui/shared/docroot/esc/images/ReactivateButton.gif
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/images/ReleaseButton.gif b/dogtag/tps-ui/shared/docroot/esc/images/ReleaseButton.gif
index 7ab79be8c..7ab79be8c 100755
--- a/pki/dogtag/tps-ui/shared/docroot/esc/images/ReleaseButton.gif
+++ b/dogtag/tps-ui/shared/docroot/esc/images/ReleaseButton.gif
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/images/SecureButton.gif b/dogtag/tps-ui/shared/docroot/esc/images/SecureButton.gif
index fc37f2a77..fc37f2a77 100755
--- a/pki/dogtag/tps-ui/shared/docroot/esc/images/SecureButton.gif
+++ b/dogtag/tps-ui/shared/docroot/esc/images/SecureButton.gif
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/images/SuspendButton.gif b/dogtag/tps-ui/shared/docroot/esc/images/SuspendButton.gif
index 24ac0337a..24ac0337a 100755
--- a/pki/dogtag/tps-ui/shared/docroot/esc/images/SuspendButton.gif
+++ b/dogtag/tps-ui/shared/docroot/esc/images/SuspendButton.gif
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/images/TryAgainButton.gif b/dogtag/tps-ui/shared/docroot/esc/images/TryAgainButton.gif
index e71934677..e71934677 100755
--- a/pki/dogtag/tps-ui/shared/docroot/esc/images/TryAgainButton.gif
+++ b/dogtag/tps-ui/shared/docroot/esc/images/TryAgainButton.gif
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/images/bg.jpg b/dogtag/tps-ui/shared/docroot/esc/images/bg.jpg
index 56a4af048..56a4af048 100755
--- a/pki/dogtag/tps-ui/shared/docroot/esc/images/bg.jpg
+++ b/dogtag/tps-ui/shared/docroot/esc/images/bg.jpg
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/images/logo.gif b/dogtag/tps-ui/shared/docroot/esc/images/logo.gif
index 2d1ea5579..2d1ea5579 100644
--- a/pki/dogtag/tps-ui/shared/docroot/esc/images/logo.gif
+++ b/dogtag/tps-ui/shared/docroot/esc/images/logo.gif
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/so/EnrollSuccess.html b/dogtag/tps-ui/shared/docroot/esc/so/EnrollSuccess.html
index aa2cd7907..aa2cd7907 100644
--- a/pki/dogtag/tps-ui/shared/docroot/esc/so/EnrollSuccess.html
+++ b/dogtag/tps-ui/shared/docroot/esc/so/EnrollSuccess.html
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/so/GenericAuth.html b/dogtag/tps-ui/shared/docroot/esc/so/GenericAuth.html
index 9b28a1145..9b28a1145 100755
--- a/pki/dogtag/tps-ui/shared/docroot/esc/so/GenericAuth.html
+++ b/dogtag/tps-ui/shared/docroot/esc/so/GenericAuth.html
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/so/images/indicator.gif b/dogtag/tps-ui/shared/docroot/esc/so/images/indicator.gif
index 5dafb9cb7..5dafb9cb7 100755
--- a/pki/dogtag/tps-ui/shared/docroot/esc/so/images/indicator.gif
+++ b/dogtag/tps-ui/shared/docroot/esc/so/images/indicator.gif
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/so/images/logo.gif b/dogtag/tps-ui/shared/docroot/esc/so/images/logo.gif
index 2d1ea5579..2d1ea5579 100755
--- a/pki/dogtag/tps-ui/shared/docroot/esc/so/images/logo.gif
+++ b/dogtag/tps-ui/shared/docroot/esc/so/images/logo.gif
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/so/logo.jpg b/dogtag/tps-ui/shared/docroot/esc/so/logo.jpg
index 7cb31affc..7cb31affc 100644
--- a/pki/dogtag/tps-ui/shared/docroot/esc/so/logo.jpg
+++ b/dogtag/tps-ui/shared/docroot/esc/so/logo.jpg
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/so/style.css b/dogtag/tps-ui/shared/docroot/esc/so/style.css
index bcd289bdb..bcd289bdb 100755
--- a/pki/dogtag/tps-ui/shared/docroot/esc/so/style.css
+++ b/dogtag/tps-ui/shared/docroot/esc/so/style.css
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/so/util.js b/dogtag/tps-ui/shared/docroot/esc/so/util.js
index ccd81ee84..ccd81ee84 100755
--- a/pki/dogtag/tps-ui/shared/docroot/esc/so/util.js
+++ b/dogtag/tps-ui/shared/docroot/esc/so/util.js
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/sow/EnrollSuccess.html b/dogtag/tps-ui/shared/docroot/esc/sow/EnrollSuccess.html
index 544cb2fb9..544cb2fb9 100644
--- a/pki/dogtag/tps-ui/shared/docroot/esc/sow/EnrollSuccess.html
+++ b/dogtag/tps-ui/shared/docroot/esc/sow/EnrollSuccess.html
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/sow/GenericAuth.html b/dogtag/tps-ui/shared/docroot/esc/sow/GenericAuth.html
index 9b28a1145..9b28a1145 100755
--- a/pki/dogtag/tps-ui/shared/docroot/esc/sow/GenericAuth.html
+++ b/dogtag/tps-ui/shared/docroot/esc/sow/GenericAuth.html
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/sow/css/style.css b/dogtag/tps-ui/shared/docroot/esc/sow/css/style.css
index c60e713d2..c60e713d2 100644
--- a/pki/dogtag/tps-ui/shared/docroot/esc/sow/css/style.css
+++ b/dogtag/tps-ui/shared/docroot/esc/sow/css/style.css
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/sow/images/indicator.gif b/dogtag/tps-ui/shared/docroot/esc/sow/images/indicator.gif
index 5dafb9cb7..5dafb9cb7 100755
--- a/pki/dogtag/tps-ui/shared/docroot/esc/sow/images/indicator.gif
+++ b/dogtag/tps-ui/shared/docroot/esc/sow/images/indicator.gif
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/sow/images/logo.gif b/dogtag/tps-ui/shared/docroot/esc/sow/images/logo.gif
index 2d1ea5579..2d1ea5579 100644
--- a/pki/dogtag/tps-ui/shared/docroot/esc/sow/images/logo.gif
+++ b/dogtag/tps-ui/shared/docroot/esc/sow/images/logo.gif
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/sow/js/ajax-dynamic-list.js b/dogtag/tps-ui/shared/docroot/esc/sow/js/ajax-dynamic-list.js
index 4c89ede8a..4c89ede8a 100755
--- a/pki/dogtag/tps-ui/shared/docroot/esc/sow/js/ajax-dynamic-list.js
+++ b/dogtag/tps-ui/shared/docroot/esc/sow/js/ajax-dynamic-list.js
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/sow/js/ajax.js b/dogtag/tps-ui/shared/docroot/esc/sow/js/ajax.js
index fc342fdd1..fc342fdd1 100755
--- a/pki/dogtag/tps-ui/shared/docroot/esc/sow/js/ajax.js
+++ b/dogtag/tps-ui/shared/docroot/esc/sow/js/ajax.js
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/sow/js/effects.js b/dogtag/tps-ui/shared/docroot/esc/sow/js/effects.js
index d3940a82b..d3940a82b 100755
--- a/pki/dogtag/tps-ui/shared/docroot/esc/sow/js/effects.js
+++ b/dogtag/tps-ui/shared/docroot/esc/sow/js/effects.js
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/sow/js/lightbox.js b/dogtag/tps-ui/shared/docroot/esc/sow/js/lightbox.js
index 11856b208..11856b208 100755
--- a/pki/dogtag/tps-ui/shared/docroot/esc/sow/js/lightbox.js
+++ b/dogtag/tps-ui/shared/docroot/esc/sow/js/lightbox.js
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/sow/js/prototype.js b/dogtag/tps-ui/shared/docroot/esc/sow/js/prototype.js
index e9ccd3c88..e9ccd3c88 100755
--- a/pki/dogtag/tps-ui/shared/docroot/esc/sow/js/prototype.js
+++ b/dogtag/tps-ui/shared/docroot/esc/sow/js/prototype.js
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/sow/js/scriptaculous.js b/dogtag/tps-ui/shared/docroot/esc/sow/js/scriptaculous.js
index dac1228fb..dac1228fb 100755
--- a/pki/dogtag/tps-ui/shared/docroot/esc/sow/js/scriptaculous.js
+++ b/dogtag/tps-ui/shared/docroot/esc/sow/js/scriptaculous.js
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/sow/logo.jpg b/dogtag/tps-ui/shared/docroot/esc/sow/logo.jpg
index 7cb31affc..7cb31affc 100644
--- a/pki/dogtag/tps-ui/shared/docroot/esc/sow/logo.jpg
+++ b/dogtag/tps-ui/shared/docroot/esc/sow/logo.jpg
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/sow/style.css b/dogtag/tps-ui/shared/docroot/esc/sow/style.css
index bcd289bdb..bcd289bdb 100755
--- a/pki/dogtag/tps-ui/shared/docroot/esc/sow/style.css
+++ b/dogtag/tps-ui/shared/docroot/esc/sow/style.css
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/sow/util.js b/dogtag/tps-ui/shared/docroot/esc/sow/util.js
index 967e6e5ed..967e6e5ed 100755
--- a/pki/dogtag/tps-ui/shared/docroot/esc/sow/util.js
+++ b/dogtag/tps-ui/shared/docroot/esc/sow/util.js
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/style.css b/dogtag/tps-ui/shared/docroot/esc/style.css
index 83098a440..83098a440 100755
--- a/pki/dogtag/tps-ui/shared/docroot/esc/style.css
+++ b/dogtag/tps-ui/shared/docroot/esc/style.css
diff --git a/pki/dogtag/tps-ui/shared/docroot/footer.vm b/dogtag/tps-ui/shared/docroot/footer.vm
index a596e45b1..a596e45b1 100755
--- a/pki/dogtag/tps-ui/shared/docroot/footer.vm
+++ b/dogtag/tps-ui/shared/docroot/footer.vm
diff --git a/pki/dogtag/tps-ui/shared/docroot/header.vm b/dogtag/tps-ui/shared/docroot/header.vm
index 0dec954b8..0dec954b8 100755
--- a/pki/dogtag/tps-ui/shared/docroot/header.vm
+++ b/dogtag/tps-ui/shared/docroot/header.vm
diff --git a/pki/dogtag/tps-ui/shared/docroot/index.vm b/dogtag/tps-ui/shared/docroot/index.vm
index e9a3361e9..e9a3361e9 100755
--- a/pki/dogtag/tps-ui/shared/docroot/index.vm
+++ b/dogtag/tps-ui/shared/docroot/index.vm
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/addConfig.template b/dogtag/tps-ui/shared/docroot/tokendb/addConfig.template
index 4051ead83..4051ead83 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tokendb/addConfig.template
+++ b/dogtag/tps-ui/shared/docroot/tokendb/addConfig.template
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/addResults.template b/dogtag/tps-ui/shared/docroot/tokendb/addResults.template
index cf2f64769..cf2f64769 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tokendb/addResults.template
+++ b/dogtag/tps-ui/shared/docroot/tokendb/addResults.template
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/agentSelectConfig.template b/dogtag/tps-ui/shared/docroot/tokendb/agentSelectConfig.template
index 3d22858cd..3d22858cd 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tokendb/agentSelectConfig.template
+++ b/dogtag/tps-ui/shared/docroot/tokendb/agentSelectConfig.template
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/agentViewConfig.template b/dogtag/tps-ui/shared/docroot/tokendb/agentViewConfig.template
index 29f2dd1d5..29f2dd1d5 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tokendb/agentViewConfig.template
+++ b/dogtag/tps-ui/shared/docroot/tokendb/agentViewConfig.template
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/auditAdmin.template b/dogtag/tps-ui/shared/docroot/tokendb/auditAdmin.template
index 46abadf6c..46abadf6c 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tokendb/auditAdmin.template
+++ b/dogtag/tps-ui/shared/docroot/tokendb/auditAdmin.template
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/confirmConfigChanges.template b/dogtag/tps-ui/shared/docroot/tokendb/confirmConfigChanges.template
index 8dfe53554..8dfe53554 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tokendb/confirmConfigChanges.template
+++ b/dogtag/tps-ui/shared/docroot/tokendb/confirmConfigChanges.template
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/confirmDeleteConfig.template b/dogtag/tps-ui/shared/docroot/tokendb/confirmDeleteConfig.template
index 08fc65cdc..08fc65cdc 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tokendb/confirmDeleteConfig.template
+++ b/dogtag/tps-ui/shared/docroot/tokendb/confirmDeleteConfig.template
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/delete.template b/dogtag/tps-ui/shared/docroot/tokendb/delete.template
index eb854fdd2..eb854fdd2 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tokendb/delete.template
+++ b/dogtag/tps-ui/shared/docroot/tokendb/delete.template
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/deleteResults.template b/dogtag/tps-ui/shared/docroot/tokendb/deleteResults.template
index 4d7d09871..4d7d09871 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tokendb/deleteResults.template
+++ b/dogtag/tps-ui/shared/docroot/tokendb/deleteResults.template
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/doToken.template b/dogtag/tps-ui/shared/docroot/tokendb/doToken.template
index a86288c7c..a86288c7c 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tokendb/doToken.template
+++ b/dogtag/tps-ui/shared/docroot/tokendb/doToken.template
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/doTokenConfirm.template b/dogtag/tps-ui/shared/docroot/tokendb/doTokenConfirm.template
index 88068af78..88068af78 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tokendb/doTokenConfirm.template
+++ b/dogtag/tps-ui/shared/docroot/tokendb/doTokenConfirm.template
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/edit.template b/dogtag/tps-ui/shared/docroot/tokendb/edit.template
index 2e926992b..2e926992b 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tokendb/edit.template
+++ b/dogtag/tps-ui/shared/docroot/tokendb/edit.template
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/editConfig.template b/dogtag/tps-ui/shared/docroot/tokendb/editConfig.template
index ff52f90d9..ff52f90d9 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tokendb/editConfig.template
+++ b/dogtag/tps-ui/shared/docroot/tokendb/editConfig.template
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/editResults.template b/dogtag/tps-ui/shared/docroot/tokendb/editResults.template
index d5d7c7dc2..d5d7c7dc2 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tokendb/editResults.template
+++ b/dogtag/tps-ui/shared/docroot/tokendb/editResults.template
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/editUser.template b/dogtag/tps-ui/shared/docroot/tokendb/editUser.template
index 2a69e65f4..2a69e65f4 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tokendb/editUser.template
+++ b/dogtag/tps-ui/shared/docroot/tokendb/editUser.template
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/error.template b/dogtag/tps-ui/shared/docroot/tokendb/error.template
index f698925d0..f698925d0 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tokendb/error.template
+++ b/dogtag/tps-ui/shared/docroot/tokendb/error.template
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/index.template b/dogtag/tps-ui/shared/docroot/tokendb/index.template
index d49a69b61..d49a69b61 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tokendb/index.template
+++ b/dogtag/tps-ui/shared/docroot/tokendb/index.template
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/indexAdmin.template b/dogtag/tps-ui/shared/docroot/tokendb/indexAdmin.template
index 9164dd748..9164dd748 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tokendb/indexAdmin.template
+++ b/dogtag/tps-ui/shared/docroot/tokendb/indexAdmin.template
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/indexOperator.template b/dogtag/tps-ui/shared/docroot/tokendb/indexOperator.template
index 27b25c08a..27b25c08a 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tokendb/indexOperator.template
+++ b/dogtag/tps-ui/shared/docroot/tokendb/indexOperator.template
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/new.template b/dogtag/tps-ui/shared/docroot/tokendb/new.template
index 4e2950fbd..4e2950fbd 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tokendb/new.template
+++ b/dogtag/tps-ui/shared/docroot/tokendb/new.template
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/newUser.template b/dogtag/tps-ui/shared/docroot/tokendb/newUser.template
index c1e4f102b..c1e4f102b 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tokendb/newUser.template
+++ b/dogtag/tps-ui/shared/docroot/tokendb/newUser.template
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/revoke.template b/dogtag/tps-ui/shared/docroot/tokendb/revoke.template
index 0f6c12aaf..0f6c12aaf 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tokendb/revoke.template
+++ b/dogtag/tps-ui/shared/docroot/tokendb/revoke.template
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/search.template b/dogtag/tps-ui/shared/docroot/tokendb/search.template
index caf4fe7ba..caf4fe7ba 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tokendb/search.template
+++ b/dogtag/tps-ui/shared/docroot/tokendb/search.template
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/searchActivity.template b/dogtag/tps-ui/shared/docroot/tokendb/searchActivity.template
index 7bf87c0b1..7bf87c0b1 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tokendb/searchActivity.template
+++ b/dogtag/tps-ui/shared/docroot/tokendb/searchActivity.template
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/searchActivityAdmin.template b/dogtag/tps-ui/shared/docroot/tokendb/searchActivityAdmin.template
index faec9c6e1..faec9c6e1 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tokendb/searchActivityAdmin.template
+++ b/dogtag/tps-ui/shared/docroot/tokendb/searchActivityAdmin.template
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/searchActivityAdminResults.template b/dogtag/tps-ui/shared/docroot/tokendb/searchActivityAdminResults.template
index d38d8569b..d38d8569b 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tokendb/searchActivityAdminResults.template
+++ b/dogtag/tps-ui/shared/docroot/tokendb/searchActivityAdminResults.template
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/searchActivityResults.template b/dogtag/tps-ui/shared/docroot/tokendb/searchActivityResults.template
index 132fb8c97..132fb8c97 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tokendb/searchActivityResults.template
+++ b/dogtag/tps-ui/shared/docroot/tokendb/searchActivityResults.template
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/searchAdmin.template b/dogtag/tps-ui/shared/docroot/tokendb/searchAdmin.template
index b18185299..b18185299 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tokendb/searchAdmin.template
+++ b/dogtag/tps-ui/shared/docroot/tokendb/searchAdmin.template
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/searchAdminResults.template b/dogtag/tps-ui/shared/docroot/tokendb/searchAdminResults.template
index 6e8d81fd4..6e8d81fd4 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tokendb/searchAdminResults.template
+++ b/dogtag/tps-ui/shared/docroot/tokendb/searchAdminResults.template
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/searchCertificate.template b/dogtag/tps-ui/shared/docroot/tokendb/searchCertificate.template
index df9d51c0d..df9d51c0d 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tokendb/searchCertificate.template
+++ b/dogtag/tps-ui/shared/docroot/tokendb/searchCertificate.template
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/searchCertificateResults.template b/dogtag/tps-ui/shared/docroot/tokendb/searchCertificateResults.template
index 51ac611a6..51ac611a6 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tokendb/searchCertificateResults.template
+++ b/dogtag/tps-ui/shared/docroot/tokendb/searchCertificateResults.template
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/searchResults.template b/dogtag/tps-ui/shared/docroot/tokendb/searchResults.template
index 6b035debf..6b035debf 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tokendb/searchResults.template
+++ b/dogtag/tps-ui/shared/docroot/tokendb/searchResults.template
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/searchUser.template b/dogtag/tps-ui/shared/docroot/tokendb/searchUser.template
index 1aa63ca17..1aa63ca17 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tokendb/searchUser.template
+++ b/dogtag/tps-ui/shared/docroot/tokendb/searchUser.template
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/searchUserResults.template b/dogtag/tps-ui/shared/docroot/tokendb/searchUserResults.template
index 7d4ce8fa0..7d4ce8fa0 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tokendb/searchUserResults.template
+++ b/dogtag/tps-ui/shared/docroot/tokendb/searchUserResults.template
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/selectConfig.template b/dogtag/tps-ui/shared/docroot/tokendb/selectConfig.template
index c28f03efe..c28f03efe 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tokendb/selectConfig.template
+++ b/dogtag/tps-ui/shared/docroot/tokendb/selectConfig.template
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/selfTest.template b/dogtag/tps-ui/shared/docroot/tokendb/selfTest.template
index 22002f52d..22002f52d 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tokendb/selfTest.template
+++ b/dogtag/tps-ui/shared/docroot/tokendb/selfTest.template
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/selfTestResults.template b/dogtag/tps-ui/shared/docroot/tokendb/selfTestResults.template
index 3495abaf6..3495abaf6 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tokendb/selfTestResults.template
+++ b/dogtag/tps-ui/shared/docroot/tokendb/selfTestResults.template
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/show.template b/dogtag/tps-ui/shared/docroot/tokendb/show.template
index e30365aa6..e30365aa6 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tokendb/show.template
+++ b/dogtag/tps-ui/shared/docroot/tokendb/show.template
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/showAdmin.template b/dogtag/tps-ui/shared/docroot/tokendb/showAdmin.template
index a0106f1d8..a0106f1d8 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tokendb/showAdmin.template
+++ b/dogtag/tps-ui/shared/docroot/tokendb/showAdmin.template
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/showCert.template b/dogtag/tps-ui/shared/docroot/tokendb/showCert.template
index 493d4a780..493d4a780 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tokendb/showCert.template
+++ b/dogtag/tps-ui/shared/docroot/tokendb/showCert.template
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/userDelete.template b/dogtag/tps-ui/shared/docroot/tokendb/userDelete.template
index 6d957f915..6d957f915 100755
--- a/pki/dogtag/tps-ui/shared/docroot/tokendb/userDelete.template
+++ b/dogtag/tps-ui/shared/docroot/tokendb/userDelete.template
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/adminauthenticatepanel.vm b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/adminauthenticatepanel.vm
index 315802393..315802393 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/adminauthenticatepanel.vm
+++ b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/adminauthenticatepanel.vm
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/adminpanel.vm b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/adminpanel.vm
index 3d0843b67..3d0843b67 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/adminpanel.vm
+++ b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/adminpanel.vm
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/agentauthenticatepanel.vm b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/agentauthenticatepanel.vm
index 686016cc9..686016cc9 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/agentauthenticatepanel.vm
+++ b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/agentauthenticatepanel.vm
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/authdbpanel.vm b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/authdbpanel.vm
index 0f32be000..0f32be000 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/authdbpanel.vm
+++ b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/authdbpanel.vm
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/cainfopanel.vm b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/cainfopanel.vm
index e2214302c..e2214302c 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/cainfopanel.vm
+++ b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/cainfopanel.vm
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/certchainpanel.vm b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/certchainpanel.vm
index d6b7b3fe4..d6b7b3fe4 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/certchainpanel.vm
+++ b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/certchainpanel.vm
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/certprettyprintpanel.vm b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/certprettyprintpanel.vm
index 0e5f05af6..0e5f05af6 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/certprettyprintpanel.vm
+++ b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/certprettyprintpanel.vm
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/certrequestpanel.vm b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/certrequestpanel.vm
index 9a4462354..9a4462354 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/certrequestpanel.vm
+++ b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/certrequestpanel.vm
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/config_addhsm.vm b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/config_addhsm.vm
index 6a3f9fca7..6a3f9fca7 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/config_addhsm.vm
+++ b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/config_addhsm.vm
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/config_db.vm b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/config_db.vm
index dedb817b3..dedb817b3 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/config_db.vm
+++ b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/config_db.vm
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/config_hsm.vm b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/config_hsm.vm
index 6d1ad6a23..6d1ad6a23 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/config_hsm.vm
+++ b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/config_hsm.vm
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/config_hsmloginpanel.vm b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/config_hsmloginpanel.vm
index 332f2f470..332f2f470 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/config_hsmloginpanel.vm
+++ b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/config_hsmloginpanel.vm
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/config_join.vm b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/config_join.vm
index 1cbbab461..1cbbab461 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/config_join.vm
+++ b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/config_join.vm
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/config_rootca.vm b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/config_rootca.vm
index b1fed97f2..b1fed97f2 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/config_rootca.vm
+++ b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/config_rootca.vm
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/createsubsystempanel.vm b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/createsubsystempanel.vm
index 42de9bab2..42de9bab2 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/createsubsystempanel.vm
+++ b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/createsubsystempanel.vm
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/databasepanel.vm b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/databasepanel.vm
index 1020ea39c..1020ea39c 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/databasepanel.vm
+++ b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/databasepanel.vm
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/displaycertchain2panel.vm b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/displaycertchain2panel.vm
index f88daf3e3..f88daf3e3 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/displaycertchain2panel.vm
+++ b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/displaycertchain2panel.vm
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/displaycertchainpanel.vm b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/displaycertchainpanel.vm
index 2e5c99b78..2e5c99b78 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/displaycertchainpanel.vm
+++ b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/displaycertchainpanel.vm
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/donepanel.vm b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/donepanel.vm
index bc20a4e60..bc20a4e60 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/donepanel.vm
+++ b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/donepanel.vm
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/drminfopanel.vm b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/drminfopanel.vm
index 832841806..832841806 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/drminfopanel.vm
+++ b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/drminfopanel.vm
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/footer.vm b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/footer.vm
index a596e45b1..a596e45b1 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/footer.vm
+++ b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/footer.vm
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/header.vm b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/header.vm
index 7966ba745..7966ba745 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/header.vm
+++ b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/header.vm
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/hierarchypanel.vm b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/hierarchypanel.vm
index 41d241c47..41d241c47 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/hierarchypanel.vm
+++ b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/hierarchypanel.vm
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/importadmincertpanel.vm b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/importadmincertpanel.vm
index adece8b24..adece8b24 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/importadmincertpanel.vm
+++ b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/importadmincertpanel.vm
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/login.vm b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/login.vm
index dc9e7822d..dc9e7822d 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/login.vm
+++ b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/login.vm
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/modulepanel.vm b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/modulepanel.vm
index d3e525f45..d3e525f45 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/modulepanel.vm
+++ b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/modulepanel.vm
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/namepanel.vm b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/namepanel.vm
index c506180b5..c506180b5 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/namepanel.vm
+++ b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/namepanel.vm
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/securitydomainloginpanel.vm b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/securitydomainloginpanel.vm
index 04fd723f8..04fd723f8 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/securitydomainloginpanel.vm
+++ b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/securitydomainloginpanel.vm
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/securitydomainpanel.vm b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/securitydomainpanel.vm
index f54703668..f54703668 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/securitydomainpanel.vm
+++ b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/securitydomainpanel.vm
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/sidemenu.vm b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/sidemenu.vm
index c3dbf1410..c3dbf1410 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/sidemenu.vm
+++ b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/sidemenu.vm
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/sizepanel.vm b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/sizepanel.vm
index eeb62f6d8..eeb62f6d8 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/sizepanel.vm
+++ b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/sizepanel.vm
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/tksinfopanel.vm b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/tksinfopanel.vm
index 5cc18c29d..5cc18c29d 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/tksinfopanel.vm
+++ b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/tksinfopanel.vm
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/topmenu.vm b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/topmenu.vm
index c76b2e8fa..c76b2e8fa 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/topmenu.vm
+++ b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/topmenu.vm
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/welcomepanel.vm b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/welcomepanel.vm
index 619560dd3..619560dd3 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/welcomepanel.vm
+++ b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/welcomepanel.vm
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/wizard.vm b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/wizard.vm
index 9d16ad8d3..9d16ad8d3 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/wizard.vm
+++ b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/wizard.vm
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/xml.vm b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/xml.vm
index 31ff72aa2..31ff72aa2 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/xml.vm
+++ b/dogtag/tps-ui/shared/docroot/tps/admin/console/config/xml.vm
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/badge.png b/dogtag/tps-ui/shared/docroot/tps/admin/console/img/badge.png
index 5fe0223b5..5fe0223b5 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/badge.png
+++ b/dogtag/tps-ui/shared/docroot/tps/admin/console/img/badge.png
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/bigrotation2.gif b/dogtag/tps-ui/shared/docroot/tps/admin/console/img/bigrotation2.gif
index 5bb90fd6a..5bb90fd6a 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/bigrotation2.gif
+++ b/dogtag/tps-ui/shared/docroot/tps/admin/console/img/bigrotation2.gif
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/button-clear.gif b/dogtag/tps-ui/shared/docroot/tps/admin/console/img/button-clear.gif
index 336e6e5d9..336e6e5d9 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/button-clear.gif
+++ b/dogtag/tps-ui/shared/docroot/tps/admin/console/img/button-clear.gif
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/button-manage.gif b/dogtag/tps-ui/shared/docroot/tps/admin/console/img/button-manage.gif
index 8f2f3db5e..8f2f3db5e 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/button-manage.gif
+++ b/dogtag/tps-ui/shared/docroot/tps/admin/console/img/button-manage.gif
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/button-search.gif b/dogtag/tps-ui/shared/docroot/tps/admin/console/img/button-search.gif
index b015c82a9..b015c82a9 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/button-search.gif
+++ b/dogtag/tps-ui/shared/docroot/tps/admin/console/img/button-search.gif
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/certificate.png b/dogtag/tps-ui/shared/docroot/tps/admin/console/img/certificate.png
index 2ea9f88bb..2ea9f88bb 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/certificate.png
+++ b/dogtag/tps-ui/shared/docroot/tps/admin/console/img/certificate.png
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/clearpixel.gif b/dogtag/tps-ui/shared/docroot/tps/admin/console/img/clearpixel.gif
index ae710460b..ae710460b 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/clearpixel.gif
+++ b/dogtag/tps-ui/shared/docroot/tps/admin/console/img/clearpixel.gif
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/favicon.ico b/dogtag/tps-ui/shared/docroot/tps/admin/console/img/favicon.ico
index efc1d33f4..efc1d33f4 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/favicon.ico
+++ b/dogtag/tps-ui/shared/docroot/tps/admin/console/img/favicon.ico
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/icon_checkin.gif b/dogtag/tps-ui/shared/docroot/tps/admin/console/img/icon_checkin.gif
index cb77e9f3f..cb77e9f3f 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/icon_checkin.gif
+++ b/dogtag/tps-ui/shared/docroot/tps/admin/console/img/icon_checkin.gif
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/icon_crit_update.gif b/dogtag/tps-ui/shared/docroot/tps/admin/console/img/icon_crit_update.gif
index cf3c47907..cf3c47907 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/icon_crit_update.gif
+++ b/dogtag/tps-ui/shared/docroot/tps/admin/console/img/icon_crit_update.gif
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/icon_locked.gif b/dogtag/tps-ui/shared/docroot/tps/admin/console/img/icon_locked.gif
index fa0989276..fa0989276 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/icon_locked.gif
+++ b/dogtag/tps-ui/shared/docroot/tps/admin/console/img/icon_locked.gif
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/icon_reg_update.gif b/dogtag/tps-ui/shared/docroot/tps/admin/console/img/icon_reg_update.gif
index 662e17a84..662e17a84 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/icon_reg_update.gif
+++ b/dogtag/tps-ui/shared/docroot/tps/admin/console/img/icon_reg_update.gif
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/icon_up2date.gif b/dogtag/tps-ui/shared/docroot/tps/admin/console/img/icon_up2date.gif
index 7f2f9d4c0..7f2f9d4c0 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/icon_up2date.gif
+++ b/dogtag/tps-ui/shared/docroot/tps/admin/console/img/icon_up2date.gif
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/id.png b/dogtag/tps-ui/shared/docroot/tps/admin/console/img/id.png
index 2c54191e1..2c54191e1 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/id.png
+++ b/dogtag/tps-ui/shared/docroot/tps/admin/console/img/id.png
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/idkey.png b/dogtag/tps-ui/shared/docroot/tps/admin/console/img/idkey.png
index 3e27d2d05..3e27d2d05 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/idkey.png
+++ b/dogtag/tps-ui/shared/docroot/tps/admin/console/img/idkey.png
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/key.png b/dogtag/tps-ui/shared/docroot/tps/admin/console/img/key.png
index db2896248..db2896248 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/key.png
+++ b/dogtag/tps-ui/shared/docroot/tps/admin/console/img/key.png
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/lock.png b/dogtag/tps-ui/shared/docroot/tps/admin/console/img/lock.png
index 56be3b755..56be3b755 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/lock.png
+++ b/dogtag/tps-ui/shared/docroot/tps/admin/console/img/lock.png
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/logo_header.gif b/dogtag/tps-ui/shared/docroot/tps/admin/console/img/logo_header.gif
index 573482227..573482227 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/logo_header.gif
+++ b/dogtag/tps-ui/shared/docroot/tps/admin/console/img/logo_header.gif
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/no-certificate.png b/dogtag/tps-ui/shared/docroot/tps/admin/console/img/no-certificate.png
index 7d93a41c3..7d93a41c3 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/no-certificate.png
+++ b/dogtag/tps-ui/shared/docroot/tps/admin/console/img/no-certificate.png
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/pki-icon-help.gif b/dogtag/tps-ui/shared/docroot/tps/admin/console/img/pki-icon-help.gif
index 21d9f13d6..21d9f13d6 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/pki-icon-help.gif
+++ b/dogtag/tps-ui/shared/docroot/tps/admin/console/img/pki-icon-help.gif
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/pki-icon-home.gif b/dogtag/tps-ui/shared/docroot/tps/admin/console/img/pki-icon-home.gif
index ef1726b74..ef1726b74 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/pki-icon-home.gif
+++ b/dogtag/tps-ui/shared/docroot/tps/admin/console/img/pki-icon-home.gif
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/pki-icon-software.gif b/dogtag/tps-ui/shared/docroot/tps/admin/console/img/pki-icon-software.gif
index dd64b485c..dd64b485c 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/pki-icon-software.gif
+++ b/dogtag/tps-ui/shared/docroot/tps/admin/console/img/pki-icon-software.gif
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/js/misc.js b/dogtag/tps-ui/shared/docroot/tps/admin/console/js/misc.js
index d4dc336ab..d4dc336ab 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/js/misc.js
+++ b/dogtag/tps-ui/shared/docroot/tps/admin/console/js/misc.js
diff --git a/pki/patches/pki-core-selinux-f16.patch b/patches/pki-core-selinux-f16.patch
index 6866033dc..6866033dc 100644
--- a/pki/patches/pki-core-selinux-f16.patch
+++ b/patches/pki-core-selinux-f16.patch
diff --git a/pki/patches/pki-core-selinux-f17.patch b/patches/pki-core-selinux-f17.patch
index 465c95fe2..465c95fe2 100644
--- a/pki/patches/pki-core-selinux-f17.patch
+++ b/patches/pki-core-selinux-f17.patch
diff --git a/pki/scripts/build_dogtag_pki b/scripts/build_dogtag_pki
index f2c171fbb..f2c171fbb 100755
--- a/pki/scripts/build_dogtag_pki
+++ b/scripts/build_dogtag_pki
diff --git a/pki/scripts/compose_dogtag_pki_meta_packages b/scripts/compose_dogtag_pki_meta_packages
index a31532192..a31532192 100755
--- a/pki/scripts/compose_dogtag_pki_meta_packages
+++ b/scripts/compose_dogtag_pki_meta_packages
diff --git a/pki/scripts/compose_dogtag_pki_theme_packages b/scripts/compose_dogtag_pki_theme_packages
index 4eefe240d..4eefe240d 100755
--- a/pki/scripts/compose_dogtag_pki_theme_packages
+++ b/scripts/compose_dogtag_pki_theme_packages
diff --git a/pki/scripts/compose_functions b/scripts/compose_functions
index 22c128df1..22c128df1 100644
--- a/pki/scripts/compose_functions
+++ b/scripts/compose_functions
diff --git a/pki/scripts/compose_ipa_pki_theme_packages b/scripts/compose_ipa_pki_theme_packages
index f2ef9042b..f2ef9042b 100755
--- a/pki/scripts/compose_ipa_pki_theme_packages
+++ b/scripts/compose_ipa_pki_theme_packages
diff --git a/pki/scripts/compose_pki_console_packages b/scripts/compose_pki_console_packages
index a163525c3..a163525c3 100755
--- a/pki/scripts/compose_pki_console_packages
+++ b/scripts/compose_pki_console_packages
diff --git a/pki/scripts/compose_pki_core_packages b/scripts/compose_pki_core_packages
index 8e8395180..8e8395180 100755
--- a/pki/scripts/compose_pki_core_packages
+++ b/scripts/compose_pki_core_packages
diff --git a/pki/scripts/compose_pki_migrate_packages b/scripts/compose_pki_migrate_packages
index 39789f897..39789f897 100755
--- a/pki/scripts/compose_pki_migrate_packages
+++ b/scripts/compose_pki_migrate_packages
diff --git a/pki/scripts/compose_pki_ra_packages b/scripts/compose_pki_ra_packages
index b5ff90f03..b5ff90f03 100755
--- a/pki/scripts/compose_pki_ra_packages
+++ b/scripts/compose_pki_ra_packages
diff --git a/pki/scripts/compose_pki_tps_packages b/scripts/compose_pki_tps_packages
index eb7738641..eb7738641 100755
--- a/pki/scripts/compose_pki_tps_packages
+++ b/scripts/compose_pki_tps_packages
diff --git a/pki/scripts/create_pki_yum_repos b/scripts/create_pki_yum_repos
index b900e180f..b900e180f 100755
--- a/pki/scripts/create_pki_yum_repos
+++ b/scripts/create_pki_yum_repos
diff --git a/pki/scripts/install_default_ca_instance b/scripts/install_default_ca_instance
index 7de098018..7de098018 100755
--- a/pki/scripts/install_default_ca_instance
+++ b/scripts/install_default_ca_instance
diff --git a/pki/scripts/install_default_pki_instances b/scripts/install_default_pki_instances
index 7c1bc9db3..7c1bc9db3 100755
--- a/pki/scripts/install_default_pki_instances
+++ b/scripts/install_default_pki_instances
diff --git a/pki/scripts/pki_patch_maker b/scripts/pki_patch_maker
index 08e8aacd8..08e8aacd8 100755
--- a/pki/scripts/pki_patch_maker
+++ b/scripts/pki_patch_maker
diff --git a/pki/scripts/prepare_dogtag_pki b/scripts/prepare_dogtag_pki
index 0b0f8148e..0b0f8148e 100755
--- a/pki/scripts/prepare_dogtag_pki
+++ b/scripts/prepare_dogtag_pki
diff --git a/pki/scripts/remove_default_pki_instances b/scripts/remove_default_pki_instances
index 3ec355f1f..3ec355f1f 100755
--- a/pki/scripts/remove_default_pki_instances
+++ b/scripts/remove_default_pki_instances
diff --git a/pki/scripts/remove_pki_components b/scripts/remove_pki_components
index 63dab7c00..63dab7c00 100755
--- a/pki/scripts/remove_pki_components
+++ b/scripts/remove_pki_components
diff --git a/pki/specs/dogtag-pki-theme.spec b/specs/dogtag-pki-theme.spec
index abd436af1..abd436af1 100644
--- a/pki/specs/dogtag-pki-theme.spec
+++ b/specs/dogtag-pki-theme.spec
diff --git a/pki/specs/dogtag-pki.spec b/specs/dogtag-pki.spec
index 499334053..499334053 100644
--- a/pki/specs/dogtag-pki.spec
+++ b/specs/dogtag-pki.spec
diff --git a/pki/specs/ipa-pki-theme.spec b/specs/ipa-pki-theme.spec
index 1b9ef9eba..1b9ef9eba 100644
--- a/pki/specs/ipa-pki-theme.spec
+++ b/specs/ipa-pki-theme.spec
diff --git a/pki/specs/pki-console.spec b/specs/pki-console.spec
index 987fd7e45..987fd7e45 100644
--- a/pki/specs/pki-console.spec
+++ b/specs/pki-console.spec
diff --git a/pki/specs/pki-core.spec b/specs/pki-core.spec
index 2c1906fc5..2c1906fc5 100644
--- a/pki/specs/pki-core.spec
+++ b/specs/pki-core.spec
diff --git a/pki/specs/pki-migrate.spec b/specs/pki-migrate.spec
index 9047e3b2b..9047e3b2b 100644
--- a/pki/specs/pki-migrate.spec
+++ b/specs/pki-migrate.spec
diff --git a/pki/specs/pki-ra.spec b/specs/pki-ra.spec
index 035cb6204..035cb6204 100644
--- a/pki/specs/pki-ra.spec
+++ b/specs/pki-ra.spec
diff --git a/pki/specs/pki-tps.spec b/specs/pki-tps.spec
index f3bff7ae7..f3bff7ae7 100644
--- a/pki/specs/pki-tps.spec
+++ b/specs/pki-tps.spec
diff --git a/pki/tools/jar/README.jar-tools b/tools/jar/README.jar-tools
index e165fd8bd..e165fd8bd 100644
--- a/pki/tools/jar/README.jar-tools
+++ b/tools/jar/README.jar-tools
diff --git a/pki/tools/jar/jar-query b/tools/jar/jar-query
index 5f0e081cd..5f0e081cd 100755
--- a/pki/tools/jar/jar-query
+++ b/tools/jar/jar-query
diff --git a/pki/tools/jar/java-imports b/tools/jar/java-imports
index 44c239ca0..44c239ca0 100755
--- a/pki/tools/jar/java-imports
+++ b/tools/jar/java-imports