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

3744 files changed, 0 insertions, 0 deletions

diff --git a/pki/.classpath b/.classpath
index 891959cbc..891959cbc 100644
--- a/pki/.classpath
+++ b/.classpath
diff --git a/pki/.gitignore b/.gitignore
index dc84959d1..dc84959d1 100644
--- a/pki/.gitignore
+++ b/.gitignore
diff --git a/pki/.project b/.project
index cc1a7216a..cc1a7216a 100644
--- a/pki/.project
+++ b/.project
diff --git a/pki/CMakeLists.txt b/CMakeLists.txt
index 3a23bf974..3a23bf974 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 019564eaf..019564eaf 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 31e79d64d..31e79d64d 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 c1eecc19d..c1eecc19d 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 caf71e965..caf71e965 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 2adda5467..2adda5467 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 8b2a48a3d..8b2a48a3d 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 6d0555ad8..6d0555ad8 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 abbfbfc9f..abbfbfc9f 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 aba2db149..aba2db149 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 94de0d90b..94de0d90b 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 49e88a5bb..49e88a5bb 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 5a95c530b..5a95c530b 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 5a35f6fbc..5a35f6fbc 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 57f759d16..57f759d16 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 fada5eb88..fada5eb88 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 38d8aee72..38d8aee72 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 c58572400..c58572400 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 d193365ce..d193365ce 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 e982b1bb2..e982b1bb2 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 9036a3652..9036a3652 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 1646e22ff..1646e22ff 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 376dce8b0..376dce8b0 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 060ab7dcb..060ab7dcb 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 15224c00c..15224c00c 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 e363f01d2..e363f01d2 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 f98276ec5..f98276ec5 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 cb6e3e4ce..cb6e3e4ce 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 5bf52f1b8..5bf52f1b8 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 4ff2c6a7f..4ff2c6a7f 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 8f68f870b..8f68f870b 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 81dcccbbd..81dcccbbd 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 b623f006b..b623f006b 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 3904f5ed5..3904f5ed5 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 684b8c8a9..684b8c8a9 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 5203fa180..5203fa180 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 ff657351f..ff657351f 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 e77fff3ca..e77fff3ca 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 655366518..655366518 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 bb04f0698..bb04f0698 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 c82fa72a8..c82fa72a8 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 0b91fa675..0b91fa675 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 f8cb47ec6..f8cb47ec6 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 0f024ea64..0f024ea64 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 b0806eb65..b0806eb65 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 95fc6bf55..95fc6bf55 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 02001338b..02001338b 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 0960311ee..0960311ee 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 ef8c62f8f..ef8c62f8f 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 f17038eff..f17038eff 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 dc64d322a..dc64d322a 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 0284de58c..0284de58c 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 4c2670b00..4c2670b00 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 52b1b9ade..52b1b9ade 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 7bf76ba6f..7bf76ba6f 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 b305d627b..b305d627b 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 99caba2be..99caba2be 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 169ed443c..169ed443c 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 db016f248..db016f248 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 2d0f81ee8..2d0f81ee8 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 ea3342308..ea3342308 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 786148a0e..786148a0e 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 f8a69f65d..f8a69f65d 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 50ea8fdc7..50ea8fdc7 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 57385d700..57385d700 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 a0f4ed93b..a0f4ed93b 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 b74131a68..b74131a68 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 835ad0ed1..835ad0ed1 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 4e8b0205d..4e8b0205d 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 2006c8f23..2006c8f23 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 902c0aad3..902c0aad3 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 dc3186497..dc3186497 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 b53e7c66f..b53e7c66f 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 f2b6a03d4..f2b6a03d4 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 00f9c8460..00f9c8460 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 ac98c6c36..ac98c6c36 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 a32dfc2ea..a32dfc2ea 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 4c9626806..4c9626806 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 a9cdbbf33..a9cdbbf33 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 7a500bde6..7a500bde6 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 d23895088..d23895088 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 ad89cc72b..ad89cc72b 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 86ca5912e..86ca5912e 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 634b5d90e..634b5d90e 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 796c4255b..796c4255b 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 fc8c8ec8a..fc8c8ec8a 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 7db522547..7db522547 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 e1d992e40..e1d992e40 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 e0cfe429b..e0cfe429b 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 0b7d7ee86..0b7d7ee86 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 79d429d71..79d429d71 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 912d48f69..912d48f69 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 1d60e3b07..1d60e3b07 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 75800304c..75800304c 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 d4a4c1278..d4a4c1278 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 3470b206d..3470b206d 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 6e6a47c9f..6e6a47c9f 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 97f9792fb..97f9792fb 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 bc545a9ba..bc545a9ba 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 81d5cbefb..81d5cbefb 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 3bce367d9..3bce367d9 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 139585f2c..139585f2c 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 18bd35183..18bd35183 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 b4fecd155..b4fecd155 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 9f892cd25..9f892cd25 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 c85034918..c85034918 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 1d3eaff14..1d3eaff14 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/NameValuePair.java b/base/common/src/com/netscape/certsrv/common/NameValuePair.java
index 92466d30d..92466d30d 100644
--- a/pki/base/common/src/com/netscape/certsrv/common/NameValuePair.java
+++ b/base/common/src/com/netscape/certsrv/common/NameValuePair.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 a2530521a..a2530521a 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 9cfcab4a2..9cfcab4a2 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 11a58c5d2..11a58c5d2 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 0be3fdf0a..0be3fdf0a 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 458822ff5..458822ff5 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 e89c14f57..e89c14f57 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 a52d90e94..a52d90e94 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 610ab30ed..610ab30ed 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 83241170a..83241170a 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 593261d9e..593261d9e 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 90dcbaa26..90dcbaa26 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 7838aa5eb..7838aa5eb 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 b9305816e..b9305816e 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 54e65ce30..54e65ce30 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 b0fa4bff0..b0fa4bff0 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 28709b705..28709b705 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 28402dba7..28402dba7 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 d7b82f25d..d7b82f25d 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 c1c8c3b39..c1c8c3b39 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 1616e7418..1616e7418 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 faf18a342..faf18a342 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 09364dc69..09364dc69 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 71356eb4f..71356eb4f 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 e82a3a14c..e82a3a14c 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 93b1f87fb..93b1f87fb 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 d43145d8b..d43145d8b 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 d31ccd468..d31ccd468 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 3a28b1337..3a28b1337 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 0e3108182..0e3108182 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 febb684cc..febb684cc 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 cc8c38187..cc8c38187 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 c036909de..c036909de 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 15e396943..15e396943 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 f0d98fd59..f0d98fd59 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 ffac9b37b..ffac9b37b 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 f795ff9a6..f795ff9a6 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 aced5cc1f..aced5cc1f 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 324a7df17..324a7df17 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/KeyState.java b/base/common/src/com/netscape/certsrv/dbs/keydb/KeyState.java
index a6b7fa031..a6b7fa031 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 e92d13a16..e92d13a16 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 7ee01b3f1..7ee01b3f1 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 5e6db669f..5e6db669f 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 5764f4005..5764f4005 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 297b44262..297b44262 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 b50638ddc..b50638ddc 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 55f348b11..55f348b11 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 37528c603..37528c603 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 410629982..410629982 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 9e6d2b4de..9e6d2b4de 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 d30ccbf35..d30ccbf35 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 d610ee909..d610ee909 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 00c057902..00c057902 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 7992d5fb0..7992d5fb0 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 e130b95c2..e130b95c2 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 b2d02f2a3..b2d02f2a3 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 5fe5a4025..5fe5a4025 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 571380eaf..571380eaf 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 c4d58f0a0..c4d58f0a0 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 74f66992b..74f66992b 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 5fe06f921..5fe06f921 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 3f829aa31..3f829aa31 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 b6b04a760..b6b04a760 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 13cadf2ab..13cadf2ab 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 71b810709..71b810709 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 8ac2cd505..8ac2cd505 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 f56bf4d3e..f56bf4d3e 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 3cf762663..3cf762663 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 79a8aecb4..79a8aecb4 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 40dad6eb9..40dad6eb9 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 83f6bd68d..83f6bd68d 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 7fae366d8..7fae366d8 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 8fa1249f6..8fa1249f6 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 3fae432df..3fae432df 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 750e35807..750e35807 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 c45b5d129..c45b5d129 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 d15033657..d15033657 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 49d55f360..49d55f360 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 1775c8644..1775c8644 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 fc9540e55..fc9540e55 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 d0caca71d..d0caca71d 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 b0fd0ce18..b0fd0ce18 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 e970d4182..e970d4182 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 65d4136c7..65d4136c7 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 82bde43f4..82bde43f4 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 b4a7070a7..b4a7070a7 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 30ee30836..30ee30836 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 942b570db..942b570db 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 ea97fe3d6..ea97fe3d6 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 648d3b18c..648d3b18c 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 a5347ff43..a5347ff43 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 234c7a46d..234c7a46d 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 6b654da40..6b654da40 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 2382412c4..2382412c4 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 74c97402b..74c97402b 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 4301f5327..4301f5327 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 e9cdbdfa1..e9cdbdfa1 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 a9c24fdc1..a9c24fdc1 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 84b223a88..84b223a88 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 9bd9ba027..9bd9ba027 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 8576864e8..8576864e8 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 5c814fd2e..5c814fd2e 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 ddf4325c2..ddf4325c2 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 bb84a72fa..bb84a72fa 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 ef6c5af66..ef6c5af66 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 fe6426306..fe6426306 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 a65e2e5ff..a65e2e5ff 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 bfd0e7c20..bfd0e7c20 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 e5deb476a..e5deb476a 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 0dac71068..0dac71068 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 5b33fc888..5b33fc888 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 c1526284a..c1526284a 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 dbaa97394..dbaa97394 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 51584fb96..51584fb96 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 13ba5f616..13ba5f616 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 1d173f28f..1d173f28f 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 7b5f44650..7b5f44650 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 341c006f0..341c006f0 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 d7eeb1cfb..d7eeb1cfb 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 1132b9831..1132b9831 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 7bf2026e2..7bf2026e2 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 e0ecfb16f..e0ecfb16f 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 ca7b1f01e..ca7b1f01e 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 f7c80f1f8..f7c80f1f8 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 8593da163..8593da163 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 6c48fcb91..6c48fcb91 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 197db3bcf..197db3bcf 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 9a626ef22..9a626ef22 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 c8af3275c..c8af3275c 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 f56f47160..f56f47160 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 cb368f9da..cb368f9da 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 0aa8bb234..0aa8bb234 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 262d3eafb..262d3eafb 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 149cf33c2..149cf33c2 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 aa8492210..aa8492210 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 20b9af977..20b9af977 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 1b6bea720..1b6bea720 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 ad9484648..ad9484648 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 9577cb08f..9577cb08f 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 cf54a4ba4..cf54a4ba4 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 a550b6445..a550b6445 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 a4b0ecb2d..a4b0ecb2d 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 3be0aa1ea..3be0aa1ea 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 c37d484b8..c37d484b8 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 1bba0a577..1bba0a577 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 c6d66b43b..c6d66b43b 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 be33dc599..be33dc599 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 16ad10b4d..16ad10b4d 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 6e0a98121..6e0a98121 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 f7198edef..f7198edef 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 325207a32..325207a32 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 8294c6772..8294c6772 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 ed1592aab..ed1592aab 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 d7ac48046..d7ac48046 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 51252c55a..51252c55a 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 5fa549025..5fa549025 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 bc9cda999..bc9cda999 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 2201c1bad..2201c1bad 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 700e0c6de..700e0c6de 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 42e33af5d..42e33af5d 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 6f4b52586..6f4b52586 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 8b51a8f79..8b51a8f79 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 cbefe9ed6..cbefe9ed6 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 245771e75..245771e75 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 445d0aa15..445d0aa15 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 f9a47a1c5..f9a47a1c5 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 4444fc947..4444fc947 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 56a8f92dd..56a8f92dd 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 9a80083f6..9a80083f6 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 7408e9cbf..7408e9cbf 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 5a126cf9b..5a126cf9b 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 1de355906..1de355906 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 09b37e39c..09b37e39c 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 9eb438c4f..9eb438c4f 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 6d9f89d5d..6d9f89d5d 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 b7bdfbf2c..b7bdfbf2c 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 d567e8f46..d567e8f46 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 a2704eed1..a2704eed1 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 5e41b54f2..5e41b54f2 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 9bd7fa857..9bd7fa857 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 e7036d1ec..e7036d1ec 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 d4ff15b7c..d4ff15b7c 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 d74a32a43..d74a32a43 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 f54352ce1..f54352ce1 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 a01ceb8cd..a01ceb8cd 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 29adf3a0f..29adf3a0f 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 7cf31557f..7cf31557f 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 9b2edf9b4..9b2edf9b4 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 a04c6b342..a04c6b342 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 ecb2e0fa3..ecb2e0fa3 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 c32c66985..c32c66985 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 4d877a775..4d877a775 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 aeaf757a6..aeaf757a6 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 6c750903d..6c750903d 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 2750e3d82..2750e3d82 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 01bd65d3b..01bd65d3b 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/RequestStatus.java b/base/common/src/com/netscape/certsrv/request/RequestStatus.java
index ad3b91e78..ad3b91e78 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 17367befd..17367befd 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 3b50d3294..3b50d3294 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 2e4c0a9ee..2e4c0a9ee 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 af7030f06..af7030f06 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 ac46a271d..ac46a271d 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 0b484bdc7..0b484bdc7 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 4211806fc..4211806fc 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 1ad0e378c..1ad0e378c 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 87dd298f7..87dd298f7 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 697646493..697646493 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 b38b574cf..b38b574cf 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 8c2353287..8c2353287 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 2124e5d4a..2124e5d4a 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 783f8955d..783f8955d 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 a44626b64..a44626b64 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 1c1551c5a..1c1551c5a 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 f3b955c27..f3b955c27 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 ca8d866ea..ca8d866ea 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 b932a1855..b932a1855 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 d679f0a1f..d679f0a1f 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 dfaa04cc4..dfaa04cc4 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 6d8ec2b8f..6d8ec2b8f 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 db2aca24c..db2aca24c 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 8644e4f6f..8644e4f6f 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 3e36d9cc2..3e36d9cc2 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 2f7e10a71..2f7e10a71 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 b34ba8f4a..b34ba8f4a 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 091a19fdc..091a19fdc 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 febcb9e84..febcb9e84 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 01a392494..01a392494 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 98eb9e9b5..98eb9e9b5 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 ed4f28b83..ed4f28b83 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 b64ac4622..b64ac4622 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 05a92f8d4..05a92f8d4 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 2849f5ecc..2849f5ecc 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 e4f700054..e4f700054 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 bef5e8c2a..bef5e8c2a 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 eb09e5b47..eb09e5b47 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 950120399..950120399 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 80d51c4f5..80d51c4f5 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 1b1394175..1b1394175 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 a03b298e6..a03b298e6 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 fe05dec9d..fe05dec9d 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 12ea8f041..12ea8f041 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 9f49c2fd1..9f49c2fd1 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 ee011b0e2..ee011b0e2 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 7a3993cde..7a3993cde 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 98bf72f47..98bf72f47 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 937531933..937531933 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 07f072914..07f072914 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 41f178163..41f178163 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 7b6e41da0..7b6e41da0 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 4416a52fd..4416a52fd 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 c929f80ec..c929f80ec 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 e8cb1f121..e8cb1f121 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 16039767d..16039767d 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 5abd0de5d..5abd0de5d 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 578faaa52..578faaa52 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 c8c70138b..c8c70138b 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 2bde395a6..2bde395a6 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 f263e0257..f263e0257 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 3f500b464..3f500b464 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 df0e9e350..df0e9e350 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 d1dfce9df..d1dfce9df 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 cf66e9d76..cf66e9d76 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 f273c3201..f273c3201 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 f51fd2cbb..f51fd2cbb 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 3c041219d..3c041219d 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 dcdfe2c48..dcdfe2c48 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 e5faeeff5..e5faeeff5 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 2e26264f8..2e26264f8 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 5da23d045..5da23d045 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 03df4843d..03df4843d 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 88a8bf35d..88a8bf35d 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 1813bd639..1813bd639 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 c9b4c4a7f..c9b4c4a7f 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 5a1500587..5a1500587 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 c678a4b4b..c678a4b4b 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 3027415be..3027415be 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 cc64ea6f6..cc64ea6f6 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 c00955813..c00955813 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 32702d00d..32702d00d 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 e85911137..e85911137 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 7c9c2bb1f..7c9c2bb1f 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 f3ffaf3fe..f3ffaf3fe 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 6901abc34..6901abc34 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 d0bd6a6bc..d0bd6a6bc 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 0702ef29c..0702ef29c 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 3410c7baa..3410c7baa 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 4623826f0..4623826f0 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 8fca9a2fa..8fca9a2fa 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 5746a3b21..5746a3b21 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 181752b01..181752b01 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 d88bb3c02..d88bb3c02 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 b30e27901..b30e27901 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 5cadafa17..5cadafa17 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 60f294e36..60f294e36 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 1afb9cbba..1afb9cbba 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 be9870935..be9870935 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 dffde5806..dffde5806 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 a2aeef09d..a2aeef09d 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 040b5e205..040b5e205 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 832d77746..832d77746 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 054379bb5..054379bb5 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 b170925c4..b170925c4 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 73a6b58af..73a6b58af 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 84664b09d..84664b09d 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 bcf9d11cb..bcf9d11cb 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 e761ecfab..e761ecfab 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 a8d5f8a0c..a8d5f8a0c 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 783ab2b6e..783ab2b6e 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 9a07cb020..9a07cb020 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 240076c95..240076c95 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 d824e452e..d824e452e 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 05a17cfcd..05a17cfcd 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 5fa6bae9c..5fa6bae9c 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 b204e57b2..b204e57b2 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 289e2d297..289e2d297 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 4396a09dd..4396a09dd 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 aafecb17a..aafecb17a 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 60da8f9a3..60da8f9a3 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 468abdf7b..468abdf7b 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 b8dba995e..b8dba995e 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 32e2c48fb..32e2c48fb 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 eb7dba173..eb7dba173 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 be065245a..be065245a 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 a8069be29..a8069be29 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 aac1bb3c0..aac1bb3c0 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 d525689bd..d525689bd 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 c3b2a5ddc..c3b2a5ddc 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 cc8789390..cc8789390 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 dd994e83a..dd994e83a 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 12bbaa783..12bbaa783 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 bf9594fa7..bf9594fa7 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 cd980c5c2..cd980c5c2 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 c83f05746..c83f05746 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 a6acf111e..a6acf111e 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 c9aa0c65d..c9aa0c65d 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 7455eb28c..7455eb28c 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 ca7d41fc4..ca7d41fc4 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 5e0627db7..5e0627db7 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 42a2d1aa2..42a2d1aa2 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 5dd83f28b..5dd83f28b 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 d628f5d6a..d628f5d6a 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 ff87f9045..ff87f9045 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 2ae8e5346..2ae8e5346 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 30e81e7e7..30e81e7e7 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 da2498b15..da2498b15 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 1e81bd682..1e81bd682 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 4e9a9c34d..4e9a9c34d 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 1770c13ef..1770c13ef 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 17a5d4bc4..17a5d4bc4 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 b4b37fcf0..b4b37fcf0 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 2c42841b4..2c42841b4 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 a2a2b9da0..a2a2b9da0 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 520e7c0a6..520e7c0a6 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 49b929fa1..49b929fa1 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 0995a142c..0995a142c 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 907a5830c..907a5830c 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 f298238b0..f298238b0 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 d0a42a816..d0a42a816 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 7cb5e72b1..7cb5e72b1 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 f80e98a4a..f80e98a4a 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 c45798281..c45798281 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 e51c03b40..e51c03b40 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 ddc0403c9..ddc0403c9 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 773182e11..773182e11 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 3403767b7..3403767b7 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 95f670386..95f670386 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 493383b3e..493383b3e 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 16a5fe2be..16a5fe2be 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 286913c5a..286913c5a 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 05449eec2..05449eec2 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 1c38dedce..1c38dedce 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 8da1809d7..8da1809d7 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 c3ea31211..c3ea31211 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 fb6518043..fb6518043 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 72d076ca5..72d076ca5 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 d9ef59c11..d9ef59c11 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 46fd5be18..46fd5be18 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 b3061837a..b3061837a 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 7da63e71e..7da63e71e 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 afd3fcd0a..afd3fcd0a 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 4c20769ed..4c20769ed 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 27a2c496f..27a2c496f 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 d19b5e5b8..d19b5e5b8 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 a5594917e..a5594917e 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 258b470fa..258b470fa 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 a8e2900d7..a8e2900d7 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 4bbe0669e..4bbe0669e 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 e16c032a5..e16c032a5 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 f0af47f70..f0af47f70 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 5a967a245..5a967a245 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 fe1c92fc3..fe1c92fc3 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 b1f09e427..b1f09e427 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 ef7fe53cf..ef7fe53cf 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 4c368c03e..4c368c03e 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 565b7795e..565b7795e 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 dfb7be887..dfb7be887 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 4fb7ae863..4fb7ae863 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 f704a2297..f704a2297 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 b604da1d8..b604da1d8 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 6358f272d..6358f272d 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 ac913a93e..ac913a93e 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 cc8f9a70d..cc8f9a70d 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 2eeaac114..2eeaac114 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 93aaa11b9..93aaa11b9 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 1f2512ff3..1f2512ff3 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 fec7ceabb..fec7ceabb 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 eac2ffc69..eac2ffc69 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 20b8c571c..20b8c571c 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 367c20646..367c20646 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 0ed01cb38..0ed01cb38 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 516560c0d..516560c0d 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 213d7a834..213d7a834 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 e6a9a9082..e6a9a9082 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 4e3720880..4e3720880 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 7898ce2c1..7898ce2c1 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 334f0c98f..334f0c98f 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 6bf4ca8d5..6bf4ca8d5 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 7a0bc4130..7a0bc4130 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 dde5950bc..dde5950bc 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 6fcebad01..6fcebad01 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 3a55b4ebe..3a55b4ebe 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 49fce4994..49fce4994 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 ff445bb5e..ff445bb5e 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 6e9e0e74a..6e9e0e74a 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 129c12659..129c12659 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 2785cc6cd..2785cc6cd 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 e26252dda..e26252dda 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 85fdaae04..85fdaae04 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 18af1a98b..18af1a98b 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 5b6533e13..5b6533e13 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 654a93150..654a93150 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 ca8a07ef4..ca8a07ef4 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 074d21ee0..074d21ee0 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 543088ecb..543088ecb 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 fbc5cf6d1..fbc5cf6d1 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 846ea7c48..846ea7c48 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/Utils.java b/base/common/src/com/netscape/cms/publish/publishers/Utils.java
index 358a762b3..358a762b3 100644
--- a/pki/base/common/src/com/netscape/cms/publish/publishers/Utils.java
+++ b/base/common/src/com/netscape/cms/publish/publishers/Utils.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 36bb5cd2a..36bb5cd2a 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 d2b54c3b8..d2b54c3b8 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 19fb71cff..19fb71cff 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 ec8651059..ec8651059 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 5338cfff8..5338cfff8 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 2cf481dde..2cf481dde 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 a05294a8e..a05294a8e 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 2bfe9ffd9..2bfe9ffd9 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 f87c07128..f87c07128 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 b030759f7..b030759f7 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 7bac528e9..7bac528e9 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 4e97c2d52..4e97c2d52 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 f7f9ce16a..f7f9ce16a 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 fd7edfabd..fd7edfabd 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 354015e13..354015e13 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 5f2bf07c9..5f2bf07c9 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 77ac6437e..77ac6437e 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 af506433d..af506433d 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 423095d51..423095d51 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 23656942c..23656942c 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 aafe4f4bc..aafe4f4bc 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 91309e08c..91309e08c 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 8306bc77e..8306bc77e 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 d840f6cda..d840f6cda 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 c5ec93f3a..c5ec93f3a 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 78d88c9b3..78d88c9b3 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/UsrGrpAdminServlet.java b/base/common/src/com/netscape/cms/servlet/admin/UsrGrpAdminServlet.java
index 5ac9e0dd1..5ac9e0dd1 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/CMSServlet.java b/base/common/src/com/netscape/cms/servlet/base/CMSServlet.java
index c823143be..c823143be 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 5a450251e..5a450251e 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 706c406cd..706c406cd 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 59d307084..59d307084 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 74c6cf445..74c6cf445 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 04dfd9210..04dfd9210 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 7443b0144..7443b0144 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 3b4315266..3b4315266 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 ac6889c09..ac6889c09 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 02ab5b521..02ab5b521 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/cert/CMCRevReqServlet.java b/base/common/src/com/netscape/cms/servlet/cert/CMCRevReqServlet.java
index 9ed435c07..9ed435c07 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 d3e7a5a32..d3e7a5a32 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 59ee9a4ec..59ee9a4ec 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 5e4309494..5e4309494 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 d75844d2a..d75844d2a 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 3a0c48a94..3a0c48a94 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 9c7b022dd..9c7b022dd 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 0062a4e7e..0062a4e7e 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 f141067c2..f141067c2 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 f05e85a0f..f05e85a0f 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 a21c8374a..a21c8374a 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 a086552e8..a086552e8 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 a469e674e..a469e674e 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 a0de7ebdd..a0de7ebdd 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 196c56a9b..196c56a9b 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 4093b989f..4093b989f 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 6298b7d59..6298b7d59 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 c122da1de..c122da1de 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 7f1196bab..7f1196bab 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 4d9515861..4d9515861 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 3f4eb66a9..3f4eb66a9 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 98da80372..98da80372 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 d7160daa6..d7160daa6 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 6b4e76496..6b4e76496 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 bb39b3ad8..bb39b3ad8 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 f046ebc9d..f046ebc9d 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 fb0bf75da..fb0bf75da 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 67a829f9d..67a829f9d 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 95622c9bb..95622c9bb 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 3f74a2696..3f74a2696 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 52b66874f..52b66874f 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 5f5afad1d..5f5afad1d 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/scep/CRSEnrollment.java b/base/common/src/com/netscape/cms/servlet/cert/scep/CRSEnrollment.java
index 246d9a478..246d9a478 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 3e94228a1..3e94228a1 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 616eab27b..616eab27b 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 7407a80cd..7407a80cd 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 6cd9e7afb..6cd9e7afb 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 523a1f94b..523a1f94b 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 4a5b767ef..4a5b767ef 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 486e28276..486e28276 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 d05f2cefa..d05f2cefa 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 0f13f9d74..0f13f9d74 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 61c77287c..61c77287c 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 94fcffc55..94fcffc55 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 d64e21755..d64e21755 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 eda5a6dc2..eda5a6dc2 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 a9db8ec6d..a9db8ec6d 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 4157b320a..4157b320a 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 3329ce7ec..3329ce7ec 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 1e0afb328..1e0afb328 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 b3d2c493c..b3d2c493c 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 eff3b073a..eff3b073a 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 6064880ce..6064880ce 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 60dd865f0..60dd865f0 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 27ea5ec1b..27ea5ec1b 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 cd82096a7..cd82096a7 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 fb31fec1c..fb31fec1c 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/Utils.java b/base/common/src/com/netscape/cms/servlet/common/Utils.java
index 9259a2c12..9259a2c12 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/common/Utils.java
+++ b/base/common/src/com/netscape/cms/servlet/common/Utils.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 0b147c58d..0b147c58d 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 daf595f81..daf595f81 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 2f41efc14..2f41efc14 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 1e96bf948..1e96bf948 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 435c92fa2..435c92fa2 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 c205dad95..c205dad95 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 18741bfb0..18741bfb0 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 77aa5bda3..77aa5bda3 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 7e2aedad2..7e2aedad2 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 9bbb09005..9bbb09005 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 316c5706d..316c5706d 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 4aca6cec7..4aca6cec7 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 bd4893915..bd4893915 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 1a67cf129..1a67cf129 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 dc8adaf97..dc8adaf97 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 829e46a44..829e46a44 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 8017a893f..8017a893f 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 6acb71273..6acb71273 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 0a9d9a9cd..0a9d9a9cd 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 73150946b..73150946b 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 56da3a232..56da3a232 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 caee8c1d4..caee8c1d4 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 536dfe770..536dfe770 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 892d24584..892d24584 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 b22178b48..b22178b48 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 e07ea3c3b..e07ea3c3b 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 a99969880..a99969880 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 6c8cbbb19..6c8cbbb19 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 03f8f2f86..03f8f2f86 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 cf25ab0e9..cf25ab0e9 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 2c0184f26..2c0184f26 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 9b8d62537..9b8d62537 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 ecc1e7e40..ecc1e7e40 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 3a9a36e91..3a9a36e91 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 c47bfdc1c..c47bfdc1c 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 7b3e69dc5..7b3e69dc5 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 f2b4589e3..f2b4589e3 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 5f533fbe4..5f533fbe4 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 ab6a1aa01..ab6a1aa01 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 442826c42..442826c42 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 21e64086e..21e64086e 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 653387bf4..653387bf4 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 9b4a3ae3f..9b4a3ae3f 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 8a730d519..8a730d519 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 1d884856f..1d884856f 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 e1d360be0..e1d360be0 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 ca3879adb..ca3879adb 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 ff8d08b85..ff8d08b85 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 e5852cf59..e5852cf59 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 9230ef5b7..9230ef5b7 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 9e0b3c863..9e0b3c863 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 e7a1286c0..e7a1286c0 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 c34f56069..c34f56069 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 f336cd84c..f336cd84c 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 4f0a19d8b..4f0a19d8b 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 160cc74c3..160cc74c3 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 b4ee2721c..b4ee2721c 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 92f2e2568..92f2e2568 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 810e89340..810e89340 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 ebcafe86b..ebcafe86b 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 d5c4f017d..d5c4f017d 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 78763dfb2..78763dfb2 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 77650dbfd..77650dbfd 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 b2b8b5d28..b2b8b5d28 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 cb3cf7543..cb3cf7543 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 2871b9e41..2871b9e41 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 821fc8e7c..821fc8e7c 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 75e02a24b..75e02a24b 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 da16dc01d..da16dc01d 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 3c11dbd55..3c11dbd55 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 69634506e..69634506e 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 0f8d64a0b..0f8d64a0b 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 42764e7ff..42764e7ff 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 9f996546e..9f996546e 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 e52bb44ed..e52bb44ed 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 4d4607ba1..4d4607ba1 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 36d991937..36d991937 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 47ed5d0e9..47ed5d0e9 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 4c5f86c3e..4c5f86c3e 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 dbb5356cc..dbb5356cc 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 8119e4e37..8119e4e37 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 43e772c46..43e772c46 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/RecoverBySerial.java b/base/common/src/com/netscape/cms/servlet/key/RecoverBySerial.java
index 8a30d8544..8a30d8544 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 21e61ed7d..21e61ed7d 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 bd5bca4d5..bd5bca4d5 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/ocsp/AddCAServlet.java b/base/common/src/com/netscape/cms/servlet/ocsp/AddCAServlet.java
index 1e8e02379..1e8e02379 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 9bf6c0b66..9bf6c0b66 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 bfed10291..bfed10291 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 6885eb067..6885eb067 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 df52d1256..df52d1256 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 1054c794e..1054c794e 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 5a1f7a432..5a1f7a432 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 0d9c1137c..0d9c1137c 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 91867216b..91867216b 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 d74dbcd95..d74dbcd95 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 c8db3e3d0..c8db3e3d0 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 bcbe839c1..bcbe839c1 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 e1aea796b..e1aea796b 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 eb4f603e7..eb4f603e7 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 0090e6fdc..0090e6fdc 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 92cfa9bff..92cfa9bff 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 1591d5fdf..1591d5fdf 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 7d0edbbc0..7d0edbbc0 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 fe7936baf..fe7936baf 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 27280d4e5..27280d4e5 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 ce9e5a630..ce9e5a630 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 c548d0db9..c548d0db9 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 bfa971052..bfa971052 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 bfb95d293..bfb95d293 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 a41264f70..a41264f70 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 00039067b..00039067b 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/ProcessCertReq.java b/base/common/src/com/netscape/cms/servlet/request/ProcessCertReq.java
index 92d7b580c..92d7b580c 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 c854f7bf8..c854f7bf8 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 86814469c..86814469c 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 742d644d7..742d644d7 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 0211c311e..0211c311e 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/tks/TokenServlet.java b/base/common/src/com/netscape/cms/servlet/tks/TokenServlet.java
index 4cc2654b7..4cc2654b7 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 199a4f4d1..199a4f4d1 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 5de52fc28..5de52fc28 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 0e29e1f0c..0e29e1f0c 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 8c3d75b22..8c3d75b22 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 da6b8ee7a..da6b8ee7a 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 638eae082..638eae082 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 27d2e3f7d..27d2e3f7d 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 78fe9069f..78fe9069f 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 21a39ec8f..21a39ec8f 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 f04eb1869..f04eb1869 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 b6cb0e6f7..b6cb0e6f7 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 b9e0ede9d..b9e0ede9d 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 518e89f53..518e89f53 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 b2914686e..b2914686e 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 1c675b8ae..1c675b8ae 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 7aca9ae54..7aca9ae54 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 90963e324..90963e324 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 9ceae4487..9ceae4487 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 9dd1ef57d..9dd1ef57d 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 2e0d19201..2e0d19201 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 79bb60c67..79bb60c67 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 93d88a550..93d88a550 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 f8dd97aa5..f8dd97aa5 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 e2584accf..e2584accf 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 9b192905f..9b192905f 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 442a93671..442a93671 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 f95a61610..f95a61610 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 9b6c3dfe0..9b6c3dfe0 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 882a38c0c..882a38c0c 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 4bff90949..4bff90949 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 979e0fdd8..979e0fdd8 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 693d881c5..693d881c5 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 2f7c08dee..2f7c08dee 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 41020abd1..41020abd1 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 09aea0aca..09aea0aca 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 7fd33f95f..7fd33f95f 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 550756f31..550756f31 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 026dbfcbc..026dbfcbc 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 1f2d16136..1f2d16136 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 0efc09d33..0efc09d33 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 208fc5e7f..208fc5e7f 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 7db508fb6..7db508fb6 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 4ce3ed848..4ce3ed848 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 b9e32cbd9..b9e32cbd9 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 50b09fd2a..50b09fd2a 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 efc97c435..efc97c435 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 6a9703b69..6a9703b69 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 825f4d564..825f4d564 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 78fddaf5c..78fddaf5c 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 fbb652282..fbb652282 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 04529be69..04529be69 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 c0afbe742..c0afbe742 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 fcb806bb5..fcb806bb5 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 ad065f924..ad065f924 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 8d7f19ca6..8d7f19ca6 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 c2eba5acb..c2eba5acb 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 c444a45ac..c444a45ac 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 308d801e3..308d801e3 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 18b8c1bf5..18b8c1bf5 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 6b910ebbb..6b910ebbb 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 df5fe2cf0..df5fe2cf0 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 660e385fe..660e385fe 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 03c86a219..03c86a219 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 475a77dcb..475a77dcb 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 b7f6cd616..b7f6cd616 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 797dd8324..797dd8324 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 8a3b3cba7..8a3b3cba7 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 e073fe633..e073fe633 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 8b0009479..8b0009479 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 2293bea26..2293bea26 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 7a5e02a04..7a5e02a04 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 7b6fcdb8d..7b6fcdb8d 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 250e66e6c..250e66e6c 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 eaaf3779f..eaaf3779f 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 cc4298993..cc4298993 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 0630efa7c..0630efa7c 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 db5db02c9..db5db02c9 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 9006081f5..9006081f5 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 c3248ec12..c3248ec12 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 5c02b4014..5c02b4014 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 4d93f843a..4d93f843a 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 ddf292b12..ddf292b12 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 df84b1156..df84b1156 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 7aa63fa1d..7aa63fa1d 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 436c8633e..436c8633e 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 81ae72053..81ae72053 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 6ee2c7bb2..6ee2c7bb2 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 e9fbd64e7..e9fbd64e7 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 2ec203eb6..2ec203eb6 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 b7e386f77..b7e386f77 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 29e1db849..29e1db849 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 aceb6f1bf..aceb6f1bf 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 db618f6f0..db618f6f0 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 b97168163..b97168163 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 e8923eef8..e8923eef8 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 a52f37526..a52f37526 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 feddc69ad..feddc69ad 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 598ae198b..598ae198b 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 273a21c96..273a21c96 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 ae0e1a310..ae0e1a310 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 b8e62d896..b8e62d896 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 0afd0ed43..0afd0ed43 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 d467bd957..d467bd957 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 d3872740e..d3872740e 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 d3646c7b8..d3646c7b8 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 6818a48bf..6818a48bf 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 488524e9d..488524e9d 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 fbc99608a..fbc99608a 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 4be6bc33b..4be6bc33b 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 667e68a85..667e68a85 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 31e3dca1c..31e3dca1c 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 8a6b98fc3..8a6b98fc3 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 ba037d854..ba037d854 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 b9f7d78eb..b9f7d78eb 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 a7961e207..a7961e207 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 e8c7032d1..e8c7032d1 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 0af38f168..0af38f168 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 24336d308..24336d308 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 9a9d4bd4f..9a9d4bd4f 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 b15717ca4..b15717ca4 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 5faa0baba..5faa0baba 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 0bb99fb5b..0bb99fb5b 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 4e5131311..4e5131311 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 b04186c3a..b04186c3a 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 5f053c297..5f053c297 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 483426414..483426414 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 28f0e364c..28f0e364c 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 440e62e85..440e62e85 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 fb3134ffa..fb3134ffa 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 7a8ab4342..7a8ab4342 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 63b28d995..63b28d995 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 3f421fca4..3f421fca4 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 dfbcb0ef6..dfbcb0ef6 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 46a874291..46a874291 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 6ec1fa5c2..6ec1fa5c2 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 7b771442c..7b771442c 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 25635e901..25635e901 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/registry/PluginInfo.java b/base/common/src/com/netscape/cmscore/registry/PluginInfo.java
index d0ed9324e..d0ed9324e 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 a424d8b73..a424d8b73 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 8b06fffbe..8b06fffbe 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 b81d5d211..b81d5d211 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 7494b5e48..7494b5e48 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 cdc5a7eea..cdc5a7eea 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 ea60dc470..ea60dc470 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 f390d436d..f390d436d 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 85995aaa3..85995aaa3 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 c6ab7129e..c6ab7129e 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 2e05e54eb..2e05e54eb 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 182e3470e..182e3470e 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 22d0b8c17..22d0b8c17 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 f702f2e87..f702f2e87 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 f9d8114cd..f9d8114cd 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 35b7cdf2b..35b7cdf2b 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 4f551cd26..4f551cd26 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 279a62347..279a62347 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 299b9f6e6..299b9f6e6 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 afba0a4db..afba0a4db 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 309978f28..309978f28 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 3e343c78c..3e343c78c 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 c6f2f7cbc..c6f2f7cbc 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 0967b0930..0967b0930 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 d38b35b44..d38b35b44 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 4244d0212..4244d0212 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 22e4044ac..22e4044ac 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 5c75d8fd5..5c75d8fd5 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 0427d82d7..0427d82d7 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 f9312c1c4..f9312c1c4 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 0fb4d0d98..0fb4d0d98 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 05aec23dc..05aec23dc 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 4bb5a4fad..4bb5a4fad 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 5ecb4f169..5ecb4f169 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 afc38f49b..afc38f49b 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 7b0675b12..7b0675b12 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 b9b794e9c..b9b794e9c 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 61f6f49ec..61f6f49ec 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 968f9cb80..968f9cb80 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 98a2e8422..98a2e8422 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/OsSubsystem.java b/base/common/src/com/netscape/cmscore/util/OsSubsystem.java
index a3cdcbdef..a3cdcbdef 100644
--- a/pki/base/common/src/com/netscape/cmscore/util/OsSubsystem.java
+++ b/base/common/src/com/netscape/cmscore/util/OsSubsystem.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 ed268df46..ed268df46 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 d7ba11c02..d7ba11c02 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 ba07b2ca0..ba07b2ca0 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 e9b2a6cdd..e9b2a6cdd 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 8114413b0..8114413b0 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/com/netscape/certsrv/app/CMSEngineDefaultStub.java b/base/common/test/com/netscape/certsrv/app/CMSEngineDefaultStub.java
index 3977b05c5..3977b05c5 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 0df5ac1aa..0df5ac1aa 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 b7772bb27..b7772bb27 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 222944a7e..222944a7e 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 2d419b720..2d419b720 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 b533475a1..b533475a1 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 6517c6bf1..6517c6bf1 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 d5a6088d4..d5a6088d4 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 84e0c1b3e..84e0c1b3e 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 45fda77db..45fda77db 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 ad0572aab..ad0572aab 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 3beda6a90..3beda6a90 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 4c8aaddaa..4c8aaddaa 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 177ccbbc3..177ccbbc3 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 884405362..884405362 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 648f019f3..648f019f3 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 02ffbc6b2..02ffbc6b2 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 40f90a0da..40f90a0da 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 310469437..310469437 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 14ed72090..14ed72090 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 cc19d8aba..cc19d8aba 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 b8a897757..b8a897757 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 bad1868b5..bad1868b5 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 2c4de161f..2c4de161f 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 d4646c2a0..d4646c2a0 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 6949e73f6..6949e73f6 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 7c2948795..7c2948795 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 9aa392eaf..9aa392eaf 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 b0dd8bb9e..b0dd8bb9e 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 3b3d8c529..3b3d8c529 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 e57c56271..e57c56271 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 420711e40..420711e40 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 ba03e487b..ba03e487b 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 3fcaedea6..3fcaedea6 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 20116c54c..20116c54c 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 cb8826d2a..cb8826d2a 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 a43df0d12..a43df0d12 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 0ddb90dc4..0ddb90dc4 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 3efcd1bbc..3efcd1bbc 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 723668790..723668790 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 6e22af602..6e22af602 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 9bc141f7b..9bc141f7b 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 d2b25f207..d2b25f207 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 6130f9316..6130f9316 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 0891c63fc..0891c63fc 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 484be33dd..484be33dd 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 be81b035b..be81b035b 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 7c52eab87..7c52eab87 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 274b7d54e..274b7d54e 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 85596d55e..85596d55e 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 ef85e4986..ef85e4986 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 9c3bdf3d3..9c3bdf3d3 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 03fc449f7..03fc449f7 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 3e50148f3..3e50148f3 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 3b2ee1ce4..3b2ee1ce4 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 34b351ea4..34b351ea4 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 f7ed785b5..f7ed785b5 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 2f5aeb593..2f5aeb593 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 8ef18cc79..8ef18cc79 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 712beb32b..712beb32b 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 a4b7740f5..a4b7740f5 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 15f2ca3d3..15f2ca3d3 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 ea7d78c4f..ea7d78c4f 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 b6b831d05..b6b831d05 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 8765f08eb..8765f08eb 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 76f7a73ec..76f7a73ec 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 58628b133..58628b133 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 e12114eb1..e12114eb1 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 b33613014..b33613014 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 9e6d1cf9b..9e6d1cf9b 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 df246f2c5..df246f2c5 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 984e2cb21..984e2cb21 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 57b7b0471..57b7b0471 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 fd2fe0843..fd2fe0843 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 50728b13d..50728b13d 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 66d4ba4ce..66d4ba4ce 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 1235fcc14..1235fcc14 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 f48339b25..f48339b25 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 30211b689..30211b689 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 f3db6374a..f3db6374a 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 c88251f0b..c88251f0b 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 8ac219345..8ac219345 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 8e89dcf45..8e89dcf45 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 e379b53e9..e379b53e9 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 ec7394d4e..ec7394d4e 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 f83a7457c..f83a7457c 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 0a3ceebe2..0a3ceebe2 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 98c188380..98c188380 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 e9047701c..e9047701c 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 05836bc87..05836bc87 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 4487754f2..4487754f2 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 c3b033221..c3b033221 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 12781c6b5..12781c6b5 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 44e1aa512..44e1aa512 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 69d502355..69d502355 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 fb9ed20e7..fb9ed20e7 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 73bf5ca91..73bf5ca91 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 18ad05ba2..18ad05ba2 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 ebe4db5db..ebe4db5db 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 e8ff44e44..e8ff44e44 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 e1ef3631a..e1ef3631a 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 26e065c04..26e065c04 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 b0c262dea..b0c262dea 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 0eb22433d..0eb22433d 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 458885e2a..458885e2a 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 e5fc28135..e5fc28135 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 c09d6efa7..c09d6efa7 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 7ba0636fd..7ba0636fd 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 9a5c0b617..9a5c0b617 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 7d83c8b65..7d83c8b65 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 7539c393c..7539c393c 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 661b7e469..661b7e469 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 b53e200dc..b53e200dc 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 a4e30cd2c..a4e30cd2c 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 0ebfd7cb7..0ebfd7cb7 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 60154d2da..60154d2da 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 109a82e69..109a82e69 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 81adab9f7..81adab9f7 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 b1d0d40d9..b1d0d40d9 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 84852fa4b..84852fa4b 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 8dda6e32d..8dda6e32d 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 dd92d20b3..dd92d20b3 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 01b53e88c..01b53e88c 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 5e66a6357..5e66a6357 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 20fad62ac..20fad62ac 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 f87b03d8c..f87b03d8c 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 1f48ef90d..1f48ef90d 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 ec45287aa..ec45287aa 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 36308e21f..36308e21f 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 237224415..237224415 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 d2a412d18..d2a412d18 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 ca034e61c..ca034e61c 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 52ec30824..52ec30824 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 a4db6dd0a..a4db6dd0a 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 41fabfcc4..41fabfcc4 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 b6eda1308..b6eda1308 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 c6a1a878c..c6a1a878c 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 f25267be5..f25267be5 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 706ed2ccd..706ed2ccd 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 eca04bddc..eca04bddc 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 6ebb84cb6..6ebb84cb6 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 561b8bb19..561b8bb19 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 b54ac7d8d..b54ac7d8d 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 ccf7ac5ae..ccf7ac5ae 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/NameValuePair.java b/base/console/src/com/netscape/certsrv/common/NameValuePair.java
index b2ad3ac29..b2ad3ac29 100644
--- a/pki/base/console/src/com/netscape/certsrv/common/NameValuePair.java
+++ b/base/console/src/com/netscape/certsrv/common/NameValuePair.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 2dd913ea7..2dd913ea7 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/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 90fe31ae4..90fe31ae4 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 bdeaee273..bdeaee273 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 66a6a6cd8..66a6a6cd8 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 d00fb6122..d00fb6122 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 23c6547b4..23c6547b4 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 9c5b74c05..9c5b74c05 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 04d3b4ddc..04d3b4ddc 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 97d4f3551..97d4f3551 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 fafa40991..fafa40991 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 47a77e6ef..47a77e6ef 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 2e61e748b..2e61e748b 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 4f0eb55ca..4f0eb55ca 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 3ce25778b..3ce25778b 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 8d28a04e0..8d28a04e0 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 1cfc72456..1cfc72456 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 30e033926..30e033926 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 150fe5105..150fe5105 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 61058776f..61058776f 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 259fbf914..259fbf914 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 11acde7c7..11acde7c7 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 4d410f16f..4d410f16f 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 b4fdf5d04..b4fdf5d04 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 016839ae9..016839ae9 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 4136eeebb..4136eeebb 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 fe0262c8c..fe0262c8c 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 333983a47..333983a47 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/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 fb1f60c90..fb1f60c90 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 4c219eaaa..4c219eaaa 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 c1eecc19d..c1eecc19d 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 caf71e965..caf71e965 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 fcd849ef2..fcd849ef2 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/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 fdc2779b1..fdc2779b1 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 a023c00b2..a023c00b2 100644
--- a/pki/base/kra/src/CMakeLists.txt
+++ b/base/kra/src/CMakeLists.txt
diff --git a/pki/base/kra/src/com/netscape/kra/EncryptionUnit.java b/base/kra/src/com/netscape/kra/EncryptionUnit.java
index 422eb3a35..422eb3a35 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 2dfc188d2..2dfc188d2 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 f58201e03..f58201e03 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 73488e749..73488e749 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 0913f1487..0913f1487 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 44fec8f32..44fec8f32 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 1310fca76..1310fca76 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 da3c3a87c..da3c3a87c 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/StorageKeyUnit.java b/base/kra/src/com/netscape/kra/StorageKeyUnit.java
index baec75494..baec75494 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 043602a8a..043602a8a 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 385940c95..385940c95 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 380baab99..380baab99 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 298ee027d..298ee027d 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 95f8d56be..95f8d56be 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 1a13f833b..1a13f833b 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 b406a5765..b406a5765 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 3ff4930a4..3ff4930a4 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 3bd1a333a..3bd1a333a 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 088ae441f..088ae441f 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 9eea47fed..9eea47fed 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 a0e557d63..a0e557d63 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 6891d1a9c..6891d1a9c 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 567b707c8..567b707c8 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 caf71e965..caf71e965 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 7ac6247e3..7ac6247e3 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 f7cb01405..f7cb01405 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 80c077daa..80c077daa 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 2e5c16614..2e5c16614 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 25a2b58b7..25a2b58b7 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 e0f593ac5..e0f593ac5 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 498db843f..498db843f 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 6722e26bf..6722e26bf 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 089859c85..089859c85 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 05f18332d..05f18332d 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/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 f8c304b91..f8c304b91 100755
--- a/pki/base/setup/pkicommon.pm
+++ b/base/setup/pkicommon.pm
diff --git a/pki/base/setup/pkicreate b/base/setup/pkicreate
index 5aecd40a8..5aecd40a8 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 45b1fc28d..45b1fc28d 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 4a3ab4a77..4a3ab4a77 100644
--- a/pki/base/silent/src/CMakeLists.txt
+++ b/base/silent/src/CMakeLists.txt
diff --git a/pki/base/silent/src/argparser/ArgParseException.java b/base/silent/src/argparser/ArgParseException.java
index 9253ca24f..9253ca24f 100644
--- a/pki/base/silent/src/argparser/ArgParseException.java
+++ b/base/silent/src/argparser/ArgParseException.java
diff --git a/pki/base/silent/src/argparser/ArgParser.java b/base/silent/src/argparser/ArgParser.java
index 46251787f..46251787f 100755
--- a/pki/base/silent/src/argparser/ArgParser.java
+++ b/base/silent/src/argparser/ArgParser.java
diff --git a/pki/base/silent/src/argparser/ArgParserTest.java b/base/silent/src/argparser/ArgParserTest.java
index 74b4c03e1..74b4c03e1 100644
--- a/pki/base/silent/src/argparser/ArgParserTest.java
+++ b/base/silent/src/argparser/ArgParserTest.java
diff --git a/pki/base/silent/src/argparser/BooleanHolder.java b/base/silent/src/argparser/BooleanHolder.java
index 18a35c058..18a35c058 100644
--- a/pki/base/silent/src/argparser/BooleanHolder.java
+++ b/base/silent/src/argparser/BooleanHolder.java
diff --git a/pki/base/silent/src/argparser/CharHolder.java b/base/silent/src/argparser/CharHolder.java
index b096df9ca..b096df9ca 100644
--- a/pki/base/silent/src/argparser/CharHolder.java
+++ b/base/silent/src/argparser/CharHolder.java
diff --git a/pki/base/silent/src/argparser/DoubleHolder.java b/base/silent/src/argparser/DoubleHolder.java
index 3728ebf2e..3728ebf2e 100644
--- a/pki/base/silent/src/argparser/DoubleHolder.java
+++ b/base/silent/src/argparser/DoubleHolder.java
diff --git a/pki/base/silent/src/argparser/FloatHolder.java b/base/silent/src/argparser/FloatHolder.java
index 4cded9aa4..4cded9aa4 100644
--- a/pki/base/silent/src/argparser/FloatHolder.java
+++ b/base/silent/src/argparser/FloatHolder.java
diff --git a/pki/base/silent/src/argparser/IntHolder.java b/base/silent/src/argparser/IntHolder.java
index fd8403bd1..fd8403bd1 100644
--- a/pki/base/silent/src/argparser/IntHolder.java
+++ b/base/silent/src/argparser/IntHolder.java
diff --git a/pki/base/silent/src/argparser/LongHolder.java b/base/silent/src/argparser/LongHolder.java
index 13a84008b..13a84008b 100644
--- a/pki/base/silent/src/argparser/LongHolder.java
+++ b/base/silent/src/argparser/LongHolder.java
diff --git a/pki/base/silent/src/argparser/ObjectHolder.java b/base/silent/src/argparser/ObjectHolder.java
index 8e3493e1d..8e3493e1d 100644
--- a/pki/base/silent/src/argparser/ObjectHolder.java
+++ b/base/silent/src/argparser/ObjectHolder.java
diff --git a/pki/base/silent/src/argparser/SimpleExample.java b/base/silent/src/argparser/SimpleExample.java
index 58e4d4656..58e4d4656 100644
--- a/pki/base/silent/src/argparser/SimpleExample.java
+++ b/base/silent/src/argparser/SimpleExample.java
diff --git a/pki/base/silent/src/argparser/StringHolder.java b/base/silent/src/argparser/StringHolder.java
index 7737fa4cd..7737fa4cd 100644
--- a/pki/base/silent/src/argparser/StringHolder.java
+++ b/base/silent/src/argparser/StringHolder.java
diff --git a/pki/base/silent/src/argparser/StringScanException.java b/base/silent/src/argparser/StringScanException.java
index b7b4c7d2d..b7b4c7d2d 100644
--- a/pki/base/silent/src/argparser/StringScanException.java
+++ b/base/silent/src/argparser/StringScanException.java
diff --git a/pki/base/silent/src/argparser/StringScanner.java b/base/silent/src/argparser/StringScanner.java
index 425ad3ac1..425ad3ac1 100644
--- a/pki/base/silent/src/argparser/StringScanner.java
+++ b/base/silent/src/argparser/StringScanner.java
diff --git a/pki/base/silent/src/ca/ConfigureCA.java b/base/silent/src/ca/ConfigureCA.java
index f6cf2f5f7..f6cf2f5f7 100644
--- a/pki/base/silent/src/ca/ConfigureCA.java
+++ b/base/silent/src/ca/ConfigureCA.java
diff --git a/pki/base/silent/src/ca/DirEnroll.java b/base/silent/src/ca/DirEnroll.java
index 1bbd662eb..1bbd662eb 100644
--- a/pki/base/silent/src/ca/DirEnroll.java
+++ b/base/silent/src/ca/DirEnroll.java
diff --git a/pki/base/silent/src/ca/Request.java b/base/silent/src/ca/Request.java
index 46711f5a1..46711f5a1 100644
--- a/pki/base/silent/src/ca/Request.java
+++ b/base/silent/src/ca/Request.java
diff --git a/pki/base/silent/src/ca/UserEnroll.java b/base/silent/src/ca/UserEnroll.java
index 4dc277aa0..4dc277aa0 100644
--- a/pki/base/silent/src/ca/UserEnroll.java
+++ b/base/silent/src/ca/UserEnroll.java
diff --git a/pki/base/silent/src/ca/checkRequest.java b/base/silent/src/ca/checkRequest.java
index 238e87c91..238e87c91 100644
--- a/pki/base/silent/src/ca/checkRequest.java
+++ b/base/silent/src/ca/checkRequest.java
diff --git a/pki/base/silent/src/common/AutoInstaller.java b/base/silent/src/common/AutoInstaller.java
index bd4897d76..bd4897d76 100644
--- a/pki/base/silent/src/common/AutoInstaller.java
+++ b/base/silent/src/common/AutoInstaller.java
diff --git a/pki/base/silent/src/common/BaseState.java b/base/silent/src/common/BaseState.java
index e4347c749..e4347c749 100644
--- a/pki/base/silent/src/common/BaseState.java
+++ b/base/silent/src/common/BaseState.java
diff --git a/pki/base/silent/src/common/CMSConfig.java b/base/silent/src/common/CMSConfig.java
index 7f219dfdf..7f219dfdf 100644
--- a/pki/base/silent/src/common/CMSConfig.java
+++ b/base/silent/src/common/CMSConfig.java
diff --git a/pki/base/silent/src/common/CMSInstance.java b/base/silent/src/common/CMSInstance.java
index d8fccb284..d8fccb284 100644
--- a/pki/base/silent/src/common/CMSInstance.java
+++ b/base/silent/src/common/CMSInstance.java
diff --git a/pki/base/silent/src/common/CMSLDAP.java b/base/silent/src/common/CMSLDAP.java
index f5e4989c5..f5e4989c5 100644
--- a/pki/base/silent/src/common/CMSLDAP.java
+++ b/base/silent/src/common/CMSLDAP.java
diff --git a/pki/base/silent/src/common/CMSProperties.java b/base/silent/src/common/CMSProperties.java
index 2c9008b75..2c9008b75 100644
--- a/pki/base/silent/src/common/CMSProperties.java
+++ b/base/silent/src/common/CMSProperties.java
diff --git a/pki/base/silent/src/common/CMSTask.java b/base/silent/src/common/CMSTask.java
index 31ba4547f..31ba4547f 100644
--- a/pki/base/silent/src/common/CMSTask.java
+++ b/base/silent/src/common/CMSTask.java
diff --git a/pki/base/silent/src/common/Certificate_Record.java b/base/silent/src/common/Certificate_Record.java
index 0331e02e5..0331e02e5 100644
--- a/pki/base/silent/src/common/Certificate_Record.java
+++ b/base/silent/src/common/Certificate_Record.java
diff --git a/pki/base/silent/src/common/ComCrypto.java b/base/silent/src/common/ComCrypto.java
index 6afc4f9cf..6afc4f9cf 100644
--- a/pki/base/silent/src/common/ComCrypto.java
+++ b/base/silent/src/common/ComCrypto.java
diff --git a/pki/base/silent/src/common/Con2Agent.java b/base/silent/src/common/Con2Agent.java
index bbf7a12b2..bbf7a12b2 100644
--- a/pki/base/silent/src/common/Con2Agent.java
+++ b/base/silent/src/common/Con2Agent.java
diff --git a/pki/base/silent/src/common/ParseXML.java b/base/silent/src/common/ParseXML.java
index e80c512d0..e80c512d0 100644
--- a/pki/base/silent/src/common/ParseXML.java
+++ b/base/silent/src/common/ParseXML.java
diff --git a/pki/base/silent/src/common/PostQuery.java b/base/silent/src/common/PostQuery.java
index b8ab7505a..b8ab7505a 100644
--- a/pki/base/silent/src/common/PostQuery.java
+++ b/base/silent/src/common/PostQuery.java
diff --git a/pki/base/silent/src/common/ServerInfo.java b/base/silent/src/common/ServerInfo.java
index 09d3e4759..09d3e4759 100644
--- a/pki/base/silent/src/common/ServerInfo.java
+++ b/base/silent/src/common/ServerInfo.java
diff --git a/pki/base/silent/src/common/TestClient.java b/base/silent/src/common/TestClient.java
index e953f09f7..e953f09f7 100644
--- a/pki/base/silent/src/common/TestClient.java
+++ b/base/silent/src/common/TestClient.java
diff --git a/pki/base/silent/src/common/Utilities.java b/base/silent/src/common/Utilities.java
index 444d9b6bf..444d9b6bf 100644
--- a/pki/base/silent/src/common/Utilities.java
+++ b/base/silent/src/common/Utilities.java
diff --git a/pki/base/silent/src/common/createinstance.java b/base/silent/src/common/createinstance.java
index 2fea96d27..2fea96d27 100644
--- a/pki/base/silent/src/common/createinstance.java
+++ b/base/silent/src/common/createinstance.java
diff --git a/pki/base/silent/src/drm/ConfigureDRM.java b/base/silent/src/drm/ConfigureDRM.java
index 5298811f3..5298811f3 100644
--- a/pki/base/silent/src/drm/ConfigureDRM.java
+++ b/base/silent/src/drm/ConfigureDRM.java
diff --git a/pki/base/silent/src/http/CertSelection.java b/base/silent/src/http/CertSelection.java
index a83cb3af3..a83cb3af3 100644
--- a/pki/base/silent/src/http/CertSelection.java
+++ b/base/silent/src/http/CertSelection.java
diff --git a/pki/base/silent/src/http/HTMLDocument.java b/base/silent/src/http/HTMLDocument.java
index 5fcb5343b..5fcb5343b 100644
--- a/pki/base/silent/src/http/HTMLDocument.java
+++ b/base/silent/src/http/HTMLDocument.java
diff --git a/pki/base/silent/src/http/HTTPClient.java b/base/silent/src/http/HTTPClient.java
index 5633cb448..5633cb448 100644
--- a/pki/base/silent/src/http/HTTPClient.java
+++ b/base/silent/src/http/HTTPClient.java
diff --git a/pki/base/silent/src/http/HTTPResponse.java b/base/silent/src/http/HTTPResponse.java
index f4d66adb5..f4d66adb5 100644
--- a/pki/base/silent/src/http/HTTPResponse.java
+++ b/base/silent/src/http/HTTPResponse.java
diff --git a/pki/base/silent/src/ocsp/ConfigureOCSP.java b/base/silent/src/ocsp/ConfigureOCSP.java
index 9e5410bad..9e5410bad 100644
--- a/pki/base/silent/src/ocsp/ConfigureOCSP.java
+++ b/base/silent/src/ocsp/ConfigureOCSP.java
diff --git a/pki/base/silent/src/ra/ConfigureRA.java b/base/silent/src/ra/ConfigureRA.java
index 8e976ab10..8e976ab10 100644
--- a/pki/base/silent/src/ra/ConfigureRA.java
+++ b/base/silent/src/ra/ConfigureRA.java
diff --git a/pki/base/silent/src/subca/ConfigureSubCA.java b/base/silent/src/subca/ConfigureSubCA.java
index 561f68e44..561f68e44 100644
--- a/pki/base/silent/src/subca/ConfigureSubCA.java
+++ b/base/silent/src/subca/ConfigureSubCA.java
diff --git a/pki/base/silent/src/tks/ConfigureTKS.java b/base/silent/src/tks/ConfigureTKS.java
index ec934c8f4..ec934c8f4 100644
--- a/pki/base/silent/src/tks/ConfigureTKS.java
+++ b/base/silent/src/tks/ConfigureTKS.java
diff --git a/pki/base/silent/src/tps/ConfigureTPS.java b/base/silent/src/tps/ConfigureTPS.java
index 2f052e7ad..2f052e7ad 100644
--- a/pki/base/silent/src/tps/ConfigureTPS.java
+++ b/base/silent/src/tps/ConfigureTPS.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 a535a9fba..a535a9fba 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/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 d5daa95e1..d5daa95e1 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 567b707c8..567b707c8 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 caf71e965..caf71e965 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 34517a63d..34517a63d 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 caeda0185..caeda0185 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 cee28285e..cee28285e 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 5fecf3540..5fecf3540 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 593e0637c..593e0637c 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 8894cf220..8894cf220 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 ab00de360..ab00de360 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 9a4fa800d..9a4fa800d 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 801472676..801472676 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 61d6d785f..61d6d785f 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 acece15d1..acece15d1 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 2efc72674..2efc72674 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 6944b386a..6944b386a 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 56c4a27f9..56c4a27f9 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 8a52f4f78..8a52f4f78 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 f22c50452..f22c50452 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 9309f2bb1..9309f2bb1 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 f72c34bad..f72c34bad 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 1b295eada..1b295eada 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 3bbe2303a..3bbe2303a 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 b59854a2f..b59854a2f 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 36bf42e80..36bf42e80 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 ba1ccbb8f..ba1ccbb8f 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 b60a568b9..b60a568b9 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 028feac03..028feac03 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 74fee4fef..74fee4fef 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 97e0a63da..97e0a63da 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 9c635e36c..9c635e36c 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 5eff86c44..5eff86c44 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 d3d5850fd..d3d5850fd 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 37b884964..37b884964 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 76f4a360f..76f4a360f 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 7f41d02d1..7f41d02d1 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 c70229ce2..c70229ce2 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 bb253077b..bb253077b 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 e56d5f397..e56d5f397 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 94e956162..94e956162 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 833ebfb2a..833ebfb2a 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 9e93fb01c..9e93fb01c 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 7cdb7ec92..7cdb7ec92 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 0f12f5242..0f12f5242 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 4aa505601..4aa505601 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 fd3fc8b0d..fd3fc8b0d 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 c6a138236..c6a138236 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 382c117b7..382c117b7 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 adff75a96..adff75a96 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 4db3ea935..4db3ea935 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 96e4b1fae..96e4b1fae 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 4098bbf15..4098bbf15 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 16e60bb55..16e60bb55 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 1290011fe..1290011fe 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 4c17f441d..4c17f441d 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 7fe060975..7fe060975 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 5ddc186bc..5ddc186bc 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 063ce891c..063ce891c 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 c4c175be2..c4c175be2 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 818930170..818930170 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 a0afb3fcd..a0afb3fcd 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 162d7098e..162d7098e 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 bdcd77abc..bdcd77abc 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 15b8940d4..15b8940d4 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 649442fa2..649442fa2 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 e59449862..e59449862 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 18f064448..18f064448 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 9b2f398cc..9b2f398cc 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 55b313a1b..55b313a1b 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 c8f7324f2..c8f7324f2 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 448dbb5de..448dbb5de 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 0c9de7268..0c9de7268 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 a13321c8d..a13321c8d 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 07777bd12..07777bd12 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 ade7e34f2..ade7e34f2 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 df42fb6f9..df42fb6f9 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 513c1077f..513c1077f 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 2f8dae725..2f8dae725 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 5c1891f78..5c1891f78 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 55948d443..55948d443 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 a0e61ab98..a0e61ab98 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 7116630ac..7116630ac 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 1dcd12b2f..1dcd12b2f 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 b7921c3a8..b7921c3a8 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 539c259f9..539c259f9 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 3b9e438ff..3b9e438ff 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 3cc67d8ec..3cc67d8ec 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 86eec6dbf..86eec6dbf 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 ebf1aa218..ebf1aa218 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 a6e40ae4b..a6e40ae4b 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 cd0e5a881..cd0e5a881 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 9bd5d1921..9bd5d1921 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 41d185e88..41d185e88 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 91210b354..91210b354 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 5d16cd8a2..5d16cd8a2 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 1a76e7603..1a76e7603 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 dd1fc29d1..dd1fc29d1 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 eaba2077a..eaba2077a 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 509ddc35d..509ddc35d 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 c349fed9a..c349fed9a 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 7de8cfb01..7de8cfb01 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 f83690d6f..f83690d6f 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 c18e59880..c18e59880 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 1a554ea2d..1a554ea2d 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 4e725ac3f..4e725ac3f 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 4550081ae..4550081ae 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 1d19a5055..1d19a5055 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 6ffd58e33..6ffd58e33 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 6a2d32b32..6a2d32b32 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 49b878c4c..49b878c4c 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 c1ab2003d..c1ab2003d 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 9d0fb05ac..9d0fb05ac 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 e140c3098..e140c3098 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 30ec006cd..30ec006cd 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 72a2e4e4c..72a2e4e4c 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 f7aa72284..f7aa72284 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 f7fadcd64..f7fadcd64 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 c0f6ef30b..c0f6ef30b 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 aba18b71a..aba18b71a 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 635da594a..635da594a 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 62a28c234..62a28c234 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 41a03ff01..41a03ff01 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 f60002388..f60002388 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 9f51b3947..9f51b3947 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 dc0da6f3d..dc0da6f3d 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 668d2fc89..668d2fc89 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 62bd8aab8..62bd8aab8 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 05dfb7de1..05dfb7de1 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 a926bf3de..a926bf3de 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 d2bd1d9c3..d2bd1d9c3 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 de272a165..de272a165 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 6fedd3af9..6fedd3af9 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 f756a4c0b..f756a4c0b 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 0d2bf3455..0d2bf3455 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 4b820e0b4..4b820e0b4 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 0d7248d0b..0d7248d0b 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 5d6f38bc8..5d6f38bc8 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 bbef2dca2..bbef2dca2 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 e9c1394f4..e9c1394f4 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 91cc413bb..91cc413bb 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 7f383443a..7f383443a 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 c07edbc2e..c07edbc2e 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 cadfa0cef..cadfa0cef 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 9e7e2f7a4..9e7e2f7a4 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 6e64b1686..6e64b1686 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 29d87caff..29d87caff 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 17eee2010..17eee2010 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 c979e489c..c979e489c 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 15bb01a5a..15bb01a5a 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 e03c32190..e03c32190 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 62f0e1392..62f0e1392 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 507627e15..507627e15 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 e97544a49..e97544a49 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 be5b44286..be5b44286 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 949e9ea62..949e9ea62 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 4edf88490..4edf88490 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 ab60554e6..ab60554e6 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 9ebdc0dc0..9ebdc0dc0 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 97bbac204..97bbac204 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 83dbc7f3d..83dbc7f3d 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 09fdf2dfa..09fdf2dfa 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 20e295caa..20e295caa 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/SystemIdentity.java b/base/util/src/netscape/security/provider/SystemIdentity.java
index ec06810ff..ec06810ff 100644
--- a/pki/base/util/src/netscape/security/provider/SystemIdentity.java
+++ b/base/util/src/netscape/security/provider/SystemIdentity.java
diff --git a/pki/base/util/src/netscape/security/provider/SystemSigner.java b/base/util/src/netscape/security/provider/SystemSigner.java
index ffce24019..ffce24019 100644
--- a/pki/base/util/src/netscape/security/provider/SystemSigner.java
+++ b/base/util/src/netscape/security/provider/SystemSigner.java
diff --git a/pki/base/util/src/netscape/security/provider/X509CertificateFactory.java b/base/util/src/netscape/security/provider/X509CertificateFactory.java
index 6fa19fa5b..6fa19fa5b 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 cacde77c8..cacde77c8 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/ArraySet.java b/base/util/src/netscape/security/util/ArraySet.java
index f6f43efd4..f6f43efd4 100644
--- a/pki/base/util/src/netscape/security/util/ArraySet.java
+++ b/base/util/src/netscape/security/util/ArraySet.java
diff --git a/pki/base/util/src/netscape/security/util/BigInt.java b/base/util/src/netscape/security/util/BigInt.java
index 10e4569de..10e4569de 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 43af482d5..43af482d5 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 60aede101..60aede101 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 81f437476..81f437476 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/ByteToCharIA5String.java b/base/util/src/netscape/security/util/ByteToCharIA5String.java
index 69fab22a7..69fab22a7 100644
--- a/pki/base/util/src/netscape/security/util/ByteToCharIA5String.java
+++ b/base/util/src/netscape/security/util/ByteToCharIA5String.java
diff --git a/pki/base/util/src/netscape/security/util/ByteToCharPrintable.java b/base/util/src/netscape/security/util/ByteToCharPrintable.java
index c42b457d0..c42b457d0 100644
--- a/pki/base/util/src/netscape/security/util/ByteToCharPrintable.java
+++ b/base/util/src/netscape/security/util/ByteToCharPrintable.java
diff --git a/pki/base/util/src/netscape/security/util/ByteToCharUnicode.java b/base/util/src/netscape/security/util/ByteToCharUnicode.java
index 717081be7..717081be7 100644
--- a/pki/base/util/src/netscape/security/util/ByteToCharUnicode.java
+++ b/base/util/src/netscape/security/util/ByteToCharUnicode.java
diff --git a/pki/base/util/src/netscape/security/util/ByteToCharUniversalString.java b/base/util/src/netscape/security/util/ByteToCharUniversalString.java
index 57b678dd8..57b678dd8 100644
--- a/pki/base/util/src/netscape/security/util/ByteToCharUniversalString.java
+++ b/base/util/src/netscape/security/util/ByteToCharUniversalString.java
diff --git a/pki/base/util/src/netscape/security/util/CertPrettyPrint.java b/base/util/src/netscape/security/util/CertPrettyPrint.java
index 1f2c78c6c..1f2c78c6c 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/CharToByteIA5String.java b/base/util/src/netscape/security/util/CharToByteIA5String.java
index f7c0d1e2d..f7c0d1e2d 100644
--- a/pki/base/util/src/netscape/security/util/CharToByteIA5String.java
+++ b/base/util/src/netscape/security/util/CharToByteIA5String.java
diff --git a/pki/base/util/src/netscape/security/util/CharToBytePrintable.java b/base/util/src/netscape/security/util/CharToBytePrintable.java
index 09b3afefe..09b3afefe 100644
--- a/pki/base/util/src/netscape/security/util/CharToBytePrintable.java
+++ b/base/util/src/netscape/security/util/CharToBytePrintable.java
diff --git a/pki/base/util/src/netscape/security/util/CharToByteUniversalString.java b/base/util/src/netscape/security/util/CharToByteUniversalString.java
index 0d566d539..0d566d539 100644
--- a/pki/base/util/src/netscape/security/util/CharToByteUniversalString.java
+++ b/base/util/src/netscape/security/util/CharToByteUniversalString.java
diff --git a/pki/base/util/src/netscape/security/util/CrlPrettyPrint.java b/base/util/src/netscape/security/util/CrlPrettyPrint.java
index 7bb851d4d..7bb851d4d 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 53bf27a6c..53bf27a6c 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 74ab9f705..74ab9f705 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 38564bf71..38564bf71 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 618afc095..618afc095 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 bc2bf45e3..bc2bf45e3 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 40e4b65df..40e4b65df 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/ObjectIdentifier.java b/base/util/src/netscape/security/util/ObjectIdentifier.java
index fed9637af..fed9637af 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 3522d2355..3522d2355 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 8f24edd68..8f24edd68 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/PubKeyPrettyPrint.java b/base/util/src/netscape/security/util/PubKeyPrettyPrint.java
index 880355fb5..880355fb5 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/x509/ACertAttrSet.java b/base/util/src/netscape/security/x509/ACertAttrSet.java
index 5c1f25cec..5c1f25cec 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 9609d790b..9609d790b 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 18de32c2a..18de32c2a 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 a3e638ebc..a3e638ebc 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 f3e72656d..f3e72656d 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 a5fa02245..a5fa02245 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/AttributeNameEnumeration.java b/base/util/src/netscape/security/x509/AttributeNameEnumeration.java
index f8546d526..f8546d526 100644
--- a/pki/base/util/src/netscape/security/x509/AttributeNameEnumeration.java
+++ b/base/util/src/netscape/security/x509/AttributeNameEnumeration.java
diff --git a/pki/base/util/src/netscape/security/x509/AuthorityKeyIdentifierExtension.java b/base/util/src/netscape/security/x509/AuthorityKeyIdentifierExtension.java
index 9b92c45c0..9b92c45c0 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 925e12faa..925e12faa 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 e7094eaba..e7094eaba 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 6cbca4ad0..6cbca4ad0 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 0832c3dd9..0832c3dd9 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 822361364..822361364 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 67cd98e55..67cd98e55 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 fff1d91cd..fff1d91cd 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 75d8d4a37..75d8d4a37 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 53401132f..53401132f 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 fc47ed7bb..fc47ed7bb 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 81a7a3770..81a7a3770 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 3759a2eaa..3759a2eaa 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 c86b6dbc0..c86b6dbc0 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 617fc93c0..617fc93c0 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 b8b8a3ec8..b8b8a3ec8 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 3c3afe3e2..3c3afe3e2 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 591032279..591032279 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 8ed8cdc4d..8ed8cdc4d 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 0eb48dc45..0eb48dc45 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 f657d2f87..f657d2f87 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 7ed76931e..7ed76931e 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 9c1994e06..9c1994e06 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 f14dd49bd..f14dd49bd 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 a45d35609..a45d35609 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 2162eb33c..2162eb33c 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 ad2865eb1..ad2865eb1 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 fee1af65a..fee1af65a 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 b83dd4f62..b83dd4f62 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 7e503b4af..7e503b4af 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 39664e238..39664e238 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 23dea47b2..23dea47b2 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 45bcc5061..45bcc5061 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 45510e28a..45510e28a 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 7a4f6d124..7a4f6d124 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 75bb6c97f..75bb6c97f 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 cfc75bfdf..cfc75bfdf 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 9c84e9e4e..9c84e9e4e 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 1cf6ff6cf..1cf6ff6cf 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 d08eeb1a5..d08eeb1a5 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 ddb0344b8..ddb0344b8 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 248e58c96..248e58c96 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 96537e887..96537e887 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 ba80bfc2e..ba80bfc2e 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 b36f30186..b36f30186 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 80572a686..80572a686 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 4fe58145c..4fe58145c 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 783a4bdd9..783a4bdd9 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 47a5d910d..47a5d910d 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 d0dc7a5c9..d0dc7a5c9 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 50432240e..50432240e 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 6ee8dffbe..6ee8dffbe 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 1aa39fc4a..1aa39fc4a 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 1d6605aed..1d6605aed 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 ee93581c8..ee93581c8 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 e75947a8d..e75947a8d 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 ea4d25202..ea4d25202 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 037ff824d..037ff824d 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 8e4711e24..8e4711e24 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 7d9a032d5..7d9a032d5 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 a0e12ccaf..a0e12ccaf 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 263d00096..263d00096 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 8c6742c54..8c6742c54 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 9a0b48784..9a0b48784 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 4a468ba49..4a468ba49 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 f2d769686..f2d769686 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 1c4984bee..1c4984bee 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 69d0d015d..69d0d015d 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 38457efd5..38457efd5 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 70848994c..70848994c 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 ef13fc103..ef13fc103 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 43ce490d7..43ce490d7 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 d7c19482e..d7c19482e 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 19a73a302..19a73a302 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 e10b2f38a..e10b2f38a 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 0c6133fbe..0c6133fbe 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 785a5d79b..785a5d79b 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 b3002736f..b3002736f 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 344ecb7b0..344ecb7b0 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 c57bfcc96..c57bfcc96 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 65f6fef49..65f6fef49 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 dd3a61e28..dd3a61e28 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 3dc804893..3dc804893 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 4b33ad776..4b33ad776 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 01bef6dd7..01bef6dd7 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 c8bd8ed6a..c8bd8ed6a 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 8edbae358..8edbae358 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 cd13c3359..cd13c3359 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 4f62f61a5..4f62f61a5 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 cc21f626f..cc21f626f 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 1f546bc31..1f546bc31 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 4c5c6eb53..4c5c6eb53 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 94019d8b0..94019d8b0 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 007794e29..007794e29 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 3bdeed4df..3bdeed4df 100644
--- a/pki/base/util/src/netscape/security/x509/X509Key.java
+++ b/base/util/src/netscape/security/x509/X509Key.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/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 e84a895d5..e84a895d5 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 36439b4e6..36439b4e6 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-Dogtag-9-f16.patch b/patches/pki-core-selinux-Dogtag-9-f16.patch
index 03e38be42..03e38be42 100644
--- a/pki/patches/pki-core-selinux-Dogtag-9-f16.patch
+++ b/patches/pki-core-selinux-Dogtag-9-f16.patch
diff --git a/pki/patches/pki-core-selinux-Dogtag-9-f17.patch b/patches/pki-core-selinux-Dogtag-9-f17.patch
index e99ec06d5..e99ec06d5 100644
--- a/pki/patches/pki-core-selinux-Dogtag-9-f17.patch
+++ b/patches/pki-core-selinux-Dogtag-9-f17.patch
diff --git a/pki/scripts/build_dogtag_pki b/scripts/build_dogtag_pki
index 96eccd057..96eccd057 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 935ee400f..935ee400f 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 785fc1296..785fc1296 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 fa23fa5e0..fa23fa5e0 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 da3fb2f4a..da3fb2f4a 100755
--- a/pki/scripts/compose_pki_core_packages
+++ b/scripts/compose_pki_core_packages
diff --git a/pki/scripts/compose_pki_kra_packages b/scripts/compose_pki_kra_packages
index 0c4f73dd1..0c4f73dd1 100755
--- a/pki/scripts/compose_pki_kra_packages
+++ b/scripts/compose_pki_kra_packages
diff --git a/pki/scripts/compose_pki_migrate_packages b/scripts/compose_pki_migrate_packages
index 4e486cba6..4e486cba6 100755
--- a/pki/scripts/compose_pki_migrate_packages
+++ b/scripts/compose_pki_migrate_packages
diff --git a/pki/scripts/compose_pki_ocsp_packages b/scripts/compose_pki_ocsp_packages
index 3c63d9213..3c63d9213 100755
--- a/pki/scripts/compose_pki_ocsp_packages
+++ b/scripts/compose_pki_ocsp_packages
diff --git a/pki/scripts/compose_pki_ra_packages b/scripts/compose_pki_ra_packages
index d9a7976db..d9a7976db 100755
--- a/pki/scripts/compose_pki_ra_packages
+++ b/scripts/compose_pki_ra_packages
diff --git a/pki/scripts/compose_pki_tks_packages b/scripts/compose_pki_tks_packages
index 473a12fbb..473a12fbb 100755
--- a/pki/scripts/compose_pki_tks_packages
+++ b/scripts/compose_pki_tks_packages
diff --git a/pki/scripts/compose_pki_tps_packages b/scripts/compose_pki_tps_packages
index 31342d36f..31342d36f 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 ce7738787..ce7738787 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 80569749c..80569749c 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 5df653c52..5df653c52 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 b5a1c5fb2..b5a1c5fb2 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 dfd451535..dfd451535 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 b22517404..b22517404 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 1b848fdfc..1b848fdfc 100644
--- a/pki/specs/pki-core.spec
+++ b/specs/pki-core.spec
diff --git a/pki/specs/pki-kra.spec b/specs/pki-kra.spec
index e5978fd9c..e5978fd9c 100644
--- a/pki/specs/pki-kra.spec
+++ b/specs/pki-kra.spec
diff --git a/pki/specs/pki-migrate.spec b/specs/pki-migrate.spec
index ea89f9cee..ea89f9cee 100644
--- a/pki/specs/pki-migrate.spec
+++ b/specs/pki-migrate.spec
diff --git a/pki/specs/pki-ocsp.spec b/specs/pki-ocsp.spec
index c6eb9f295..c6eb9f295 100644
--- a/pki/specs/pki-ocsp.spec
+++ b/specs/pki-ocsp.spec
diff --git a/pki/specs/pki-ra.spec b/specs/pki-ra.spec
index bcc33560c..bcc33560c 100644
--- a/pki/specs/pki-ra.spec
+++ b/specs/pki-ra.spec
diff --git a/pki/specs/pki-tks.spec b/specs/pki-tks.spec
index a2e47e088..a2e47e088 100644
--- a/pki/specs/pki-tks.spec
+++ b/specs/pki-tks.spec
diff --git a/pki/specs/pki-tps.spec b/specs/pki-tps.spec
index ac704526e..ac704526e 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 cab373acd..cab373acd 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