Bugzilla Bug #445402: Rename 'linux' to 'dogtag'.

git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@148 c9f7a03b-bd48-0410-a16d-cbbf54688b0b

802 files changed, 0 insertions, 0 deletions

diff --git a/pki/linux/ca-ui/LICENSE b/pki/dogtag/ca-ui/LICENSE
index e36f2269a..e36f2269a 100644
--- a/pki/linux/ca-ui/LICENSE
+++ b/pki/dogtag/ca-ui/LICENSE
diff --git a/pki/linux/ca-ui/build.xml b/pki/dogtag/ca-ui/build.xml
index b1001562f..b1001562f 100644
--- a/pki/linux/ca-ui/build.xml
+++ b/pki/dogtag/ca-ui/build.xml
diff --git a/pki/linux/ca-ui/build_linux b/pki/dogtag/ca-ui/build_linux
index 337fbb3fd..337fbb3fd 100755
--- a/pki/linux/ca-ui/build_linux
+++ b/pki/dogtag/ca-ui/build_linux
diff --git a/pki/linux/ca-ui/config-ext/build_linux_pki b/pki/dogtag/ca-ui/config-ext/build_linux_pki
index d9ea91e8c..d9ea91e8c 100755
--- a/pki/linux/ca-ui/config-ext/build_linux_pki
+++ b/pki/dogtag/ca-ui/config-ext/build_linux_pki
diff --git a/pki/linux/ca-ui/config/product.xml b/pki/dogtag/ca-ui/config/product.xml
index 33caf48ed..33caf48ed 100644
--- a/pki/linux/ca-ui/config/product.xml
+++ b/pki/dogtag/ca-ui/config/product.xml
diff --git a/pki/linux/ca-ui/config/release.xml b/pki/dogtag/ca-ui/config/release.xml
index fc43aaeb7..fc43aaeb7 100644
--- a/pki/linux/ca-ui/config/release.xml
+++ b/pki/dogtag/ca-ui/config/release.xml
diff --git a/pki/linux/ca-ui/pki-ca-ui.spec b/pki/dogtag/ca-ui/pki-ca-ui.spec
index be2310a0f..be2310a0f 100644
--- a/pki/linux/ca-ui/pki-ca-ui.spec
+++ b/pki/dogtag/ca-ui/pki-ca-ui.spec
diff --git a/pki/linux/ca-ui/shared/webapps/ca/GenUnexpectedError.template b/pki/dogtag/ca-ui/shared/webapps/ca/GenUnexpectedError.template
index c69aaad1f..c69aaad1f 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/GenUnexpectedError.template
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/GenUnexpectedError.template
diff --git a/pki/linux/ca-ui/shared/webapps/ca/admin/GenUnexpectedError.template b/pki/dogtag/ca-ui/shared/webapps/ca/admin/GenUnexpectedError.template
index c69aaad1f..c69aaad1f 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/admin/GenUnexpectedError.template
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/admin/GenUnexpectedError.template
diff --git a/pki/linux/ca-ui/shared/webapps/ca/admin/ca/EnrollSuccess.template b/pki/dogtag/ca-ui/shared/webapps/ca/admin/ca/EnrollSuccess.template
index 8c4c29cb7..8c4c29cb7 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/admin/ca/EnrollSuccess.template
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/admin/ca/EnrollSuccess.template
diff --git a/pki/linux/ca-ui/shared/webapps/ca/admin/ca/adminEnroll.html b/pki/dogtag/ca-ui/shared/webapps/ca/admin/ca/adminEnroll.html
index e05df63de..e05df63de 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/admin/ca/adminEnroll.html
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/admin/ca/adminEnroll.html
diff --git a/pki/linux/ca-ui/shared/webapps/ca/agent/GenError.template b/pki/dogtag/ca-ui/shared/webapps/ca/agent/GenError.template
index 36fd0477e..36fd0477e 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/agent/GenError.template
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/agent/GenError.template
diff --git a/pki/linux/ca-ui/shared/webapps/ca/agent/GenPending.template b/pki/dogtag/ca-ui/shared/webapps/ca/agent/GenPending.template
index f04c3ac9b..f04c3ac9b 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/agent/GenPending.template
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/agent/GenPending.template
diff --git a/pki/linux/ca-ui/shared/webapps/ca/agent/GenRejected.template b/pki/dogtag/ca-ui/shared/webapps/ca/agent/GenRejected.template
index 71b6d2d45..71b6d2d45 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/agent/GenRejected.template
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/agent/GenRejected.template
diff --git a/pki/linux/ca-ui/shared/webapps/ca/agent/GenSuccess.template b/pki/dogtag/ca-ui/shared/webapps/ca/agent/GenSuccess.template
index f1f331f45..f1f331f45 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/agent/GenSuccess.template
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/agent/GenSuccess.template
diff --git a/pki/linux/ca-ui/shared/webapps/ca/agent/GenSvcPending.template b/pki/dogtag/ca-ui/shared/webapps/ca/agent/GenSvcPending.template
index 476890a52..476890a52 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/agent/GenSvcPending.template
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/agent/GenSvcPending.template
diff --git a/pki/linux/ca-ui/shared/webapps/ca/agent/GenUnauthorized.template b/pki/dogtag/ca-ui/shared/webapps/ca/agent/GenUnauthorized.template
index c7daa9ac8..c7daa9ac8 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/agent/GenUnauthorized.template
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/agent/GenUnauthorized.template
diff --git a/pki/linux/ca-ui/shared/webapps/ca/agent/GenUnexpectedError.template b/pki/dogtag/ca-ui/shared/webapps/ca/agent/GenUnexpectedError.template
index 836fb006a..836fb006a 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/agent/GenUnexpectedError.template
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/agent/GenUnexpectedError.template
diff --git a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/EnrollSuccess.template b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/EnrollSuccess.template
index a2f8e499d..a2f8e499d 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/EnrollSuccess.template
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/EnrollSuccess.template
diff --git a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/ImportCert.template b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/ImportCert.template
index 4b828ca6f..4b828ca6f 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/ImportCert.template
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/ImportCert.template
diff --git a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/ListRequests.html b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/ListRequests.html
index d5cca8b13..d5cca8b13 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/ListRequests.html
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/ListRequests.html
diff --git a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/ProfileApprove.template b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/ProfileApprove.template
index 6e0558df9..6e0558df9 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/ProfileApprove.template
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/ProfileApprove.template
diff --git a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/ProfileList.template b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/ProfileList.template
index 1514ad754..1514ad754 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/ProfileList.template
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/ProfileList.template
diff --git a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/ProfileProcess.template b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/ProfileProcess.template
index baedde6a3..baedde6a3 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/ProfileProcess.template
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/ProfileProcess.template
diff --git a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/ProfileReview.template b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/ProfileReview.template
index ca402f3f6..ca402f3f6 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/ProfileReview.template
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/ProfileReview.template
diff --git a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/ProfileSelect.template b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/ProfileSelect.template
index 4c7139d69..4c7139d69 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/ProfileSelect.template
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/ProfileSelect.template
diff --git a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/SrchCert.html b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/SrchCert.html
index dce52d1a8..dce52d1a8 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/SrchCert.html
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/SrchCert.html
diff --git a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/SrchRequests.html b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/SrchRequests.html
index 684f53f75..684f53f75 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/SrchRequests.html
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/SrchRequests.html
diff --git a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/SrchRevokeCert.html b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/SrchRevokeCert.html
index b504dc6c9..b504dc6c9 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/SrchRevokeCert.html
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/SrchRevokeCert.html
diff --git a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/UpdateDir.html b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/UpdateDir.html
index 880754f71..880754f71 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/UpdateDir.html
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/UpdateDir.html
diff --git a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/adminEnroll.html b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/adminEnroll.html
index 13e9ac761..13e9ac761 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/adminEnroll.html
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/adminEnroll.html
diff --git a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/blank.html b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/blank.html
index e41af69c4..e41af69c4 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/blank.html
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/blank.html
diff --git a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/bulkissuance.template b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/bulkissuance.template
index 01f57455d..01f57455d 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/bulkissuance.template
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/bulkissuance.template
diff --git a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/cloneRedirect.template b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/cloneRedirect.template
index ef763e83f..ef763e83f 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/cloneRedirect.template
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/cloneRedirect.template
diff --git a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/confirmRevocation.template b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/confirmRevocation.template
index 0d97c6827..0d97c6827 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/confirmRevocation.template
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/confirmRevocation.template
diff --git a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/displayBySerial.template b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/displayBySerial.template
index 0c1b47aaf..0c1b47aaf 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/displayBySerial.template
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/displayBySerial.template
diff --git a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/displayBySerial2.template b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/displayBySerial2.template
index 9d45596a1..9d45596a1 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/displayBySerial2.template
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/displayBySerial2.template
diff --git a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/displayCRL.template b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/displayCRL.template
index 9375364b3..9375364b3 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/displayCRL.template
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/displayCRL.template
diff --git a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/displayCertFromRequest.template b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/displayCertFromRequest.template
index 13bbb166b..13bbb166b 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/displayCertFromRequest.template
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/displayCertFromRequest.template
diff --git a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/error.template b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/error.template
index b1940a820..b1940a820 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/error.template
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/error.template
diff --git a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/frameCRL.html b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameCRL.html
index a0483c7e4..a0483c7e4 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/frameCRL.html
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameCRL.html
diff --git a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/frameDir.html b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameDir.html
index bcf5df10e..bcf5df10e 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/frameDir.html
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameDir.html
diff --git a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/frameDisplayCRL.html b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameDisplayCRL.html
index 79a11aab6..79a11aab6 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/frameDisplayCRL.html
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameDisplayCRL.html
diff --git a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/frameList.html b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameList.html
index 98f514696..98f514696 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/frameList.html
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameList.html
diff --git a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/frameListReq.html b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameListReq.html
index c4b3d1e62..c4b3d1e62 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/frameListReq.html
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameListReq.html
diff --git a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/frameOCSP.html b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameOCSP.html
index 8cc976d02..8cc976d02 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/frameOCSP.html
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameOCSP.html
diff --git a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/frameProfile.html b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameProfile.html
index 2a15bae4c..2a15bae4c 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/frameProfile.html
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameProfile.html
diff --git a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/frameRevoke.html b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameRevoke.html
index ebaee6df8..ebaee6df8 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/frameRevoke.html
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameRevoke.html
diff --git a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/frameSearch.html b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameSearch.html
index b75a6272b..b75a6272b 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/frameSearch.html
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameSearch.html
diff --git a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/frameSrchRequests.html b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameSrchRequests.html
index 0e73ea82f..0e73ea82f 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/frameSrchRequests.html
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameSrchRequests.html
diff --git a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/frameStats.html b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameStats.html
index 75a4dbebb..75a4dbebb 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/frameStats.html
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameStats.html
diff --git a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/getOCSPInfo.template b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/getOCSPInfo.template
index beea645cb..beea645cb 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/getOCSPInfo.template
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/getOCSPInfo.template
diff --git a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/getStats.template b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/getStats.template
index 5cbb9642d..5cbb9642d 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/getStats.template
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/getStats.template
diff --git a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/index.html b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/index.html
index e11082119..e11082119 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/index.html
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/index.html
diff --git a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/menuCRL.html b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuCRL.html
index 2c4984e9e..2c4984e9e 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/menuCRL.html
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuCRL.html
diff --git a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/menuDir.html b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuDir.html
index 7fa9f658d..7fa9f658d 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/menuDir.html
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuDir.html
diff --git a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/menuDisplayCRL.html b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuDisplayCRL.html
index de76603c4..de76603c4 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/menuDisplayCRL.html
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuDisplayCRL.html
diff --git a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/menuList.html b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuList.html
index 21452599d..21452599d 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/menuList.html
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuList.html
diff --git a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/menuListReq.html b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuListReq.html
index f3b541962..f3b541962 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/menuListReq.html
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuListReq.html
diff --git a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/menuOCSP.html b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuOCSP.html
index 0b73aa60e..0b73aa60e 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/menuOCSP.html
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuOCSP.html
diff --git a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/menuProfile.html b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuProfile.html
index a7bcd66df..a7bcd66df 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/menuProfile.html
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuProfile.html
diff --git a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/menuRevoke.html b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuRevoke.html
index 1148bf7c4..1148bf7c4 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/menuRevoke.html
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuRevoke.html
diff --git a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/menuSearch.html b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuSearch.html
index a088ef030..a088ef030 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/menuSearch.html
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuSearch.html
diff --git a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/menuSrchRequests.html b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuSrchRequests.html
index 3b16a1a20..3b16a1a20 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/menuSrchRequests.html
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuSrchRequests.html
diff --git a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/menuStats.html b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuStats.html
index c251356bd..c251356bd 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/menuStats.html
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuStats.html
diff --git a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/monitor.html b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/monitor.html
index a5ee3db8f..a5ee3db8f 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/monitor.html
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/monitor.html
diff --git a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/monitor.template b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/monitor.template
index 1d84f9f20..1d84f9f20 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/monitor.template
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/monitor.template
diff --git a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/notImplemented.html b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/notImplemented.html
index cbdd43f6a..cbdd43f6a 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/notImplemented.html
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/notImplemented.html
diff --git a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/processCertReq.template b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/processCertReq.template
index 0fb0a18cb..0fb0a18cb 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/processCertReq.template
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/processCertReq.template
diff --git a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/processReq.template b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/processReq.template
index 302b9e4c0..302b9e4c0 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/processReq.template
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/processReq.template
diff --git a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/queryBySerial.html b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/queryBySerial.html
index c3e750ab1..c3e750ab1 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/queryBySerial.html
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/queryBySerial.html
diff --git a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/queryCert.html b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/queryCert.html
index 951cd5f0b..951cd5f0b 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/queryCert.html
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/queryCert.html
diff --git a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/queryCert.template b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/queryCert.template
index 41bd02344..41bd02344 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/queryCert.template
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/queryCert.template
diff --git a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/queryReq.template b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/queryReq.template
index be0819d9c..be0819d9c 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/queryReq.template
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/queryReq.template
diff --git a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/reasonToRevoke.template b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/reasonToRevoke.template
index 2b8b0334e..2b8b0334e 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/reasonToRevoke.template
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/reasonToRevoke.template
diff --git a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/revocationResult.template b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/revocationResult.template
index bd356841d..bd356841d 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/revocationResult.template
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/revocationResult.template
diff --git a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/revokeBySerial.template b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/revokeBySerial.template
index cae2a93da..cae2a93da 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/revokeBySerial.template
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/revokeBySerial.template
diff --git a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/revokeCert.html b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/revokeCert.html
index 45fb2f935..45fb2f935 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/revokeCert.html
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/revokeCert.html
diff --git a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/srchCert.template b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/srchCert.template
index 1e53900f5..1e53900f5 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/srchCert.template
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/srchCert.template
diff --git a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/toDisplayCRL.template b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/toDisplayCRL.template
index 3776138c4..3776138c4 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/toDisplayCRL.template
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/toDisplayCRL.template
diff --git a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/toUpdateCRL.template b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/toUpdateCRL.template
index e134c3918..e134c3918 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/toUpdateCRL.template
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/toUpdateCRL.template
diff --git a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/top.html b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/top.html
index f4033d0f4..f4033d0f4 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/top.html
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/top.html
diff --git a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/unrevocationResult.template b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/unrevocationResult.template
index 8080ce0d2..8080ce0d2 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/unrevocationResult.template
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/unrevocationResult.template
diff --git a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/updateCRL.html b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/updateCRL.html
index ee6fc96f4..ee6fc96f4 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/updateCRL.html
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/updateCRL.html
diff --git a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/updateCRL.template b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/updateCRL.template
index fca18121b..fca18121b 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/updateCRL.template
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/updateCRL.template
diff --git a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/updateDir.template b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/updateDir.template
index 64954a257..64954a257 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/agent/ca/updateDir.template
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/updateDir.template
diff --git a/pki/linux/ca-ui/shared/webapps/ca/agent/cms-funcs.js b/pki/dogtag/ca-ui/shared/webapps/ca/agent/cms-funcs.js
index c8ffd51c7..c8ffd51c7 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/agent/cms-funcs.js
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/agent/cms-funcs.js
diff --git a/pki/linux/ca-ui/shared/webapps/ca/agent/funcs.js b/pki/dogtag/ca-ui/shared/webapps/ca/agent/funcs.js
index f610759e8..f610759e8 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/agent/funcs.js
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/agent/funcs.js
diff --git a/pki/linux/ca-ui/shared/webapps/ca/agent/graphics/dgLeftTab.gif b/pki/dogtag/ca-ui/shared/webapps/ca/agent/graphics/dgLeftTab.gif
index 35a76c859..35a76c859 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/agent/graphics/dgLeftTab.gif
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/agent/graphics/dgLeftTab.gif
diff --git a/pki/linux/ca-ui/shared/webapps/ca/agent/graphics/dgRightTab.gif b/pki/dogtag/ca-ui/shared/webapps/ca/agent/graphics/dgRightTab.gif
index a519bc759..a519bc759 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/agent/graphics/dgRightTab.gif
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/agent/graphics/dgRightTab.gif
diff --git a/pki/linux/ca-ui/shared/webapps/ca/agent/graphics/goto-tall.gif b/pki/dogtag/ca-ui/shared/webapps/ca/agent/graphics/goto-tall.gif
index 6eea3ef5c..6eea3ef5c 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/agent/graphics/goto-tall.gif
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/agent/graphics/goto-tall.gif
diff --git a/pki/linux/ca-ui/shared/webapps/ca/agent/graphics/graphics.tmp b/pki/dogtag/ca-ui/shared/webapps/ca/agent/graphics/graphics.tmp
index e69de29bb..e69de29bb 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/agent/graphics/graphics.tmp
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/agent/graphics/graphics.tmp
diff --git a/pki/linux/ca-ui/shared/webapps/ca/agent/graphics/gray90.gif b/pki/dogtag/ca-ui/shared/webapps/ca/agent/graphics/gray90.gif
index c6f811102..c6f811102 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/agent/graphics/gray90.gif
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/agent/graphics/gray90.gif
diff --git a/pki/linux/ca-ui/shared/webapps/ca/agent/graphics/hr.gif b/pki/dogtag/ca-ui/shared/webapps/ca/agent/graphics/hr.gif
index 14f8acf92..14f8acf92 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/agent/graphics/hr.gif
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/agent/graphics/hr.gif
diff --git a/pki/linux/ca-ui/shared/webapps/ca/agent/graphics/lgLeftTab.gif b/pki/dogtag/ca-ui/shared/webapps/ca/agent/graphics/lgLeftTab.gif
index a78fbc89d..a78fbc89d 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/agent/graphics/lgLeftTab.gif
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/agent/graphics/lgLeftTab.gif
diff --git a/pki/linux/ca-ui/shared/webapps/ca/agent/graphics/lgRightTab.gif b/pki/dogtag/ca-ui/shared/webapps/ca/agent/graphics/lgRightTab.gif
index 71852402d..71852402d 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/agent/graphics/lgRightTab.gif
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/agent/graphics/lgRightTab.gif
diff --git a/pki/linux/ca-ui/shared/webapps/ca/agent/graphics/spacer.gif b/pki/dogtag/ca-ui/shared/webapps/ca/agent/graphics/spacer.gif
index 13acffe53..13acffe53 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/agent/graphics/spacer.gif
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/agent/graphics/spacer.gif
diff --git a/pki/linux/ca-ui/shared/webapps/ca/agent/header.template b/pki/dogtag/ca-ui/shared/webapps/ca/agent/header.template
index 81d9bed51..81d9bed51 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/agent/header.template
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/agent/header.template
diff --git a/pki/linux/ca-ui/shared/webapps/ca/agent/helpfun.js b/pki/dogtag/ca-ui/shared/webapps/ca/agent/helpfun.js
index 14a80bb95..14a80bb95 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/agent/helpfun.js
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/agent/helpfun.js
diff --git a/pki/linux/ca-ui/shared/webapps/ca/agent/index.html b/pki/dogtag/ca-ui/shared/webapps/ca/agent/index.html
index d9873116c..d9873116c 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/agent/index.html
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/agent/index.html
diff --git a/pki/linux/ca-ui/shared/webapps/ca/agent/index.template b/pki/dogtag/ca-ui/shared/webapps/ca/agent/index.template
index 6716d414d..6716d414d 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/agent/index.template
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/agent/index.template
diff --git a/pki/linux/ca-ui/shared/webapps/ca/agent/ports.template b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ports.template
index b8728eadc..b8728eadc 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/agent/ports.template
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/agent/ports.template
diff --git a/pki/linux/ca-ui/shared/webapps/ca/agent/xenroll.dll b/pki/dogtag/ca-ui/shared/webapps/ca/agent/xenroll.dll
index 9375e988d..9375e988d 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/agent/xenroll.dll
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/agent/xenroll.dll
diff --git a/pki/linux/ca-ui/shared/webapps/ca/ee/GenError.template b/pki/dogtag/ca-ui/shared/webapps/ca/ee/GenError.template
index fa170aa61..fa170aa61 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/ee/GenError.template
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/ee/GenError.template
diff --git a/pki/linux/ca-ui/shared/webapps/ca/ee/GenPending.template b/pki/dogtag/ca-ui/shared/webapps/ca/ee/GenPending.template
index 0ff5f4383..0ff5f4383 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/ee/GenPending.template
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/ee/GenPending.template
diff --git a/pki/linux/ca-ui/shared/webapps/ca/ee/GenRejected.template b/pki/dogtag/ca-ui/shared/webapps/ca/ee/GenRejected.template
index a5dd68f49..a5dd68f49 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/ee/GenRejected.template
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/ee/GenRejected.template
diff --git a/pki/linux/ca-ui/shared/webapps/ca/ee/GenSuccess.template b/pki/dogtag/ca-ui/shared/webapps/ca/ee/GenSuccess.template
index 9a0ead814..9a0ead814 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/ee/GenSuccess.template
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/ee/GenSuccess.template
diff --git a/pki/linux/ca-ui/shared/webapps/ca/ee/GenSvcPending.template b/pki/dogtag/ca-ui/shared/webapps/ca/ee/GenSvcPending.template
index f639a39a9..f639a39a9 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/ee/GenSvcPending.template
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/ee/GenSvcPending.template
diff --git a/pki/linux/ca-ui/shared/webapps/ca/ee/GenUnauthorized.template b/pki/dogtag/ca-ui/shared/webapps/ca/ee/GenUnauthorized.template
index c29372843..c29372843 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/ee/GenUnauthorized.template
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/ee/GenUnauthorized.template
diff --git a/pki/linux/ca-ui/shared/webapps/ca/ee/GenUnexpectedError.template b/pki/dogtag/ca-ui/shared/webapps/ca/ee/GenUnexpectedError.template
index 36f00f4c2..36f00f4c2 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/ee/GenUnexpectedError.template
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/ee/GenUnexpectedError.template
diff --git a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/AIMEnroll.html b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/AIMEnroll.html
index d72f7c974..d72f7c974 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/AIMEnroll.html
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/AIMEnroll.html
diff --git a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/CMCEnrollment.html b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/CMCEnrollment.html
index c6a082ba8..c6a082ba8 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/CMCEnrollment.html
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/CMCEnrollment.html
diff --git a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/CMCRevReq.html b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/CMCRevReq.html
index f7aa04f29..f7aa04f29 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/CMCRevReq.html
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/CMCRevReq.html
diff --git a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/CertBasedDualEnroll.html b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/CertBasedDualEnroll.html
index a2861d6a6..a2861d6a6 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/CertBasedDualEnroll.html
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/CertBasedDualEnroll.html
diff --git a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/CertBasedEncryptionEnroll.html b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/CertBasedEncryptionEnroll.html
index df2afdae6..df2afdae6 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/CertBasedEncryptionEnroll.html
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/CertBasedEncryptionEnroll.html
diff --git a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/CertBasedSingleEnroll.html b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/CertBasedSingleEnroll.html
index 7ac94ae09..7ac94ae09 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/CertBasedSingleEnroll.html
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/CertBasedSingleEnroll.html
diff --git a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/ChallengeRevoke1.html b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/ChallengeRevoke1.html
index a0ef9baad..a0ef9baad 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/ChallengeRevoke1.html
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/ChallengeRevoke1.html
diff --git a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/DirPinUserEnroll.html b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/DirPinUserEnroll.html
index 2e5a28aca..2e5a28aca 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/DirPinUserEnroll.html
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/DirPinUserEnroll.html
diff --git a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/DirUserEnroll.html b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/DirUserEnroll.html
index 57947e566..57947e566 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/DirUserEnroll.html
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/DirUserEnroll.html
diff --git a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/DisplayCRL.html b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/DisplayCRL.html
index b4c2cd635..b4c2cd635 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/DisplayCRL.html
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/DisplayCRL.html
diff --git a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/EnrollSuccess.template b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/EnrollSuccess.template
index 771c6fb1b..771c6fb1b 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/EnrollSuccess.template
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/EnrollSuccess.template
diff --git a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/GetCAChain.html b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/GetCAChain.html
index f21f606df..f21f606df 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/GetCAChain.html
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/GetCAChain.html
diff --git a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/ImportAdminCert.template b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/ImportAdminCert.template
index e52764ec6..e52764ec6 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/ImportAdminCert.template
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/ImportAdminCert.template
diff --git a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/ImportCert.template b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/ImportCert.template
index 8df83eca9..8df83eca9 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/ImportCert.template
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/ImportCert.template
diff --git a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/KeyRecovery.html b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/KeyRecovery.html
index b3a9e4676..b3a9e4676 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/KeyRecovery.html
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/KeyRecovery.html
diff --git a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/ManCAEnroll.html b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/ManCAEnroll.html
index 443c9ff27..443c9ff27 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/ManCAEnroll.html
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/ManCAEnroll.html
diff --git a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/ManObjSignEnroll.html b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/ManObjSignEnroll.html
index 04f37b650..04f37b650 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/ManObjSignEnroll.html
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/ManObjSignEnroll.html
diff --git a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/ManRAEnroll.html b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/ManRAEnroll.html
index 5da4ee594..5da4ee594 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/ManRAEnroll.html
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/ManRAEnroll.html
diff --git a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/ManServerEnroll.html b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/ManServerEnroll.html
index 2dfa7b725..2dfa7b725 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/ManServerEnroll.html
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/ManServerEnroll.html
diff --git a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/ManUserEnroll.html b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/ManUserEnroll.html
index 8cc80148d..8cc80148d 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/ManUserEnroll.html
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/ManUserEnroll.html
diff --git a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/NISUserEnroll.html b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/NISUserEnroll.html
index c16bde466..c16bde466 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/NISUserEnroll.html
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/NISUserEnroll.html
diff --git a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/OCSPResponder.html b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/OCSPResponder.html
index b1aa906e8..b1aa906e8 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/OCSPResponder.html
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/OCSPResponder.html
diff --git a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/ObjSignPKCS10Enroll.html b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/ObjSignPKCS10Enroll.html
index 901410326..901410326 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/ObjSignPKCS10Enroll.html
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/ObjSignPKCS10Enroll.html
diff --git a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/PortalEnrollment.html b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/PortalEnrollment.html
index b1bce69b6..b1bce69b6 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/PortalEnrollment.html
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/PortalEnrollment.html
diff --git a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/ProfileList.template b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/ProfileList.template
index de7c32c93..de7c32c93 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/ProfileList.template
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/ProfileList.template
diff --git a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/ProfileSelect.template b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/ProfileSelect.template
index a3557fcd6..a3557fcd6 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/ProfileSelect.template
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/ProfileSelect.template
diff --git a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/ProfileSubmit.html b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/ProfileSubmit.html
index 90d50864d..90d50864d 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/ProfileSubmit.html
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/ProfileSubmit.html
diff --git a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/ProfileSubmit.template b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/ProfileSubmit.template
index 6fa3a0d71..6fa3a0d71 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/ProfileSubmit.template
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/ProfileSubmit.template
diff --git a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/RenewalSuccess.template b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/RenewalSuccess.template
index cb840d296..cb840d296 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/RenewalSuccess.template
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/RenewalSuccess.template
diff --git a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/RevocationSuccess.template b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/RevocationSuccess.template
index d024a3d14..d024a3d14 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/RevocationSuccess.template
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/RevocationSuccess.template
diff --git a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/UserDnEnroll.html b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/UserDnEnroll.html
index f218ccc51..f218ccc51 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/UserDnEnroll.html
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/UserDnEnroll.html
diff --git a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/UserRenewal.html b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/UserRenewal.html
index 4e4ebec5f..4e4ebec5f 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/UserRenewal.html
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/UserRenewal.html
diff --git a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/UserRevocation.html b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/UserRevocation.html
index 78e47c2a6..78e47c2a6 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/UserRevocation.html
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/UserRevocation.html
diff --git a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/bench2k.html b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/bench2k.html
index ab667f47f..ab667f47f 100755
--- a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/bench2k.html
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/bench2k.html
diff --git a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/checkRequest.html b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/checkRequest.html
index cd22063ec..cd22063ec 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/checkRequest.html
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/checkRequest.html
diff --git a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/displayBySerial.template b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/displayBySerial.template
index f2f42066b..f2f42066b 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/displayBySerial.template
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/displayBySerial.template
diff --git a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/displayBySerial2.template b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/displayBySerial2.template
index 79076779a..79076779a 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/displayBySerial2.template
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/displayBySerial2.template
diff --git a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/displayCRL.template b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/displayCRL.template
index 2b98ed588..2b98ed588 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/displayCRL.template
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/displayCRL.template
diff --git a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/displayCaCert.template b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/displayCaCert.template
index 7ce74f91f..7ce74f91f 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/displayCaCert.template
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/displayCaCert.template
diff --git a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/displayCertFromRequest.template b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/displayCertFromRequest.template
index d30744150..d30744150 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/displayCertFromRequest.template
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/displayCertFromRequest.template
diff --git a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/enrollMenu.html b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/enrollMenu.html
index cebdc1aec..cebdc1aec 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/enrollMenu.html
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/enrollMenu.html
diff --git a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/index.html b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/index.html
index d45c6b601..d45c6b601 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/index.html
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/index.html
diff --git a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/policyEnrollment/index.html b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/policyEnrollment/index.html
index 021ace372..021ace372 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/policyEnrollment/index.html
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/policyEnrollment/index.html
diff --git a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/policyEnrollment/profileMenu.html b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/policyEnrollment/profileMenu.html
index 9eabc2262..9eabc2262 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/policyEnrollment/profileMenu.html
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/policyEnrollment/profileMenu.html
diff --git a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/policyEnrollment/retrievalMenu.html b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/policyEnrollment/retrievalMenu.html
index ec39a7a01..ec39a7a01 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/policyEnrollment/retrievalMenu.html
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/policyEnrollment/retrievalMenu.html
diff --git a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/policyEnrollment/revocationMenu.html b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/policyEnrollment/revocationMenu.html
index fa810e748..fa810e748 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/policyEnrollment/revocationMenu.html
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/policyEnrollment/revocationMenu.html
diff --git a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/profileEnrollment/index.html b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/profileEnrollment/index.html
index f111c8d95..f111c8d95 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/profileEnrollment/index.html
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/profileEnrollment/index.html
diff --git a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/profileEnrollment/profileMenu.html b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/profileEnrollment/profileMenu.html
index 8f19d91b4..8f19d91b4 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/profileEnrollment/profileMenu.html
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/profileEnrollment/profileMenu.html
diff --git a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/profileEnrollment/retrievalMenu.html b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/profileEnrollment/retrievalMenu.html
index faafe343e..faafe343e 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/profileEnrollment/retrievalMenu.html
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/profileEnrollment/retrievalMenu.html
diff --git a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/profileEnrollment/revocationMenu.html b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/profileEnrollment/revocationMenu.html
index 21f5f4397..21f5f4397 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/profileEnrollment/revocationMenu.html
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/profileEnrollment/revocationMenu.html
diff --git a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/profileMenu.html b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/profileMenu.html
index b621c230e..b621c230e 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/profileMenu.html
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/profileMenu.html
diff --git a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/queryBySerial.html b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/queryBySerial.html
index d9e55bddb..d9e55bddb 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/queryBySerial.html
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/queryBySerial.html
diff --git a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/queryCert.html b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/queryCert.html
index 5dd08e75f..5dd08e75f 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/queryCert.html
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/queryCert.html
diff --git a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/queryCert.template b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/queryCert.template
index c91a0bcf3..c91a0bcf3 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/queryCert.template
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/queryCert.template
diff --git a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/reasonToRevoke.template b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/reasonToRevoke.template
index 8cf4aac0e..8cf4aac0e 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/reasonToRevoke.template
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/reasonToRevoke.template
diff --git a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/recoveryMenu.html b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/recoveryMenu.html
index c463d2d3d..c463d2d3d 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/recoveryMenu.html
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/recoveryMenu.html
diff --git a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/remoteAuthConfig.template b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/remoteAuthConfig.template
index 777c61575..777c61575 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/remoteAuthConfig.template
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/remoteAuthConfig.template
diff --git a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/renewalMenu.html b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/renewalMenu.html
index ca2956b33..ca2956b33 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/renewalMenu.html
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/renewalMenu.html
diff --git a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/requestStatus.template b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/requestStatus.template
index 2ca773f53..2ca773f53 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/requestStatus.template
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/requestStatus.template
diff --git a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/retrievalMenu.html b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/retrievalMenu.html
index c7d8d13c8..c7d8d13c8 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/retrievalMenu.html
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/retrievalMenu.html
diff --git a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/revocationMenu.html b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/revocationMenu.html
index 1b1d19a60..1b1d19a60 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/revocationMenu.html
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/revocationMenu.html
diff --git a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/revocationResult.template b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/revocationResult.template
index ddcc66198..ddcc66198 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/revocationResult.template
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/revocationResult.template
diff --git a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/securitydomainlogin.template b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/securitydomainlogin.template
index c414d43fb..c414d43fb 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/securitydomainlogin.template
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/securitydomainlogin.template
diff --git a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/sendCookie.template b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/sendCookie.template
index 7d4ce6a53..7d4ce6a53 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/sendCookie.template
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/sendCookie.template
diff --git a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/srchCert.html b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/srchCert.html
index 80b46cce2..80b46cce2 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/srchCert.html
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/srchCert.html
diff --git a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/srchCert.template b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/srchCert.template
index ad329b98a..ad329b98a 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/srchCert.template
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/srchCert.template
diff --git a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/tabs.html b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/tabs.html
index 7bf156b61..7bf156b61 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/tabs.html
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/tabs.html
diff --git a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/toDisplayCRL.template b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/toDisplayCRL.template
index ccc6ffd3e..ccc6ffd3e 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/toDisplayCRL.template
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/toDisplayCRL.template
diff --git a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/unrevocationResult.template b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/unrevocationResult.template
index b876f6f5f..b876f6f5f 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/ee/ca/unrevocationResult.template
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/unrevocationResult.template
diff --git a/pki/linux/ca-ui/shared/webapps/ca/ee/cms-funcs.js b/pki/dogtag/ca-ui/shared/webapps/ca/ee/cms-funcs.js
index 800e4afc9..800e4afc9 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/ee/cms-funcs.js
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/ee/cms-funcs.js
diff --git a/pki/linux/ca-ui/shared/webapps/ca/ee/graphics/alertl.gif b/pki/dogtag/ca-ui/shared/webapps/ca/ee/graphics/alertl.gif
index 453d1b2bd..453d1b2bd 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/ee/graphics/alertl.gif
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/ee/graphics/alertl.gif
diff --git a/pki/linux/ca-ui/shared/webapps/ca/ee/graphics/delete.gif b/pki/dogtag/ca-ui/shared/webapps/ca/ee/graphics/delete.gif
index 53a5a3a9b..53a5a3a9b 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/ee/graphics/delete.gif
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/ee/graphics/delete.gif
diff --git a/pki/linux/ca-ui/shared/webapps/ca/ee/graphics/dgLeftTab.gif b/pki/dogtag/ca-ui/shared/webapps/ca/ee/graphics/dgLeftTab.gif
index 35a76c859..35a76c859 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/ee/graphics/dgLeftTab.gif
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/ee/graphics/dgLeftTab.gif
diff --git a/pki/linux/ca-ui/shared/webapps/ca/ee/graphics/dgRightTab.gif b/pki/dogtag/ca-ui/shared/webapps/ca/ee/graphics/dgRightTab.gif
index a519bc759..a519bc759 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/ee/graphics/dgRightTab.gif
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/ee/graphics/dgRightTab.gif
diff --git a/pki/linux/ca-ui/shared/webapps/ca/ee/graphics/dgRightTab2.gif b/pki/dogtag/ca-ui/shared/webapps/ca/ee/graphics/dgRightTab2.gif
index f43ef3a8c..f43ef3a8c 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/ee/graphics/dgRightTab2.gif
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/ee/graphics/dgRightTab2.gif
diff --git a/pki/linux/ca-ui/shared/webapps/ca/ee/graphics/error.gif b/pki/dogtag/ca-ui/shared/webapps/ca/ee/graphics/error.gif
index ba9c07e17..ba9c07e17 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/ee/graphics/error.gif
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/ee/graphics/error.gif
diff --git a/pki/linux/ca-ui/shared/webapps/ca/ee/graphics/folder.gif b/pki/dogtag/ca-ui/shared/webapps/ca/ee/graphics/folder.gif
index fe7796c73..fe7796c73 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/ee/graphics/folder.gif
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/ee/graphics/folder.gif
diff --git a/pki/linux/ca-ui/shared/webapps/ca/ee/graphics/gray90.gif b/pki/dogtag/ca-ui/shared/webapps/ca/ee/graphics/gray90.gif
index c6f811102..c6f811102 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/ee/graphics/gray90.gif
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/ee/graphics/gray90.gif
diff --git a/pki/linux/ca-ui/shared/webapps/ca/ee/graphics/hr.gif b/pki/dogtag/ca-ui/shared/webapps/ca/ee/graphics/hr.gif
index 14f8acf92..14f8acf92 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/ee/graphics/hr.gif
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/ee/graphics/hr.gif
diff --git a/pki/linux/ca-ui/shared/webapps/ca/ee/graphics/lgLeftTab.gif b/pki/dogtag/ca-ui/shared/webapps/ca/ee/graphics/lgLeftTab.gif
index a78fbc89d..a78fbc89d 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/ee/graphics/lgLeftTab.gif
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/ee/graphics/lgLeftTab.gif
diff --git a/pki/linux/ca-ui/shared/webapps/ca/ee/graphics/lgRightTab.gif b/pki/dogtag/ca-ui/shared/webapps/ca/ee/graphics/lgRightTab.gif
index 71852402d..71852402d 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/ee/graphics/lgRightTab.gif
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/ee/graphics/lgRightTab.gif
diff --git a/pki/linux/ca-ui/shared/webapps/ca/ee/graphics/lgRightTab2.gif b/pki/dogtag/ca-ui/shared/webapps/ca/ee/graphics/lgRightTab2.gif
index 76b2f67f1..76b2f67f1 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/ee/graphics/lgRightTab2.gif
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/ee/graphics/lgRightTab2.gif
diff --git a/pki/linux/ca-ui/shared/webapps/ca/ee/graphics/listclosed.gif b/pki/dogtag/ca-ui/shared/webapps/ca/ee/graphics/listclosed.gif
index 4907361c6..4907361c6 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/ee/graphics/listclosed.gif
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/ee/graphics/listclosed.gif
diff --git a/pki/linux/ca-ui/shared/webapps/ca/ee/graphics/messagel.gif b/pki/dogtag/ca-ui/shared/webapps/ca/ee/graphics/messagel.gif
index e46c67a09..e46c67a09 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/ee/graphics/messagel.gif
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/ee/graphics/messagel.gif
diff --git a/pki/linux/ca-ui/shared/webapps/ca/ee/graphics/spacer.gif b/pki/dogtag/ca-ui/shared/webapps/ca/ee/graphics/spacer.gif
index 13acffe53..13acffe53 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/ee/graphics/spacer.gif
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/ee/graphics/spacer.gif
diff --git a/pki/linux/ca-ui/shared/webapps/ca/ee/graphics/whLeftTab.gif b/pki/dogtag/ca-ui/shared/webapps/ca/ee/graphics/whLeftTab.gif
index 525e6e73d..525e6e73d 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/ee/graphics/whLeftTab.gif
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/ee/graphics/whLeftTab.gif
diff --git a/pki/linux/ca-ui/shared/webapps/ca/ee/graphics/whRightTab.gif b/pki/dogtag/ca-ui/shared/webapps/ca/ee/graphics/whRightTab.gif
index f3740ee9b..f3740ee9b 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/ee/graphics/whRightTab.gif
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/ee/graphics/whRightTab.gif
diff --git a/pki/linux/ca-ui/shared/webapps/ca/ee/graphics/whRightTab2.gif b/pki/dogtag/ca-ui/shared/webapps/ca/ee/graphics/whRightTab2.gif
index 81f8daac5..81f8daac5 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/ee/graphics/whRightTab2.gif
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/ee/graphics/whRightTab2.gif
diff --git a/pki/linux/ca-ui/shared/webapps/ca/ee/helpfun.js b/pki/dogtag/ca-ui/shared/webapps/ca/ee/helpfun.js
index 14a80bb95..14a80bb95 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/ee/helpfun.js
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/ee/helpfun.js
diff --git a/pki/linux/ca-ui/shared/webapps/ca/ee/index.html b/pki/dogtag/ca-ui/shared/webapps/ca/ee/index.html
index 9deea487f..9deea487f 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/ee/index.html
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/ee/index.html
diff --git a/pki/linux/ca-ui/shared/webapps/ca/services.template b/pki/dogtag/ca-ui/shared/webapps/ca/services.template
index 0f326e0df..0f326e0df 100644
--- a/pki/linux/ca-ui/shared/webapps/ca/services.template
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/services.template
diff --git a/pki/linux/ca/build_linux b/pki/dogtag/ca/build_linux
index 6be41e5e1..6be41e5e1 100755
--- a/pki/linux/ca/build_linux
+++ b/pki/dogtag/ca/build_linux
diff --git a/pki/linux/ca/config-ext/build_linux_pki b/pki/dogtag/ca/config-ext/build_linux_pki
index d9ea91e8c..d9ea91e8c 100755
--- a/pki/linux/ca/config-ext/build_linux_pki
+++ b/pki/dogtag/ca/config-ext/build_linux_pki
diff --git a/pki/linux/ca/config/product.xml b/pki/dogtag/ca/config/product.xml
index 33caf48ed..33caf48ed 100644
--- a/pki/linux/ca/config/product.xml
+++ b/pki/dogtag/ca/config/product.xml
diff --git a/pki/linux/ca/config/release.xml b/pki/dogtag/ca/config/release.xml
index fc43aaeb7..fc43aaeb7 100644
--- a/pki/linux/ca/config/release.xml
+++ b/pki/dogtag/ca/config/release.xml
diff --git a/pki/linux/ca/pki-ca.spec b/pki/dogtag/ca/pki-ca.spec
index 45dda5012..45dda5012 100644
--- a/pki/linux/ca/pki-ca.spec
+++ b/pki/dogtag/ca/pki-ca.spec
diff --git a/pki/linux/common-ui/LICENSE b/pki/dogtag/common-ui/LICENSE
index e36f2269a..e36f2269a 100644
--- a/pki/linux/common-ui/LICENSE
+++ b/pki/dogtag/common-ui/LICENSE
diff --git a/pki/linux/common-ui/build.xml b/pki/dogtag/common-ui/build.xml
index 8b981a7db..8b981a7db 100644
--- a/pki/linux/common-ui/build.xml
+++ b/pki/dogtag/common-ui/build.xml
diff --git a/pki/linux/common-ui/build_linux b/pki/dogtag/common-ui/build_linux
index 10a6bc982..10a6bc982 100755
--- a/pki/linux/common-ui/build_linux
+++ b/pki/dogtag/common-ui/build_linux
diff --git a/pki/linux/common-ui/config-ext/build_linux_pki b/pki/dogtag/common-ui/config-ext/build_linux_pki
index d9ea91e8c..d9ea91e8c 100755
--- a/pki/linux/common-ui/config-ext/build_linux_pki
+++ b/pki/dogtag/common-ui/config-ext/build_linux_pki
diff --git a/pki/linux/common-ui/config/product.xml b/pki/dogtag/common-ui/config/product.xml
index 33caf48ed..33caf48ed 100644
--- a/pki/linux/common-ui/config/product.xml
+++ b/pki/dogtag/common-ui/config/product.xml
diff --git a/pki/linux/common-ui/config/release.xml b/pki/dogtag/common-ui/config/release.xml
index fc43aaeb7..fc43aaeb7 100644
--- a/pki/linux/common-ui/config/release.xml
+++ b/pki/dogtag/common-ui/config/release.xml
diff --git a/pki/linux/common-ui/pki-common-ui.spec b/pki/dogtag/common-ui/pki-common-ui.spec
index 94f00c1e9..94f00c1e9 100644
--- a/pki/linux/common-ui/pki-common-ui.spec
+++ b/pki/dogtag/common-ui/pki-common-ui.spec
diff --git a/pki/linux/common-ui/shared/admin/console/config/adminauthenticatepanel.vm b/pki/dogtag/common-ui/shared/admin/console/config/adminauthenticatepanel.vm
index 5608878d9..5608878d9 100644
--- a/pki/linux/common-ui/shared/admin/console/config/adminauthenticatepanel.vm
+++ b/pki/dogtag/common-ui/shared/admin/console/config/adminauthenticatepanel.vm
diff --git a/pki/linux/common-ui/shared/admin/console/config/adminpanel.vm b/pki/dogtag/common-ui/shared/admin/console/config/adminpanel.vm
index 60af2a530..60af2a530 100644
--- a/pki/linux/common-ui/shared/admin/console/config/adminpanel.vm
+++ b/pki/dogtag/common-ui/shared/admin/console/config/adminpanel.vm
diff --git a/pki/linux/common-ui/shared/admin/console/config/agentauthenticatepanel.vm b/pki/dogtag/common-ui/shared/admin/console/config/agentauthenticatepanel.vm
index 4a7e79174..4a7e79174 100644
--- a/pki/linux/common-ui/shared/admin/console/config/agentauthenticatepanel.vm
+++ b/pki/dogtag/common-ui/shared/admin/console/config/agentauthenticatepanel.vm
diff --git a/pki/linux/common-ui/shared/admin/console/config/backupkeycertpanel.vm b/pki/dogtag/common-ui/shared/admin/console/config/backupkeycertpanel.vm
index 471f7e09f..471f7e09f 100644
--- a/pki/linux/common-ui/shared/admin/console/config/backupkeycertpanel.vm
+++ b/pki/dogtag/common-ui/shared/admin/console/config/backupkeycertpanel.vm
diff --git a/pki/linux/common-ui/shared/admin/console/config/certchainpanel.vm b/pki/dogtag/common-ui/shared/admin/console/config/certchainpanel.vm
index 08bcc1331..08bcc1331 100644
--- a/pki/linux/common-ui/shared/admin/console/config/certchainpanel.vm
+++ b/pki/dogtag/common-ui/shared/admin/console/config/certchainpanel.vm
diff --git a/pki/linux/common-ui/shared/admin/console/config/certprettyprintpanel.vm b/pki/dogtag/common-ui/shared/admin/console/config/certprettyprintpanel.vm
index ac8da10ee..ac8da10ee 100644
--- a/pki/linux/common-ui/shared/admin/console/config/certprettyprintpanel.vm
+++ b/pki/dogtag/common-ui/shared/admin/console/config/certprettyprintpanel.vm
diff --git a/pki/linux/common-ui/shared/admin/console/config/certrequestpanel.vm b/pki/dogtag/common-ui/shared/admin/console/config/certrequestpanel.vm
index 3eb5ebdf9..3eb5ebdf9 100644
--- a/pki/linux/common-ui/shared/admin/console/config/certrequestpanel.vm
+++ b/pki/dogtag/common-ui/shared/admin/console/config/certrequestpanel.vm
diff --git a/pki/linux/common-ui/shared/admin/console/config/config_addhsm.vm b/pki/dogtag/common-ui/shared/admin/console/config/config_addhsm.vm
index f426951c4..f426951c4 100644
--- a/pki/linux/common-ui/shared/admin/console/config/config_addhsm.vm
+++ b/pki/dogtag/common-ui/shared/admin/console/config/config_addhsm.vm
diff --git a/pki/linux/common-ui/shared/admin/console/config/config_clone.vm b/pki/dogtag/common-ui/shared/admin/console/config/config_clone.vm
index 407544ad5..407544ad5 100644
--- a/pki/linux/common-ui/shared/admin/console/config/config_clone.vm
+++ b/pki/dogtag/common-ui/shared/admin/console/config/config_clone.vm
diff --git a/pki/linux/common-ui/shared/admin/console/config/config_db.vm b/pki/dogtag/common-ui/shared/admin/console/config/config_db.vm
index 94217f3a6..94217f3a6 100644
--- a/pki/linux/common-ui/shared/admin/console/config/config_db.vm
+++ b/pki/dogtag/common-ui/shared/admin/console/config/config_db.vm
diff --git a/pki/linux/common-ui/shared/admin/console/config/config_hsm.vm b/pki/dogtag/common-ui/shared/admin/console/config/config_hsm.vm
index 2170c425a..2170c425a 100644
--- a/pki/linux/common-ui/shared/admin/console/config/config_hsm.vm
+++ b/pki/dogtag/common-ui/shared/admin/console/config/config_hsm.vm
diff --git a/pki/linux/common-ui/shared/admin/console/config/config_hsmloginpanel.vm b/pki/dogtag/common-ui/shared/admin/console/config/config_hsmloginpanel.vm
index 147425bae..147425bae 100644
--- a/pki/linux/common-ui/shared/admin/console/config/config_hsmloginpanel.vm
+++ b/pki/dogtag/common-ui/shared/admin/console/config/config_hsmloginpanel.vm
diff --git a/pki/linux/common-ui/shared/admin/console/config/config_join.vm b/pki/dogtag/common-ui/shared/admin/console/config/config_join.vm
index b9855c2f7..b9855c2f7 100644
--- a/pki/linux/common-ui/shared/admin/console/config/config_join.vm
+++ b/pki/dogtag/common-ui/shared/admin/console/config/config_join.vm
diff --git a/pki/linux/common-ui/shared/admin/console/config/config_rootca.vm b/pki/dogtag/common-ui/shared/admin/console/config/config_rootca.vm
index cc6cbc689..cc6cbc689 100644
--- a/pki/linux/common-ui/shared/admin/console/config/config_rootca.vm
+++ b/pki/dogtag/common-ui/shared/admin/console/config/config_rootca.vm
diff --git a/pki/linux/common-ui/shared/admin/console/config/createsubsystempanel.vm b/pki/dogtag/common-ui/shared/admin/console/config/createsubsystempanel.vm
index d6443ed96..d6443ed96 100644
--- a/pki/linux/common-ui/shared/admin/console/config/createsubsystempanel.vm
+++ b/pki/dogtag/common-ui/shared/admin/console/config/createsubsystempanel.vm
diff --git a/pki/linux/common-ui/shared/admin/console/config/databasepanel.vm b/pki/dogtag/common-ui/shared/admin/console/config/databasepanel.vm
index 6e733650a..6e733650a 100644
--- a/pki/linux/common-ui/shared/admin/console/config/databasepanel.vm
+++ b/pki/dogtag/common-ui/shared/admin/console/config/databasepanel.vm
diff --git a/pki/linux/common-ui/shared/admin/console/config/displaycertchainpanel.vm b/pki/dogtag/common-ui/shared/admin/console/config/displaycertchainpanel.vm
index 73348189d..73348189d 100644
--- a/pki/linux/common-ui/shared/admin/console/config/displaycertchainpanel.vm
+++ b/pki/dogtag/common-ui/shared/admin/console/config/displaycertchainpanel.vm
diff --git a/pki/linux/common-ui/shared/admin/console/config/donepanel.vm b/pki/dogtag/common-ui/shared/admin/console/config/donepanel.vm
index 573beda20..573beda20 100644
--- a/pki/linux/common-ui/shared/admin/console/config/donepanel.vm
+++ b/pki/dogtag/common-ui/shared/admin/console/config/donepanel.vm
diff --git a/pki/linux/common-ui/shared/admin/console/config/footer.vm b/pki/dogtag/common-ui/shared/admin/console/config/footer.vm
index 109f44a86..109f44a86 100644
--- a/pki/linux/common-ui/shared/admin/console/config/footer.vm
+++ b/pki/dogtag/common-ui/shared/admin/console/config/footer.vm
diff --git a/pki/linux/common-ui/shared/admin/console/config/header.vm b/pki/dogtag/common-ui/shared/admin/console/config/header.vm
index 8732896c2..8732896c2 100644
--- a/pki/linux/common-ui/shared/admin/console/config/header.vm
+++ b/pki/dogtag/common-ui/shared/admin/console/config/header.vm
diff --git a/pki/linux/common-ui/shared/admin/console/config/hierarchypanel.vm b/pki/dogtag/common-ui/shared/admin/console/config/hierarchypanel.vm
index 64b77a8bd..64b77a8bd 100644
--- a/pki/linux/common-ui/shared/admin/console/config/hierarchypanel.vm
+++ b/pki/dogtag/common-ui/shared/admin/console/config/hierarchypanel.vm
diff --git a/pki/linux/common-ui/shared/admin/console/config/importadmincertpanel.vm b/pki/dogtag/common-ui/shared/admin/console/config/importadmincertpanel.vm
index 593590415..593590415 100644
--- a/pki/linux/common-ui/shared/admin/console/config/importadmincertpanel.vm
+++ b/pki/dogtag/common-ui/shared/admin/console/config/importadmincertpanel.vm
diff --git a/pki/linux/common-ui/shared/admin/console/config/importcachainpanel.vm b/pki/dogtag/common-ui/shared/admin/console/config/importcachainpanel.vm
index 768e8206c..768e8206c 100755
--- a/pki/linux/common-ui/shared/admin/console/config/importcachainpanel.vm
+++ b/pki/dogtag/common-ui/shared/admin/console/config/importcachainpanel.vm
diff --git a/pki/linux/common-ui/shared/admin/console/config/login.vm b/pki/dogtag/common-ui/shared/admin/console/config/login.vm
index c84f4b6c4..c84f4b6c4 100644
--- a/pki/linux/common-ui/shared/admin/console/config/login.vm
+++ b/pki/dogtag/common-ui/shared/admin/console/config/login.vm
diff --git a/pki/linux/common-ui/shared/admin/console/config/modulepanel.vm b/pki/dogtag/common-ui/shared/admin/console/config/modulepanel.vm
index a89d16e14..a89d16e14 100644
--- a/pki/linux/common-ui/shared/admin/console/config/modulepanel.vm
+++ b/pki/dogtag/common-ui/shared/admin/console/config/modulepanel.vm
diff --git a/pki/linux/common-ui/shared/admin/console/config/namepanel.vm b/pki/dogtag/common-ui/shared/admin/console/config/namepanel.vm
index a76a65d9d..a76a65d9d 100644
--- a/pki/linux/common-ui/shared/admin/console/config/namepanel.vm
+++ b/pki/dogtag/common-ui/shared/admin/console/config/namepanel.vm
diff --git a/pki/linux/common-ui/shared/admin/console/config/restorekeycertpanel.vm b/pki/dogtag/common-ui/shared/admin/console/config/restorekeycertpanel.vm
index 9cac40a7d..9cac40a7d 100644
--- a/pki/linux/common-ui/shared/admin/console/config/restorekeycertpanel.vm
+++ b/pki/dogtag/common-ui/shared/admin/console/config/restorekeycertpanel.vm
diff --git a/pki/linux/common-ui/shared/admin/console/config/savepkcs12panel.vm b/pki/dogtag/common-ui/shared/admin/console/config/savepkcs12panel.vm
index de7d86467..de7d86467 100644
--- a/pki/linux/common-ui/shared/admin/console/config/savepkcs12panel.vm
+++ b/pki/dogtag/common-ui/shared/admin/console/config/savepkcs12panel.vm
diff --git a/pki/linux/common-ui/shared/admin/console/config/securitydomainloginpanel.vm b/pki/dogtag/common-ui/shared/admin/console/config/securitydomainloginpanel.vm
index ae42d86fb..ae42d86fb 100644
--- a/pki/linux/common-ui/shared/admin/console/config/securitydomainloginpanel.vm
+++ b/pki/dogtag/common-ui/shared/admin/console/config/securitydomainloginpanel.vm
diff --git a/pki/linux/common-ui/shared/admin/console/config/securitydomainpanel.vm b/pki/dogtag/common-ui/shared/admin/console/config/securitydomainpanel.vm
index 205e18bb5..205e18bb5 100644
--- a/pki/linux/common-ui/shared/admin/console/config/securitydomainpanel.vm
+++ b/pki/dogtag/common-ui/shared/admin/console/config/securitydomainpanel.vm
diff --git a/pki/linux/common-ui/shared/admin/console/config/sidemenu.vm b/pki/dogtag/common-ui/shared/admin/console/config/sidemenu.vm
index 09fe16870..09fe16870 100644
--- a/pki/linux/common-ui/shared/admin/console/config/sidemenu.vm
+++ b/pki/dogtag/common-ui/shared/admin/console/config/sidemenu.vm
diff --git a/pki/linux/common-ui/shared/admin/console/config/sizepanel.vm b/pki/dogtag/common-ui/shared/admin/console/config/sizepanel.vm
index 374973ad3..374973ad3 100644
--- a/pki/linux/common-ui/shared/admin/console/config/sizepanel.vm
+++ b/pki/dogtag/common-ui/shared/admin/console/config/sizepanel.vm
diff --git a/pki/linux/common-ui/shared/admin/console/config/topmenu.vm b/pki/dogtag/common-ui/shared/admin/console/config/topmenu.vm
index 64881066f..64881066f 100644
--- a/pki/linux/common-ui/shared/admin/console/config/topmenu.vm
+++ b/pki/dogtag/common-ui/shared/admin/console/config/topmenu.vm
diff --git a/pki/linux/common-ui/shared/admin/console/config/welcomepanel.vm b/pki/dogtag/common-ui/shared/admin/console/config/welcomepanel.vm
index 07b0d641f..07b0d641f 100644
--- a/pki/linux/common-ui/shared/admin/console/config/welcomepanel.vm
+++ b/pki/dogtag/common-ui/shared/admin/console/config/welcomepanel.vm
diff --git a/pki/linux/common-ui/shared/admin/console/config/wizard.vm b/pki/dogtag/common-ui/shared/admin/console/config/wizard.vm
index 4a6a9cfdc..4a6a9cfdc 100644
--- a/pki/linux/common-ui/shared/admin/console/config/wizard.vm
+++ b/pki/dogtag/common-ui/shared/admin/console/config/wizard.vm
diff --git a/pki/linux/common-ui/shared/admin/console/config/xml.vm b/pki/dogtag/common-ui/shared/admin/console/config/xml.vm
index 31ff72aa2..31ff72aa2 100644
--- a/pki/linux/common-ui/shared/admin/console/config/xml.vm
+++ b/pki/dogtag/common-ui/shared/admin/console/config/xml.vm
diff --git a/pki/linux/common-ui/shared/admin/console/css/pki-360.css b/pki/dogtag/common-ui/shared/admin/console/css/pki-360.css
index 56667ac97..56667ac97 100644
--- a/pki/linux/common-ui/shared/admin/console/css/pki-360.css
+++ b/pki/dogtag/common-ui/shared/admin/console/css/pki-360.css
diff --git a/pki/linux/common-ui/shared/admin/console/css/pki-base.css b/pki/dogtag/common-ui/shared/admin/console/css/pki-base.css
index 507addbb5..507addbb5 100644
--- a/pki/linux/common-ui/shared/admin/console/css/pki-base.css
+++ b/pki/dogtag/common-ui/shared/admin/console/css/pki-base.css
diff --git a/pki/linux/common-ui/shared/admin/console/css/pki.css b/pki/dogtag/common-ui/shared/admin/console/css/pki.css
index 3bb0f15db..3bb0f15db 100644
--- a/pki/linux/common-ui/shared/admin/console/css/pki.css
+++ b/pki/dogtag/common-ui/shared/admin/console/css/pki.css
diff --git a/pki/linux/common-ui/shared/admin/console/img/badge.png b/pki/dogtag/common-ui/shared/admin/console/img/badge.png
index 5fe0223b5..5fe0223b5 100644
--- a/pki/linux/common-ui/shared/admin/console/img/badge.png
+++ b/pki/dogtag/common-ui/shared/admin/console/img/badge.png
diff --git a/pki/linux/common-ui/shared/admin/console/img/bigrotation2.gif b/pki/dogtag/common-ui/shared/admin/console/img/bigrotation2.gif
index 5bb90fd6a..5bb90fd6a 100644
--- a/pki/linux/common-ui/shared/admin/console/img/bigrotation2.gif
+++ b/pki/dogtag/common-ui/shared/admin/console/img/bigrotation2.gif
diff --git a/pki/linux/common-ui/shared/admin/console/img/certificate.png b/pki/dogtag/common-ui/shared/admin/console/img/certificate.png
index 2ea9f88bb..2ea9f88bb 100644
--- a/pki/linux/common-ui/shared/admin/console/img/certificate.png
+++ b/pki/dogtag/common-ui/shared/admin/console/img/certificate.png
diff --git a/pki/linux/common-ui/shared/admin/console/img/clearpixel.gif b/pki/dogtag/common-ui/shared/admin/console/img/clearpixel.gif
index ae710460b..ae710460b 100644
--- a/pki/linux/common-ui/shared/admin/console/img/clearpixel.gif
+++ b/pki/dogtag/common-ui/shared/admin/console/img/clearpixel.gif
diff --git a/pki/linux/common-ui/shared/admin/console/img/favicon.ico b/pki/dogtag/common-ui/shared/admin/console/img/favicon.ico
index efc1d33f4..efc1d33f4 100644
--- a/pki/linux/common-ui/shared/admin/console/img/favicon.ico
+++ b/pki/dogtag/common-ui/shared/admin/console/img/favicon.ico
diff --git a/pki/linux/common-ui/shared/admin/console/img/icon-software.gif b/pki/dogtag/common-ui/shared/admin/console/img/icon-software.gif
index dd64b485c..dd64b485c 100644
--- a/pki/linux/common-ui/shared/admin/console/img/icon-software.gif
+++ b/pki/dogtag/common-ui/shared/admin/console/img/icon-software.gif
diff --git a/pki/linux/common-ui/shared/admin/console/img/icon_crit_update.gif b/pki/dogtag/common-ui/shared/admin/console/img/icon_crit_update.gif
index cf3c47907..cf3c47907 100644
--- a/pki/linux/common-ui/shared/admin/console/img/icon_crit_update.gif
+++ b/pki/dogtag/common-ui/shared/admin/console/img/icon_crit_update.gif
diff --git a/pki/linux/common-ui/shared/admin/console/img/id.png b/pki/dogtag/common-ui/shared/admin/console/img/id.png
index 2c54191e1..2c54191e1 100644
--- a/pki/linux/common-ui/shared/admin/console/img/id.png
+++ b/pki/dogtag/common-ui/shared/admin/console/img/id.png
diff --git a/pki/linux/common-ui/shared/admin/console/img/idkey.png b/pki/dogtag/common-ui/shared/admin/console/img/idkey.png
index 3e27d2d05..3e27d2d05 100644
--- a/pki/linux/common-ui/shared/admin/console/img/idkey.png
+++ b/pki/dogtag/common-ui/shared/admin/console/img/idkey.png
diff --git a/pki/linux/common-ui/shared/admin/console/img/key.png b/pki/dogtag/common-ui/shared/admin/console/img/key.png
index db2896248..db2896248 100644
--- a/pki/linux/common-ui/shared/admin/console/img/key.png
+++ b/pki/dogtag/common-ui/shared/admin/console/img/key.png
diff --git a/pki/linux/common-ui/shared/admin/console/img/lock.png b/pki/dogtag/common-ui/shared/admin/console/img/lock.png
index 56be3b755..56be3b755 100644
--- a/pki/linux/common-ui/shared/admin/console/img/lock.png
+++ b/pki/dogtag/common-ui/shared/admin/console/img/lock.png
diff --git a/pki/linux/common-ui/shared/admin/console/img/logo_header.gif b/pki/dogtag/common-ui/shared/admin/console/img/logo_header.gif
index 2d1ea5579..2d1ea5579 100644
--- a/pki/linux/common-ui/shared/admin/console/img/logo_header.gif
+++ b/pki/dogtag/common-ui/shared/admin/console/img/logo_header.gif
diff --git a/pki/linux/common-ui/shared/admin/console/img/no-certificate.png b/pki/dogtag/common-ui/shared/admin/console/img/no-certificate.png
index 7d93a41c3..7d93a41c3 100644
--- a/pki/linux/common-ui/shared/admin/console/img/no-certificate.png
+++ b/pki/dogtag/common-ui/shared/admin/console/img/no-certificate.png
diff --git a/pki/linux/common-ui/shared/admin/console/img/rootca.gif b/pki/dogtag/common-ui/shared/admin/console/img/rootca.gif
index 303e25c10..303e25c10 100644
--- a/pki/linux/common-ui/shared/admin/console/img/rootca.gif
+++ b/pki/dogtag/common-ui/shared/admin/console/img/rootca.gif
diff --git a/pki/linux/common-ui/shared/admin/console/img/sub.gif b/pki/dogtag/common-ui/shared/admin/console/img/sub.gif
index e4cca8384..e4cca8384 100644
--- a/pki/linux/common-ui/shared/admin/console/img/sub.gif
+++ b/pki/dogtag/common-ui/shared/admin/console/img/sub.gif
diff --git a/pki/linux/common-ui/shared/admin/console/js/misc.js b/pki/dogtag/common-ui/shared/admin/console/js/misc.js
index 40d9fd0a3..40d9fd0a3 100644
--- a/pki/linux/common-ui/shared/admin/console/js/misc.js
+++ b/pki/dogtag/common-ui/shared/admin/console/js/misc.js
diff --git a/pki/linux/common/build_linux b/pki/dogtag/common/build_linux
index 51618a126..51618a126 100755
--- a/pki/linux/common/build_linux
+++ b/pki/dogtag/common/build_linux
diff --git a/pki/linux/common/config-ext/build_linux_pki b/pki/dogtag/common/config-ext/build_linux_pki
index d9ea91e8c..d9ea91e8c 100755
--- a/pki/linux/common/config-ext/build_linux_pki
+++ b/pki/dogtag/common/config-ext/build_linux_pki
diff --git a/pki/linux/common/config/product.xml b/pki/dogtag/common/config/product.xml
index 33caf48ed..33caf48ed 100644
--- a/pki/linux/common/config/product.xml
+++ b/pki/dogtag/common/config/product.xml
diff --git a/pki/linux/common/config/release.xml b/pki/dogtag/common/config/release.xml
index fc43aaeb7..fc43aaeb7 100644
--- a/pki/linux/common/config/release.xml
+++ b/pki/dogtag/common/config/release.xml
diff --git a/pki/linux/common/pki-common.spec b/pki/dogtag/common/pki-common.spec
index c90f0562a..c90f0562a 100644
--- a/pki/linux/common/pki-common.spec
+++ b/pki/dogtag/common/pki-common.spec
diff --git a/pki/linux/config-ext/build_linux_pki b/pki/dogtag/config-ext/build_linux_pki
index d9ea91e8c..d9ea91e8c 100755
--- a/pki/linux/config-ext/build_linux_pki
+++ b/pki/dogtag/config-ext/build_linux_pki
diff --git a/pki/linux/console-ui/CMSAdminRS.properties b/pki/dogtag/console-ui/CMSAdminRS.properties
index bbe8f126a..bbe8f126a 100644
--- a/pki/linux/console-ui/CMSAdminRS.properties
+++ b/pki/dogtag/console-ui/CMSAdminRS.properties
diff --git a/pki/linux/console-ui/LICENSE b/pki/dogtag/console-ui/LICENSE
index e36f2269a..e36f2269a 100644
--- a/pki/linux/console-ui/LICENSE
+++ b/pki/dogtag/console-ui/LICENSE
diff --git a/pki/linux/console-ui/build.xml b/pki/dogtag/console-ui/build.xml
index 2e3f8d7b1..2e3f8d7b1 100644
--- a/pki/linux/console-ui/build.xml
+++ b/pki/dogtag/console-ui/build.xml
diff --git a/pki/linux/console-ui/build_linux b/pki/dogtag/console-ui/build_linux
index bbcd0a6a4..bbcd0a6a4 100755
--- a/pki/linux/console-ui/build_linux
+++ b/pki/dogtag/console-ui/build_linux
diff --git a/pki/linux/console-ui/config-ext/build_linux_pki b/pki/dogtag/console-ui/config-ext/build_linux_pki
index d9ea91e8c..d9ea91e8c 100755
--- a/pki/linux/console-ui/config-ext/build_linux_pki
+++ b/pki/dogtag/console-ui/config-ext/build_linux_pki
diff --git a/pki/linux/console-ui/config/product.xml b/pki/dogtag/console-ui/config/product.xml
index 33caf48ed..33caf48ed 100644
--- a/pki/linux/console-ui/config/product.xml
+++ b/pki/dogtag/console-ui/config/product.xml
diff --git a/pki/linux/console-ui/config/release.xml b/pki/dogtag/console-ui/config/release.xml
index fc43aaeb7..fc43aaeb7 100644
--- a/pki/linux/console-ui/config/release.xml
+++ b/pki/dogtag/console-ui/config/release.xml
diff --git a/pki/linux/console-ui/pki-console-ui.spec b/pki/dogtag/console-ui/pki-console-ui.spec
index 9b764446b..9b764446b 100644
--- a/pki/linux/console-ui/pki-console-ui.spec
+++ b/pki/dogtag/console-ui/pki-console-ui.spec
diff --git a/pki/linux/console-ui/src/com/netscape/admin/certsrv/theme/certmgmt.gif b/pki/dogtag/console-ui/src/com/netscape/admin/certsrv/theme/certmgmt.gif
index e3ad6ab94..e3ad6ab94 100644
--- a/pki/linux/console-ui/src/com/netscape/admin/certsrv/theme/certmgmt.gif
+++ b/pki/dogtag/console-ui/src/com/netscape/admin/certsrv/theme/certmgmt.gif
diff --git a/pki/linux/console-ui/src/com/netscape/management/client/theme/images/ConsoleBanner.gif b/pki/dogtag/console-ui/src/com/netscape/management/client/theme/images/ConsoleBanner.gif
index e3ad6ab94..e3ad6ab94 100644
--- a/pki/linux/console-ui/src/com/netscape/management/client/theme/images/ConsoleBanner.gif
+++ b/pki/dogtag/console-ui/src/com/netscape/management/client/theme/images/ConsoleBanner.gif
diff --git a/pki/linux/console-ui/src/com/netscape/management/client/theme/images/login.gif b/pki/dogtag/console-ui/src/com/netscape/management/client/theme/images/login.gif
index 84e3b08b8..84e3b08b8 100644
--- a/pki/linux/console-ui/src/com/netscape/management/client/theme/images/login.gif
+++ b/pki/dogtag/console-ui/src/com/netscape/management/client/theme/images/login.gif
diff --git a/pki/linux/console-ui/src/com/netscape/management/client/theme/images/logo16.gif b/pki/dogtag/console-ui/src/com/netscape/management/client/theme/images/logo16.gif
index 3ab1a1eb0..3ab1a1eb0 100644
--- a/pki/linux/console-ui/src/com/netscape/management/client/theme/images/logo16.gif
+++ b/pki/dogtag/console-ui/src/com/netscape/management/client/theme/images/logo16.gif
diff --git a/pki/linux/console-ui/src/com/netscape/management/client/theme/images/logo32.gif b/pki/dogtag/console-ui/src/com/netscape/management/client/theme/images/logo32.gif
index 859200f0e..859200f0e 100644
--- a/pki/linux/console-ui/src/com/netscape/management/client/theme/images/logo32.gif
+++ b/pki/dogtag/console-ui/src/com/netscape/management/client/theme/images/logo32.gif
diff --git a/pki/linux/console-ui/src/com/netscape/management/client/theme/theme.properties b/pki/dogtag/console-ui/src/com/netscape/management/client/theme/theme.properties
index 8a47dc66d..8a47dc66d 100644
--- a/pki/linux/console-ui/src/com/netscape/management/client/theme/theme.properties
+++ b/pki/dogtag/console-ui/src/com/netscape/management/client/theme/theme.properties
diff --git a/pki/linux/console/build_linux b/pki/dogtag/console/build_linux
index 9700d8321..9700d8321 100755
--- a/pki/linux/console/build_linux
+++ b/pki/dogtag/console/build_linux
diff --git a/pki/linux/console/config-ext/build_linux_pki b/pki/dogtag/console/config-ext/build_linux_pki
index d9ea91e8c..d9ea91e8c 100755
--- a/pki/linux/console/config-ext/build_linux_pki
+++ b/pki/dogtag/console/config-ext/build_linux_pki
diff --git a/pki/linux/console/config/product.xml b/pki/dogtag/console/config/product.xml
index 33caf48ed..33caf48ed 100644
--- a/pki/linux/console/config/product.xml
+++ b/pki/dogtag/console/config/product.xml
diff --git a/pki/linux/console/config/release.xml b/pki/dogtag/console/config/release.xml
index fc43aaeb7..fc43aaeb7 100644
--- a/pki/linux/console/config/release.xml
+++ b/pki/dogtag/console/config/release.xml
diff --git a/pki/linux/console/pki-console.spec b/pki/dogtag/console/pki-console.spec
index 5a12f4b5c..5a12f4b5c 100644
--- a/pki/linux/console/pki-console.spec
+++ b/pki/dogtag/console/pki-console.spec
diff --git a/pki/linux/java-tools/build_linux b/pki/dogtag/java-tools/build_linux
index 3eaf7df2f..3eaf7df2f 100755
--- a/pki/linux/java-tools/build_linux
+++ b/pki/dogtag/java-tools/build_linux
diff --git a/pki/linux/java-tools/config-ext/build_linux_pki b/pki/dogtag/java-tools/config-ext/build_linux_pki
index d9ea91e8c..d9ea91e8c 100755
--- a/pki/linux/java-tools/config-ext/build_linux_pki
+++ b/pki/dogtag/java-tools/config-ext/build_linux_pki
diff --git a/pki/linux/java-tools/config/product.xml b/pki/dogtag/java-tools/config/product.xml
index 33caf48ed..33caf48ed 100644
--- a/pki/linux/java-tools/config/product.xml
+++ b/pki/dogtag/java-tools/config/product.xml
diff --git a/pki/linux/java-tools/config/release.xml b/pki/dogtag/java-tools/config/release.xml
index fc43aaeb7..fc43aaeb7 100644
--- a/pki/linux/java-tools/config/release.xml
+++ b/pki/dogtag/java-tools/config/release.xml
diff --git a/pki/linux/java-tools/pki-java-tools.spec b/pki/dogtag/java-tools/pki-java-tools.spec
index d8075f440..d8075f440 100644
--- a/pki/linux/java-tools/pki-java-tools.spec
+++ b/pki/dogtag/java-tools/pki-java-tools.spec
diff --git a/pki/linux/kra-ui/LICENSE b/pki/dogtag/kra-ui/LICENSE
index e36f2269a..e36f2269a 100644
--- a/pki/linux/kra-ui/LICENSE
+++ b/pki/dogtag/kra-ui/LICENSE
diff --git a/pki/linux/kra-ui/build.xml b/pki/dogtag/kra-ui/build.xml
index f16c171c3..f16c171c3 100644
--- a/pki/linux/kra-ui/build.xml
+++ b/pki/dogtag/kra-ui/build.xml
diff --git a/pki/linux/kra-ui/build_linux b/pki/dogtag/kra-ui/build_linux
index c934ba268..c934ba268 100755
--- a/pki/linux/kra-ui/build_linux
+++ b/pki/dogtag/kra-ui/build_linux
diff --git a/pki/linux/kra-ui/config-ext/build_linux_pki b/pki/dogtag/kra-ui/config-ext/build_linux_pki
index d9ea91e8c..d9ea91e8c 100755
--- a/pki/linux/kra-ui/config-ext/build_linux_pki
+++ b/pki/dogtag/kra-ui/config-ext/build_linux_pki
diff --git a/pki/linux/kra-ui/config/product.xml b/pki/dogtag/kra-ui/config/product.xml
index 33caf48ed..33caf48ed 100644
--- a/pki/linux/kra-ui/config/product.xml
+++ b/pki/dogtag/kra-ui/config/product.xml
diff --git a/pki/linux/kra-ui/config/release.xml b/pki/dogtag/kra-ui/config/release.xml
index fc43aaeb7..fc43aaeb7 100644
--- a/pki/linux/kra-ui/config/release.xml
+++ b/pki/dogtag/kra-ui/config/release.xml
diff --git a/pki/linux/kra-ui/pki-kra-ui.spec b/pki/dogtag/kra-ui/pki-kra-ui.spec
index 6c4266643..6c4266643 100644
--- a/pki/linux/kra-ui/pki-kra-ui.spec
+++ b/pki/dogtag/kra-ui/pki-kra-ui.spec
diff --git a/pki/linux/kra-ui/shared/webapps/kra/GenUnexpectedError.template b/pki/dogtag/kra-ui/shared/webapps/kra/GenUnexpectedError.template
index c69aaad1f..c69aaad1f 100644
--- a/pki/linux/kra-ui/shared/webapps/kra/GenUnexpectedError.template
+++ b/pki/dogtag/kra-ui/shared/webapps/kra/GenUnexpectedError.template
diff --git a/pki/linux/kra-ui/shared/webapps/kra/agent/GenError.template b/pki/dogtag/kra-ui/shared/webapps/kra/agent/GenError.template
index f0cca1ea8..f0cca1ea8 100644
--- a/pki/linux/kra-ui/shared/webapps/kra/agent/GenError.template
+++ b/pki/dogtag/kra-ui/shared/webapps/kra/agent/GenError.template
diff --git a/pki/linux/kra-ui/shared/webapps/kra/agent/GenPending.template b/pki/dogtag/kra-ui/shared/webapps/kra/agent/GenPending.template
index 0ff5f4383..0ff5f4383 100644
--- a/pki/linux/kra-ui/shared/webapps/kra/agent/GenPending.template
+++ b/pki/dogtag/kra-ui/shared/webapps/kra/agent/GenPending.template
diff --git a/pki/linux/kra-ui/shared/webapps/kra/agent/GenRejected.template b/pki/dogtag/kra-ui/shared/webapps/kra/agent/GenRejected.template
index a5dd68f49..a5dd68f49 100644
--- a/pki/linux/kra-ui/shared/webapps/kra/agent/GenRejected.template
+++ b/pki/dogtag/kra-ui/shared/webapps/kra/agent/GenRejected.template
diff --git a/pki/linux/kra-ui/shared/webapps/kra/agent/GenSuccess.template b/pki/dogtag/kra-ui/shared/webapps/kra/agent/GenSuccess.template
index 9a0ead814..9a0ead814 100644
--- a/pki/linux/kra-ui/shared/webapps/kra/agent/GenSuccess.template
+++ b/pki/dogtag/kra-ui/shared/webapps/kra/agent/GenSuccess.template
diff --git a/pki/linux/kra-ui/shared/webapps/kra/agent/GenSvcPending.template b/pki/dogtag/kra-ui/shared/webapps/kra/agent/GenSvcPending.template
index f639a39a9..f639a39a9 100644
--- a/pki/linux/kra-ui/shared/webapps/kra/agent/GenSvcPending.template
+++ b/pki/dogtag/kra-ui/shared/webapps/kra/agent/GenSvcPending.template
diff --git a/pki/linux/kra-ui/shared/webapps/kra/agent/GenUnauthorized.template b/pki/dogtag/kra-ui/shared/webapps/kra/agent/GenUnauthorized.template
index c29372843..c29372843 100644
--- a/pki/linux/kra-ui/shared/webapps/kra/agent/GenUnauthorized.template
+++ b/pki/dogtag/kra-ui/shared/webapps/kra/agent/GenUnauthorized.template
diff --git a/pki/linux/kra-ui/shared/webapps/kra/agent/GenUnexpectedError.template b/pki/dogtag/kra-ui/shared/webapps/kra/agent/GenUnexpectedError.template
index c69aaad1f..c69aaad1f 100644
--- a/pki/linux/kra-ui/shared/webapps/kra/agent/GenUnexpectedError.template
+++ b/pki/dogtag/kra-ui/shared/webapps/kra/agent/GenUnexpectedError.template
diff --git a/pki/linux/kra-ui/shared/webapps/kra/agent/cms-funcs.js b/pki/dogtag/kra-ui/shared/webapps/kra/agent/cms-funcs.js
index c8ffd51c7..c8ffd51c7 100644
--- a/pki/linux/kra-ui/shared/webapps/kra/agent/cms-funcs.js
+++ b/pki/dogtag/kra-ui/shared/webapps/kra/agent/cms-funcs.js
diff --git a/pki/linux/kra-ui/shared/webapps/kra/agent/funcs.js b/pki/dogtag/kra-ui/shared/webapps/kra/agent/funcs.js
index daef83d17..daef83d17 100644
--- a/pki/linux/kra-ui/shared/webapps/kra/agent/funcs.js
+++ b/pki/dogtag/kra-ui/shared/webapps/kra/agent/funcs.js
diff --git a/pki/linux/kra-ui/shared/webapps/kra/agent/graphics/dgLeftTab.gif b/pki/dogtag/kra-ui/shared/webapps/kra/agent/graphics/dgLeftTab.gif
index 35a76c859..35a76c859 100644
--- a/pki/linux/kra-ui/shared/webapps/kra/agent/graphics/dgLeftTab.gif
+++ b/pki/dogtag/kra-ui/shared/webapps/kra/agent/graphics/dgLeftTab.gif
diff --git a/pki/linux/kra-ui/shared/webapps/kra/agent/graphics/dgRightTab.gif b/pki/dogtag/kra-ui/shared/webapps/kra/agent/graphics/dgRightTab.gif
index a519bc759..a519bc759 100644
--- a/pki/linux/kra-ui/shared/webapps/kra/agent/graphics/dgRightTab.gif
+++ b/pki/dogtag/kra-ui/shared/webapps/kra/agent/graphics/dgRightTab.gif
diff --git a/pki/linux/kra-ui/shared/webapps/kra/agent/graphics/goto-tall.gif b/pki/dogtag/kra-ui/shared/webapps/kra/agent/graphics/goto-tall.gif
index 6eea3ef5c..6eea3ef5c 100644
--- a/pki/linux/kra-ui/shared/webapps/kra/agent/graphics/goto-tall.gif
+++ b/pki/dogtag/kra-ui/shared/webapps/kra/agent/graphics/goto-tall.gif
diff --git a/pki/linux/kra-ui/shared/webapps/kra/agent/graphics/graphics.tmp b/pki/dogtag/kra-ui/shared/webapps/kra/agent/graphics/graphics.tmp
index e69de29bb..e69de29bb 100644
--- a/pki/linux/kra-ui/shared/webapps/kra/agent/graphics/graphics.tmp
+++ b/pki/dogtag/kra-ui/shared/webapps/kra/agent/graphics/graphics.tmp
diff --git a/pki/linux/kra-ui/shared/webapps/kra/agent/graphics/gray90.gif b/pki/dogtag/kra-ui/shared/webapps/kra/agent/graphics/gray90.gif
index c6f811102..c6f811102 100644
--- a/pki/linux/kra-ui/shared/webapps/kra/agent/graphics/gray90.gif
+++ b/pki/dogtag/kra-ui/shared/webapps/kra/agent/graphics/gray90.gif
diff --git a/pki/linux/kra-ui/shared/webapps/kra/agent/graphics/hr.gif b/pki/dogtag/kra-ui/shared/webapps/kra/agent/graphics/hr.gif
index 14f8acf92..14f8acf92 100644
--- a/pki/linux/kra-ui/shared/webapps/kra/agent/graphics/hr.gif
+++ b/pki/dogtag/kra-ui/shared/webapps/kra/agent/graphics/hr.gif
diff --git a/pki/linux/kra-ui/shared/webapps/kra/agent/graphics/lgLeftTab.gif b/pki/dogtag/kra-ui/shared/webapps/kra/agent/graphics/lgLeftTab.gif
index a78fbc89d..a78fbc89d 100644
--- a/pki/linux/kra-ui/shared/webapps/kra/agent/graphics/lgLeftTab.gif
+++ b/pki/dogtag/kra-ui/shared/webapps/kra/agent/graphics/lgLeftTab.gif
diff --git a/pki/linux/kra-ui/shared/webapps/kra/agent/graphics/lgRightTab.gif b/pki/dogtag/kra-ui/shared/webapps/kra/agent/graphics/lgRightTab.gif
index 71852402d..71852402d 100644
--- a/pki/linux/kra-ui/shared/webapps/kra/agent/graphics/lgRightTab.gif
+++ b/pki/dogtag/kra-ui/shared/webapps/kra/agent/graphics/lgRightTab.gif
diff --git a/pki/linux/kra-ui/shared/webapps/kra/agent/graphics/spacer.gif b/pki/dogtag/kra-ui/shared/webapps/kra/agent/graphics/spacer.gif
index 13acffe53..13acffe53 100644
--- a/pki/linux/kra-ui/shared/webapps/kra/agent/graphics/spacer.gif
+++ b/pki/dogtag/kra-ui/shared/webapps/kra/agent/graphics/spacer.gif
diff --git a/pki/linux/kra-ui/shared/webapps/kra/agent/header.template b/pki/dogtag/kra-ui/shared/webapps/kra/agent/header.template
index d8d8c60a9..d8d8c60a9 100644
--- a/pki/linux/kra-ui/shared/webapps/kra/agent/header.template
+++ b/pki/dogtag/kra-ui/shared/webapps/kra/agent/header.template
diff --git a/pki/linux/kra-ui/shared/webapps/kra/agent/helpfun.js b/pki/dogtag/kra-ui/shared/webapps/kra/agent/helpfun.js
index 14a80bb95..14a80bb95 100644
--- a/pki/linux/kra-ui/shared/webapps/kra/agent/helpfun.js
+++ b/pki/dogtag/kra-ui/shared/webapps/kra/agent/helpfun.js
diff --git a/pki/linux/kra-ui/shared/webapps/kra/agent/index.html b/pki/dogtag/kra-ui/shared/webapps/kra/agent/index.html
index 620a83a45..620a83a45 100644
--- a/pki/linux/kra-ui/shared/webapps/kra/agent/index.html
+++ b/pki/dogtag/kra-ui/shared/webapps/kra/agent/index.html
diff --git a/pki/linux/kra-ui/shared/webapps/kra/agent/index.template b/pki/dogtag/kra-ui/shared/webapps/kra/agent/index.template
index 4995377d7..4995377d7 100644
--- a/pki/linux/kra-ui/shared/webapps/kra/agent/index.template
+++ b/pki/dogtag/kra-ui/shared/webapps/kra/agent/index.template
diff --git a/pki/linux/kra-ui/shared/webapps/kra/agent/kra/GrantRecovery.html b/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/GrantRecovery.html
index e293926d2..e293926d2 100644
--- a/pki/linux/kra-ui/shared/webapps/kra/agent/kra/GrantRecovery.html
+++ b/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/GrantRecovery.html
diff --git a/pki/linux/kra-ui/shared/webapps/kra/agent/kra/ListRequests.html b/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/ListRequests.html
index 55b74d89d..55b74d89d 100644
--- a/pki/linux/kra-ui/shared/webapps/kra/agent/kra/ListRequests.html
+++ b/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/ListRequests.html
diff --git a/pki/linux/kra-ui/shared/webapps/kra/agent/kra/SrchKey.html b/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/SrchKey.html
index d15f614b8..d15f614b8 100644
--- a/pki/linux/kra-ui/shared/webapps/kra/agent/kra/SrchKey.html
+++ b/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/SrchKey.html
diff --git a/pki/linux/kra-ui/shared/webapps/kra/agent/kra/SrchRecoverKey.html b/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/SrchRecoverKey.html
index acd3af3eb..acd3af3eb 100644
--- a/pki/linux/kra-ui/shared/webapps/kra/agent/kra/SrchRecoverKey.html
+++ b/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/SrchRecoverKey.html
diff --git a/pki/linux/kra-ui/shared/webapps/kra/agent/kra/blank.html b/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/blank.html
index d2c04a676..d2c04a676 100644
--- a/pki/linux/kra-ui/shared/webapps/kra/agent/kra/blank.html
+++ b/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/blank.html
diff --git a/pki/linux/kra-ui/shared/webapps/kra/agent/kra/confirmRecover.html b/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/confirmRecover.html
index 94df8b7f7..94df8b7f7 100644
--- a/pki/linux/kra-ui/shared/webapps/kra/agent/kra/confirmRecover.html
+++ b/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/confirmRecover.html
diff --git a/pki/linux/kra-ui/shared/webapps/kra/agent/kra/confirmRecoverBySerial.template b/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/confirmRecoverBySerial.template
index 88a8d5c84..88a8d5c84 100644
--- a/pki/linux/kra-ui/shared/webapps/kra/agent/kra/confirmRecoverBySerial.template
+++ b/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/confirmRecoverBySerial.template
diff --git a/pki/linux/kra-ui/shared/webapps/kra/agent/kra/displayBySerial.template b/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/displayBySerial.template
index 8cf799508..8cf799508 100644
--- a/pki/linux/kra-ui/shared/webapps/kra/agent/kra/displayBySerial.template
+++ b/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/displayBySerial.template
diff --git a/pki/linux/kra-ui/shared/webapps/kra/agent/kra/displayBySerial2.template b/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/displayBySerial2.template
index c38581da6..c38581da6 100644
--- a/pki/linux/kra-ui/shared/webapps/kra/agent/kra/displayBySerial2.template
+++ b/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/displayBySerial2.template
diff --git a/pki/linux/kra-ui/shared/webapps/kra/agent/kra/displayBySerialForRecovery.template b/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/displayBySerialForRecovery.template
index 6a6d272fd..6a6d272fd 100644
--- a/pki/linux/kra-ui/shared/webapps/kra/agent/kra/displayBySerialForRecovery.template
+++ b/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/displayBySerialForRecovery.template
diff --git a/pki/linux/kra-ui/shared/webapps/kra/agent/kra/examineRecovery.template b/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/examineRecovery.template
index d3bcd63cc..d3bcd63cc 100644
--- a/pki/linux/kra-ui/shared/webapps/kra/agent/kra/examineRecovery.template
+++ b/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/examineRecovery.template
diff --git a/pki/linux/kra-ui/shared/webapps/kra/agent/kra/finishRecovery.template b/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/finishRecovery.template
index e73a26237..e73a26237 100644
--- a/pki/linux/kra-ui/shared/webapps/kra/agent/kra/finishRecovery.template
+++ b/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/finishRecovery.template
diff --git a/pki/linux/kra-ui/shared/webapps/kra/agent/kra/frameGrant.html b/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/frameGrant.html
index 14b3ced02..14b3ced02 100644
--- a/pki/linux/kra-ui/shared/webapps/kra/agent/kra/frameGrant.html
+++ b/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/frameGrant.html
diff --git a/pki/linux/kra-ui/shared/webapps/kra/agent/kra/frameRecover.html b/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/frameRecover.html
index 60cd76f41..60cd76f41 100644
--- a/pki/linux/kra-ui/shared/webapps/kra/agent/kra/frameRecover.html
+++ b/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/frameRecover.html
diff --git a/pki/linux/kra-ui/shared/webapps/kra/agent/kra/frameRequest.html b/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/frameRequest.html
index ae544e34b..ae544e34b 100644
--- a/pki/linux/kra-ui/shared/webapps/kra/agent/kra/frameRequest.html
+++ b/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/frameRequest.html
diff --git a/pki/linux/kra-ui/shared/webapps/kra/agent/kra/frameSearch.html b/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/frameSearch.html
index a48fee2e6..a48fee2e6 100644
--- a/pki/linux/kra-ui/shared/webapps/kra/agent/kra/frameSearch.html
+++ b/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/frameSearch.html
diff --git a/pki/linux/kra-ui/shared/webapps/kra/agent/kra/frameStats.html b/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/frameStats.html
index 57a24de47..57a24de47 100644
--- a/pki/linux/kra-ui/shared/webapps/kra/agent/kra/frameStats.html
+++ b/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/frameStats.html
diff --git a/pki/linux/kra-ui/shared/webapps/kra/agent/kra/getApprovalStatus.template b/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/getApprovalStatus.template
index 5a6a1114a..5a6a1114a 100644
--- a/pki/linux/kra-ui/shared/webapps/kra/agent/kra/getApprovalStatus.template
+++ b/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/getApprovalStatus.template
diff --git a/pki/linux/kra-ui/shared/webapps/kra/agent/kra/getStats.template b/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/getStats.template
index e49bb2dea..e49bb2dea 100644
--- a/pki/linux/kra-ui/shared/webapps/kra/agent/kra/getStats.template
+++ b/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/getStats.template
diff --git a/pki/linux/kra-ui/shared/webapps/kra/agent/kra/grantRecovery.template b/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/grantRecovery.template
index 906da8338..906da8338 100644
--- a/pki/linux/kra-ui/shared/webapps/kra/agent/kra/grantRecovery.template
+++ b/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/grantRecovery.template
diff --git a/pki/linux/kra-ui/shared/webapps/kra/agent/kra/index.html b/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/index.html
index 8a87873c2..8a87873c2 100644
--- a/pki/linux/kra-ui/shared/webapps/kra/agent/kra/index.html
+++ b/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/index.html
diff --git a/pki/linux/kra-ui/shared/webapps/kra/agent/kra/menuCheck.html b/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/menuCheck.html
index 0787f104c..0787f104c 100644
--- a/pki/linux/kra-ui/shared/webapps/kra/agent/kra/menuCheck.html
+++ b/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/menuCheck.html
diff --git a/pki/linux/kra-ui/shared/webapps/kra/agent/kra/menuGrant.html b/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/menuGrant.html
index 594dfaf06..594dfaf06 100644
--- a/pki/linux/kra-ui/shared/webapps/kra/agent/kra/menuGrant.html
+++ b/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/menuGrant.html
diff --git a/pki/linux/kra-ui/shared/webapps/kra/agent/kra/menuRecover.html b/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/menuRecover.html
index 1439917d4..1439917d4 100644
--- a/pki/linux/kra-ui/shared/webapps/kra/agent/kra/menuRecover.html
+++ b/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/menuRecover.html
diff --git a/pki/linux/kra-ui/shared/webapps/kra/agent/kra/menuRequest.html b/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/menuRequest.html
index 69a5300a6..69a5300a6 100644
--- a/pki/linux/kra-ui/shared/webapps/kra/agent/kra/menuRequest.html
+++ b/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/menuRequest.html
diff --git a/pki/linux/kra-ui/shared/webapps/kra/agent/kra/menuSearch.html b/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/menuSearch.html
index e3f23d53f..e3f23d53f 100644
--- a/pki/linux/kra-ui/shared/webapps/kra/agent/kra/menuSearch.html
+++ b/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/menuSearch.html
diff --git a/pki/linux/kra-ui/shared/webapps/kra/agent/kra/menuStats.html b/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/menuStats.html
index 2d132b185..2d132b185 100644
--- a/pki/linux/kra-ui/shared/webapps/kra/agent/kra/menuStats.html
+++ b/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/menuStats.html
diff --git a/pki/linux/kra-ui/shared/webapps/kra/agent/kra/monitor.html b/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/monitor.html
index bfe1599d2..bfe1599d2 100644
--- a/pki/linux/kra-ui/shared/webapps/kra/agent/kra/monitor.html
+++ b/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/monitor.html
diff --git a/pki/linux/kra-ui/shared/webapps/kra/agent/kra/monitor.template b/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/monitor.template
index 27fa7f84a..27fa7f84a 100644
--- a/pki/linux/kra-ui/shared/webapps/kra/agent/kra/monitor.template
+++ b/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/monitor.template
diff --git a/pki/linux/kra-ui/shared/webapps/kra/agent/kra/processReq.template b/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/processReq.template
index 93cc4ddd3..93cc4ddd3 100644
--- a/pki/linux/kra-ui/shared/webapps/kra/agent/kra/processReq.template
+++ b/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/processReq.template
diff --git a/pki/linux/kra-ui/shared/webapps/kra/agent/kra/queryKey.template b/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/queryKey.template
index 10651232b..10651232b 100644
--- a/pki/linux/kra-ui/shared/webapps/kra/agent/kra/queryKey.template
+++ b/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/queryKey.template
diff --git a/pki/linux/kra-ui/shared/webapps/kra/agent/kra/queryKeyForRecovery.template b/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/queryKeyForRecovery.template
index 6a10e8550..6a10e8550 100644
--- a/pki/linux/kra-ui/shared/webapps/kra/agent/kra/queryKeyForRecovery.template
+++ b/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/queryKeyForRecovery.template
diff --git a/pki/linux/kra-ui/shared/webapps/kra/agent/kra/queryReq.template b/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/queryReq.template
index 5cd3a32e7..5cd3a32e7 100644
--- a/pki/linux/kra-ui/shared/webapps/kra/agent/kra/queryReq.template
+++ b/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/queryReq.template
diff --git a/pki/linux/kra-ui/shared/webapps/kra/agent/kra/recoverBySerial.template b/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/recoverBySerial.template
index 7ec7a5a3f..7ec7a5a3f 100644
--- a/pki/linux/kra-ui/shared/webapps/kra/agent/kra/recoverBySerial.template
+++ b/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/recoverBySerial.template
diff --git a/pki/linux/kra-ui/shared/webapps/kra/agent/kra/srchKey.template b/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/srchKey.template
index ffb727707..ffb727707 100644
--- a/pki/linux/kra-ui/shared/webapps/kra/agent/kra/srchKey.template
+++ b/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/srchKey.template
diff --git a/pki/linux/kra-ui/shared/webapps/kra/agent/kra/srchKeyForRecovery.template b/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/srchKeyForRecovery.template
index fd3ca070d..fd3ca070d 100644
--- a/pki/linux/kra-ui/shared/webapps/kra/agent/kra/srchKeyForRecovery.template
+++ b/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/srchKeyForRecovery.template
diff --git a/pki/linux/kra-ui/shared/webapps/kra/agent/kra/top.html b/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/top.html
index 579eaff1a..579eaff1a 100644
--- a/pki/linux/kra-ui/shared/webapps/kra/agent/kra/top.html
+++ b/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/top.html
diff --git a/pki/linux/kra-ui/shared/webapps/kra/services.template b/pki/dogtag/kra-ui/shared/webapps/kra/services.template
index 0f326e0df..0f326e0df 100644
--- a/pki/linux/kra-ui/shared/webapps/kra/services.template
+++ b/pki/dogtag/kra-ui/shared/webapps/kra/services.template
diff --git a/pki/linux/kra/build_linux b/pki/dogtag/kra/build_linux
index 016383c11..016383c11 100755
--- a/pki/linux/kra/build_linux
+++ b/pki/dogtag/kra/build_linux
diff --git a/pki/linux/kra/config-ext/build_linux_pki b/pki/dogtag/kra/config-ext/build_linux_pki
index d9ea91e8c..d9ea91e8c 100755
--- a/pki/linux/kra/config-ext/build_linux_pki
+++ b/pki/dogtag/kra/config-ext/build_linux_pki
diff --git a/pki/linux/kra/config/product.xml b/pki/dogtag/kra/config/product.xml
index 33caf48ed..33caf48ed 100644
--- a/pki/linux/kra/config/product.xml
+++ b/pki/dogtag/kra/config/product.xml
diff --git a/pki/linux/kra/config/release.xml b/pki/dogtag/kra/config/release.xml
index fc43aaeb7..fc43aaeb7 100644
--- a/pki/linux/kra/config/release.xml
+++ b/pki/dogtag/kra/config/release.xml
diff --git a/pki/linux/kra/pki-kra.spec b/pki/dogtag/kra/pki-kra.spec
index b2ead06d5..b2ead06d5 100644
--- a/pki/linux/kra/pki-kra.spec
+++ b/pki/dogtag/kra/pki-kra.spec
diff --git a/pki/linux/manage/build_linux b/pki/dogtag/manage/build_linux
index 4e79895db..4e79895db 100755
--- a/pki/linux/manage/build_linux
+++ b/pki/dogtag/manage/build_linux
diff --git a/pki/linux/manage/config-ext/build_linux_pki b/pki/dogtag/manage/config-ext/build_linux_pki
index d9ea91e8c..d9ea91e8c 100755
--- a/pki/linux/manage/config-ext/build_linux_pki
+++ b/pki/dogtag/manage/config-ext/build_linux_pki
diff --git a/pki/linux/manage/config/product.xml b/pki/dogtag/manage/config/product.xml
index 33caf48ed..33caf48ed 100644
--- a/pki/linux/manage/config/product.xml
+++ b/pki/dogtag/manage/config/product.xml
diff --git a/pki/linux/manage/config/release.xml b/pki/dogtag/manage/config/release.xml
index fc43aaeb7..fc43aaeb7 100644
--- a/pki/linux/manage/config/release.xml
+++ b/pki/dogtag/manage/config/release.xml
diff --git a/pki/linux/manage/pki-manage.spec b/pki/dogtag/manage/pki-manage.spec
index ceb21c6be..ceb21c6be 100644
--- a/pki/linux/manage/pki-manage.spec
+++ b/pki/dogtag/manage/pki-manage.spec
diff --git a/pki/linux/migrate/build_linux b/pki/dogtag/migrate/build_linux
index 4bc21a648..4bc21a648 100755
--- a/pki/linux/migrate/build_linux
+++ b/pki/dogtag/migrate/build_linux
diff --git a/pki/linux/migrate/config-ext/build_linux_pki b/pki/dogtag/migrate/config-ext/build_linux_pki
index d9ea91e8c..d9ea91e8c 100755
--- a/pki/linux/migrate/config-ext/build_linux_pki
+++ b/pki/dogtag/migrate/config-ext/build_linux_pki
diff --git a/pki/linux/migrate/config/product.xml b/pki/dogtag/migrate/config/product.xml
index 33caf48ed..33caf48ed 100644
--- a/pki/linux/migrate/config/product.xml
+++ b/pki/dogtag/migrate/config/product.xml
diff --git a/pki/linux/migrate/config/release.xml b/pki/dogtag/migrate/config/release.xml
index fc43aaeb7..fc43aaeb7 100644
--- a/pki/linux/migrate/config/release.xml
+++ b/pki/dogtag/migrate/config/release.xml
diff --git a/pki/linux/migrate/pki-migrate.spec b/pki/dogtag/migrate/pki-migrate.spec
index e20c418a7..e20c418a7 100644
--- a/pki/linux/migrate/pki-migrate.spec
+++ b/pki/dogtag/migrate/pki-migrate.spec
diff --git a/pki/linux/native-tools/build_linux b/pki/dogtag/native-tools/build_linux
index 65861b388..65861b388 100755
--- a/pki/linux/native-tools/build_linux
+++ b/pki/dogtag/native-tools/build_linux
diff --git a/pki/linux/native-tools/config-ext/build_linux_pki b/pki/dogtag/native-tools/config-ext/build_linux_pki
index d9ea91e8c..d9ea91e8c 100755
--- a/pki/linux/native-tools/config-ext/build_linux_pki
+++ b/pki/dogtag/native-tools/config-ext/build_linux_pki
diff --git a/pki/linux/native-tools/config/product.xml b/pki/dogtag/native-tools/config/product.xml
index 33caf48ed..33caf48ed 100644
--- a/pki/linux/native-tools/config/product.xml
+++ b/pki/dogtag/native-tools/config/product.xml
diff --git a/pki/linux/native-tools/config/release.xml b/pki/dogtag/native-tools/config/release.xml
index fc43aaeb7..fc43aaeb7 100644
--- a/pki/linux/native-tools/config/release.xml
+++ b/pki/dogtag/native-tools/config/release.xml
diff --git a/pki/linux/native-tools/pki-native-tools.spec b/pki/dogtag/native-tools/pki-native-tools.spec
index 1a5bf7f1c..1a5bf7f1c 100644
--- a/pki/linux/native-tools/pki-native-tools.spec
+++ b/pki/dogtag/native-tools/pki-native-tools.spec
diff --git a/pki/linux/ocsp-ui/LICENSE b/pki/dogtag/ocsp-ui/LICENSE
index e36f2269a..e36f2269a 100644
--- a/pki/linux/ocsp-ui/LICENSE
+++ b/pki/dogtag/ocsp-ui/LICENSE
diff --git a/pki/linux/ocsp-ui/build.xml b/pki/dogtag/ocsp-ui/build.xml
index 42a303182..42a303182 100644
--- a/pki/linux/ocsp-ui/build.xml
+++ b/pki/dogtag/ocsp-ui/build.xml
diff --git a/pki/linux/ocsp-ui/build_linux b/pki/dogtag/ocsp-ui/build_linux
index 8b4629672..8b4629672 100755
--- a/pki/linux/ocsp-ui/build_linux
+++ b/pki/dogtag/ocsp-ui/build_linux
diff --git a/pki/linux/ocsp-ui/config-ext/build_linux_pki b/pki/dogtag/ocsp-ui/config-ext/build_linux_pki
index d9ea91e8c..d9ea91e8c 100755
--- a/pki/linux/ocsp-ui/config-ext/build_linux_pki
+++ b/pki/dogtag/ocsp-ui/config-ext/build_linux_pki
diff --git a/pki/linux/ocsp-ui/config/product.xml b/pki/dogtag/ocsp-ui/config/product.xml
index 33caf48ed..33caf48ed 100644
--- a/pki/linux/ocsp-ui/config/product.xml
+++ b/pki/dogtag/ocsp-ui/config/product.xml
diff --git a/pki/linux/ocsp-ui/config/release.xml b/pki/dogtag/ocsp-ui/config/release.xml
index fc43aaeb7..fc43aaeb7 100644
--- a/pki/linux/ocsp-ui/config/release.xml
+++ b/pki/dogtag/ocsp-ui/config/release.xml
diff --git a/pki/linux/ocsp-ui/pki-ocsp-ui.spec b/pki/dogtag/ocsp-ui/pki-ocsp-ui.spec
index f7568817e..f7568817e 100644
--- a/pki/linux/ocsp-ui/pki-ocsp-ui.spec
+++ b/pki/dogtag/ocsp-ui/pki-ocsp-ui.spec
diff --git a/pki/linux/ocsp-ui/shared/webapps/ROOT/WEB-INF/web.xml b/pki/dogtag/ocsp-ui/shared/webapps/ROOT/WEB-INF/web.xml
index ed274862b..ed274862b 100644
--- a/pki/linux/ocsp-ui/shared/webapps/ROOT/WEB-INF/web.xml
+++ b/pki/dogtag/ocsp-ui/shared/webapps/ROOT/WEB-INF/web.xml
diff --git a/pki/linux/ocsp-ui/shared/webapps/ROOT/index.html b/pki/dogtag/ocsp-ui/shared/webapps/ROOT/index.html
index 4ebf3fe5f..4ebf3fe5f 100644
--- a/pki/linux/ocsp-ui/shared/webapps/ROOT/index.html
+++ b/pki/dogtag/ocsp-ui/shared/webapps/ROOT/index.html
diff --git a/pki/linux/ocsp-ui/shared/webapps/ROOT/index.jsp b/pki/dogtag/ocsp-ui/shared/webapps/ROOT/index.jsp
index d3a2276bd..d3a2276bd 100644
--- a/pki/linux/ocsp-ui/shared/webapps/ROOT/index.jsp
+++ b/pki/dogtag/ocsp-ui/shared/webapps/ROOT/index.jsp
diff --git a/pki/linux/ocsp-ui/shared/webapps/ocsp/GenUnexpectedError.template b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/GenUnexpectedError.template
index c69aaad1f..c69aaad1f 100644
--- a/pki/linux/ocsp-ui/shared/webapps/ocsp/GenUnexpectedError.template
+++ b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/GenUnexpectedError.template
diff --git a/pki/linux/ocsp-ui/shared/webapps/ocsp/WEB-INF/velocity.properties b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/WEB-INF/velocity.properties
index e956f52e8..e956f52e8 100644
--- a/pki/linux/ocsp-ui/shared/webapps/ocsp/WEB-INF/velocity.properties
+++ b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/WEB-INF/velocity.properties
diff --git a/pki/linux/ocsp-ui/shared/webapps/ocsp/WEB-INF/web.xml b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/WEB-INF/web.xml
index 5f15c3d0a..5f15c3d0a 100644
--- a/pki/linux/ocsp-ui/shared/webapps/ocsp/WEB-INF/web.xml
+++ b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/WEB-INF/web.xml
diff --git a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/GenError.template b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenError.template
index f0cca1ea8..f0cca1ea8 100644
--- a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/GenError.template
+++ b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenError.template
diff --git a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/GenPending.template b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenPending.template
index 0ff5f4383..0ff5f4383 100644
--- a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/GenPending.template
+++ b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenPending.template
diff --git a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/GenRejected.template b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenRejected.template
index a5dd68f49..a5dd68f49 100644
--- a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/GenRejected.template
+++ b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenRejected.template
diff --git a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/GenSuccess.template b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenSuccess.template
index 9a0ead814..9a0ead814 100644
--- a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/GenSuccess.template
+++ b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenSuccess.template
diff --git a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/GenSvcPending.template b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenSvcPending.template
index f639a39a9..f639a39a9 100644
--- a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/GenSvcPending.template
+++ b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenSvcPending.template
diff --git a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/GenUnauthorized.template b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenUnauthorized.template
index c29372843..c29372843 100644
--- a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/GenUnauthorized.template
+++ b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenUnauthorized.template
diff --git a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/GenUnexpectedError.template b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenUnexpectedError.template
index c69aaad1f..c69aaad1f 100644
--- a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/GenUnexpectedError.template
+++ b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenUnexpectedError.template
diff --git a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/cms-funcs.js b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/cms-funcs.js
index 473fb1795..473fb1795 100644
--- a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/cms-funcs.js
+++ b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/cms-funcs.js
diff --git a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/funcs.js b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/funcs.js
index daef83d17..daef83d17 100644
--- a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/funcs.js
+++ b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/funcs.js
diff --git a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/graphics/dgLeftTab.gif b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/graphics/dgLeftTab.gif
index 35a76c859..35a76c859 100644
--- a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/graphics/dgLeftTab.gif
+++ b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/graphics/dgLeftTab.gif
diff --git a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/graphics/dgRightTab.gif b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/graphics/dgRightTab.gif
index a519bc759..a519bc759 100644
--- a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/graphics/dgRightTab.gif
+++ b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/graphics/dgRightTab.gif
diff --git a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/graphics/goto-tall.gif b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/graphics/goto-tall.gif
index 6eea3ef5c..6eea3ef5c 100644
--- a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/graphics/goto-tall.gif
+++ b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/graphics/goto-tall.gif
diff --git a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/graphics/graphics.tmp b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/graphics/graphics.tmp
index e69de29bb..e69de29bb 100644
--- a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/graphics/graphics.tmp
+++ b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/graphics/graphics.tmp
diff --git a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/graphics/gray90.gif b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/graphics/gray90.gif
index c6f811102..c6f811102 100644
--- a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/graphics/gray90.gif
+++ b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/graphics/gray90.gif
diff --git a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/graphics/hr.gif b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/graphics/hr.gif
index 14f8acf92..14f8acf92 100644
--- a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/graphics/hr.gif
+++ b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/graphics/hr.gif
diff --git a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/graphics/lgLeftTab.gif b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/graphics/lgLeftTab.gif
index a78fbc89d..a78fbc89d 100644
--- a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/graphics/lgLeftTab.gif
+++ b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/graphics/lgLeftTab.gif
diff --git a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/graphics/lgRightTab.gif b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/graphics/lgRightTab.gif
index 71852402d..71852402d 100644
--- a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/graphics/lgRightTab.gif
+++ b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/graphics/lgRightTab.gif
diff --git a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/graphics/spacer.gif b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/graphics/spacer.gif
index 13acffe53..13acffe53 100644
--- a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/graphics/spacer.gif
+++ b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/graphics/spacer.gif
diff --git a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/header.template b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/header.template
index 4396a67bb..4396a67bb 100644
--- a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/header.template
+++ b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/header.template
diff --git a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/helpfun.js b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/helpfun.js
index 14a80bb95..14a80bb95 100644
--- a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/helpfun.js
+++ b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/helpfun.js
diff --git a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/index.html b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/index.html
index d9873116c..d9873116c 100644
--- a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/index.html
+++ b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/index.html
diff --git a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/index.template b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/index.template
index 4995377d7..4995377d7 100644
--- a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/index.template
+++ b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/index.template
diff --git a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/AddCA.html b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/AddCA.html
index b221f10e8..b221f10e8 100644
--- a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/AddCA.html
+++ b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/AddCA.html
diff --git a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/AddCRL.html b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/AddCRL.html
index 97e6b8978..97e6b8978 100644
--- a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/AddCRL.html
+++ b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/AddCRL.html
diff --git a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/CheckCert.html b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/CheckCert.html
index 03e706e3a..03e706e3a 100644
--- a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/CheckCert.html
+++ b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/CheckCert.html
diff --git a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/addCA.template b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/addCA.template
index 8ce61e83b..8ce61e83b 100644
--- a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/addCA.template
+++ b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/addCA.template
diff --git a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/addCRL.template b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/addCRL.template
index a7e160418..a7e160418 100644
--- a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/addCRL.template
+++ b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/addCRL.template
diff --git a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/checkCert.template b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/checkCert.template
index b9cffede1..b9cffede1 100644
--- a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/checkCert.template
+++ b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/checkCert.template
diff --git a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/frameAddCA.html b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/frameAddCA.html
index afb888caf..afb888caf 100644
--- a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/frameAddCA.html
+++ b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/frameAddCA.html
diff --git a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/frameAddCRL.html b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/frameAddCRL.html
index 28be03545..28be03545 100644
--- a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/frameAddCRL.html
+++ b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/frameAddCRL.html
diff --git a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/frameCheckCert.html b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/frameCheckCert.html
index 21335c8a0..21335c8a0 100644
--- a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/frameCheckCert.html
+++ b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/frameCheckCert.html
diff --git a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/frameListCA.html b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/frameListCA.html
index 90530fd42..90530fd42 100644
--- a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/frameListCA.html
+++ b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/frameListCA.html
diff --git a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/frameOCSP.html b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/frameOCSP.html
index 00fad0f36..00fad0f36 100644
--- a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/frameOCSP.html
+++ b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/frameOCSP.html
diff --git a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/frameStats.html b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/frameStats.html
index 8efa27a78..8efa27a78 100644
--- a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/frameStats.html
+++ b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/frameStats.html
diff --git a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/getOCSPInfo.template b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/getOCSPInfo.template
index 4cbf9f714..4cbf9f714 100644
--- a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/getOCSPInfo.template
+++ b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/getOCSPInfo.template
diff --git a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/getStats.template b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/getStats.template
index c6f56b1f7..c6f56b1f7 100644
--- a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/getStats.template
+++ b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/getStats.template
diff --git a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/index.html b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/index.html
index 2736b25cb..2736b25cb 100644
--- a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/index.html
+++ b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/index.html
diff --git a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/listCAs.template b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/listCAs.template
index 1cccf9e08..1cccf9e08 100644
--- a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/listCAs.template
+++ b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/listCAs.template
diff --git a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/menuAddCA.html b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/menuAddCA.html
index 6b4419f78..6b4419f78 100644
--- a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/menuAddCA.html
+++ b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/menuAddCA.html
diff --git a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/menuAddCRL.html b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/menuAddCRL.html
index 7da3025e3..7da3025e3 100644
--- a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/menuAddCRL.html
+++ b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/menuAddCRL.html
diff --git a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/menuCheckCert.html b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/menuCheckCert.html
index 2e4773a28..2e4773a28 100644
--- a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/menuCheckCert.html
+++ b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/menuCheckCert.html
diff --git a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/menuListCA.html b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/menuListCA.html
index ac99b752a..ac99b752a 100644
--- a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/menuListCA.html
+++ b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/menuListCA.html
diff --git a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/menuOCSP.html b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/menuOCSP.html
index b019fe81f..b019fe81f 100644
--- a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/menuOCSP.html
+++ b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/menuOCSP.html
diff --git a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/menuStats.html b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/menuStats.html
index f86dd059e..f86dd059e 100644
--- a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ocsp/menuStats.html
+++ b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/menuStats.html
diff --git a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ports.template b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ports.template
index d2bd028aa..d2bd028aa 100644
--- a/pki/linux/ocsp-ui/shared/webapps/ocsp/agent/ports.template
+++ b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ports.template
diff --git a/pki/linux/ocsp-ui/shared/webapps/ocsp/services.template b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/services.template
index 0f326e0df..0f326e0df 100644
--- a/pki/linux/ocsp-ui/shared/webapps/ocsp/services.template
+++ b/pki/dogtag/ocsp-ui/shared/webapps/ocsp/services.template
diff --git a/pki/linux/ocsp/build_linux b/pki/dogtag/ocsp/build_linux
index 698dde47c..698dde47c 100755
--- a/pki/linux/ocsp/build_linux
+++ b/pki/dogtag/ocsp/build_linux
diff --git a/pki/linux/ocsp/config-ext/build_linux_pki b/pki/dogtag/ocsp/config-ext/build_linux_pki
index d9ea91e8c..d9ea91e8c 100755
--- a/pki/linux/ocsp/config-ext/build_linux_pki
+++ b/pki/dogtag/ocsp/config-ext/build_linux_pki
diff --git a/pki/linux/ocsp/config/product.xml b/pki/dogtag/ocsp/config/product.xml
index 33caf48ed..33caf48ed 100644
--- a/pki/linux/ocsp/config/product.xml
+++ b/pki/dogtag/ocsp/config/product.xml
diff --git a/pki/linux/ocsp/config/release.xml b/pki/dogtag/ocsp/config/release.xml
index fc43aaeb7..fc43aaeb7 100644
--- a/pki/linux/ocsp/config/release.xml
+++ b/pki/dogtag/ocsp/config/release.xml
diff --git a/pki/linux/ocsp/pki-ocsp.spec b/pki/dogtag/ocsp/pki-ocsp.spec
index 9b615fe52..9b615fe52 100644
--- a/pki/linux/ocsp/pki-ocsp.spec
+++ b/pki/dogtag/ocsp/pki-ocsp.spec
diff --git a/pki/linux/osutil/build_linux b/pki/dogtag/osutil/build_linux
index 2f98316d8..2f98316d8 100755
--- a/pki/linux/osutil/build_linux
+++ b/pki/dogtag/osutil/build_linux
diff --git a/pki/linux/osutil/config-ext/build_linux_pki b/pki/dogtag/osutil/config-ext/build_linux_pki
index d9ea91e8c..d9ea91e8c 100755
--- a/pki/linux/osutil/config-ext/build_linux_pki
+++ b/pki/dogtag/osutil/config-ext/build_linux_pki
diff --git a/pki/linux/osutil/config/product.xml b/pki/dogtag/osutil/config/product.xml
index 33caf48ed..33caf48ed 100644
--- a/pki/linux/osutil/config/product.xml
+++ b/pki/dogtag/osutil/config/product.xml
diff --git a/pki/linux/osutil/config/release.xml b/pki/dogtag/osutil/config/release.xml
index fc43aaeb7..fc43aaeb7 100644
--- a/pki/linux/osutil/config/release.xml
+++ b/pki/dogtag/osutil/config/release.xml
diff --git a/pki/linux/osutil/osutil.spec b/pki/dogtag/osutil/osutil.spec
index 79bafaabd..79bafaabd 100644
--- a/pki/linux/osutil/osutil.spec
+++ b/pki/dogtag/osutil/osutil.spec
diff --git a/pki/linux/ra-ui/LICENSE b/pki/dogtag/ra-ui/LICENSE
index e36f2269a..e36f2269a 100644
--- a/pki/linux/ra-ui/LICENSE
+++ b/pki/dogtag/ra-ui/LICENSE
diff --git a/pki/linux/ra-ui/build.xml b/pki/dogtag/ra-ui/build.xml
index bdaaf6781..bdaaf6781 100644
--- a/pki/linux/ra-ui/build.xml
+++ b/pki/dogtag/ra-ui/build.xml
diff --git a/pki/linux/ra-ui/build_linux b/pki/dogtag/ra-ui/build_linux
index f330d94fb..f330d94fb 100755
--- a/pki/linux/ra-ui/build_linux
+++ b/pki/dogtag/ra-ui/build_linux
diff --git a/pki/linux/ra-ui/config-ext/build_linux_pki b/pki/dogtag/ra-ui/config-ext/build_linux_pki
index d9ea91e8c..d9ea91e8c 100755
--- a/pki/linux/ra-ui/config-ext/build_linux_pki
+++ b/pki/dogtag/ra-ui/config-ext/build_linux_pki
diff --git a/pki/linux/ra-ui/config/product.xml b/pki/dogtag/ra-ui/config/product.xml
index 33caf48ed..33caf48ed 100644
--- a/pki/linux/ra-ui/config/product.xml
+++ b/pki/dogtag/ra-ui/config/product.xml
diff --git a/pki/linux/ra-ui/config/release.xml b/pki/dogtag/ra-ui/config/release.xml
index fc43aaeb7..fc43aaeb7 100644
--- a/pki/linux/ra-ui/config/release.xml
+++ b/pki/dogtag/ra-ui/config/release.xml
diff --git a/pki/linux/ra-ui/pki-ra-ui.spec b/pki/dogtag/ra-ui/pki-ra-ui.spec
index 840f1d937..840f1d937 100644
--- a/pki/linux/ra-ui/pki-ra-ui.spec
+++ b/pki/dogtag/ra-ui/pki-ra-ui.spec
diff --git a/pki/linux/ra-ui/shared/docroot/admin/group/add_new.vm b/pki/dogtag/ra-ui/shared/docroot/admin/group/add_new.vm
index ddb6ba3a2..ddb6ba3a2 100644
--- a/pki/linux/ra-ui/shared/docroot/admin/group/add_new.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/admin/group/add_new.vm
diff --git a/pki/linux/ra-ui/shared/docroot/admin/group/index.vm b/pki/dogtag/ra-ui/shared/docroot/admin/group/index.vm
index a998972a9..a998972a9 100644
--- a/pki/linux/ra-ui/shared/docroot/admin/group/index.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/admin/group/index.vm
diff --git a/pki/linux/ra-ui/shared/docroot/admin/group/read.vm b/pki/dogtag/ra-ui/shared/docroot/admin/group/read.vm
index db7919440..db7919440 100644
--- a/pki/linux/ra-ui/shared/docroot/admin/group/read.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/admin/group/read.vm
diff --git a/pki/linux/ra-ui/shared/docroot/admin/index.vm b/pki/dogtag/ra-ui/shared/docroot/admin/index.vm
index 849b1d0e9..849b1d0e9 100644
--- a/pki/linux/ra-ui/shared/docroot/admin/index.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/admin/index.vm
diff --git a/pki/linux/ra-ui/shared/docroot/admin/user/add_new.vm b/pki/dogtag/ra-ui/shared/docroot/admin/user/add_new.vm
index 29f06d3be..29f06d3be 100644
--- a/pki/linux/ra-ui/shared/docroot/admin/user/add_new.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/admin/user/add_new.vm
diff --git a/pki/linux/ra-ui/shared/docroot/admin/user/index.vm b/pki/dogtag/ra-ui/shared/docroot/admin/user/index.vm
index a1b46afda..a1b46afda 100644
--- a/pki/linux/ra-ui/shared/docroot/admin/user/index.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/admin/user/index.vm
diff --git a/pki/linux/ra-ui/shared/docroot/admin/user/read.vm b/pki/dogtag/ra-ui/shared/docroot/admin/user/read.vm
index 64853c669..64853c669 100644
--- a/pki/linux/ra-ui/shared/docroot/admin/user/read.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/admin/user/read.vm
diff --git a/pki/linux/ra-ui/shared/docroot/agent/cert/index.vm b/pki/dogtag/ra-ui/shared/docroot/agent/cert/index.vm
index a3d4333e7..a3d4333e7 100644
--- a/pki/linux/ra-ui/shared/docroot/agent/cert/index.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/agent/cert/index.vm
diff --git a/pki/linux/ra-ui/shared/docroot/agent/cert/read.vm b/pki/dogtag/ra-ui/shared/docroot/agent/cert/read.vm
index c92133d7e..c92133d7e 100644
--- a/pki/linux/ra-ui/shared/docroot/agent/cert/read.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/agent/cert/read.vm
diff --git a/pki/linux/ra-ui/shared/docroot/agent/cert/revoke.vm b/pki/dogtag/ra-ui/shared/docroot/agent/cert/revoke.vm
index 1ec24c026..1ec24c026 100644
--- a/pki/linux/ra-ui/shared/docroot/agent/cert/revoke.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/agent/cert/revoke.vm
diff --git a/pki/linux/ra-ui/shared/docroot/agent/cert/submit.vm b/pki/dogtag/ra-ui/shared/docroot/agent/cert/submit.vm
index 243f2f3a6..243f2f3a6 100644
--- a/pki/linux/ra-ui/shared/docroot/agent/cert/submit.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/agent/cert/submit.vm
diff --git a/pki/linux/ra-ui/shared/docroot/agent/error.vm b/pki/dogtag/ra-ui/shared/docroot/agent/error.vm
index 342ebc03c..342ebc03c 100644
--- a/pki/linux/ra-ui/shared/docroot/agent/error.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/agent/error.vm
diff --git a/pki/linux/ra-ui/shared/docroot/agent/index.vm b/pki/dogtag/ra-ui/shared/docroot/agent/index.vm
index a0fd902c7..a0fd902c7 100644
--- a/pki/linux/ra-ui/shared/docroot/agent/index.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/agent/index.vm
diff --git a/pki/linux/ra-ui/shared/docroot/agent/request/index.vm b/pki/dogtag/ra-ui/shared/docroot/agent/request/index.vm
index e6d254fc9..e6d254fc9 100644
--- a/pki/linux/ra-ui/shared/docroot/agent/request/index.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/agent/request/index.vm
diff --git a/pki/linux/ra-ui/shared/docroot/agent/request/op.vm b/pki/dogtag/ra-ui/shared/docroot/agent/request/op.vm
index 804e55d22..804e55d22 100644
--- a/pki/linux/ra-ui/shared/docroot/agent/request/op.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/agent/request/op.vm
diff --git a/pki/linux/ra-ui/shared/docroot/agent/request/read.vm b/pki/dogtag/ra-ui/shared/docroot/agent/request/read.vm
index d363c05ec..d363c05ec 100644
--- a/pki/linux/ra-ui/shared/docroot/agent/request/read.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/agent/request/read.vm
diff --git a/pki/linux/ra-ui/shared/docroot/css/pki-360.css b/pki/dogtag/ra-ui/shared/docroot/css/pki-360.css
index 28e2d55b7..28e2d55b7 100644
--- a/pki/linux/ra-ui/shared/docroot/css/pki-360.css
+++ b/pki/dogtag/ra-ui/shared/docroot/css/pki-360.css
diff --git a/pki/linux/ra-ui/shared/docroot/css/pki-base.css b/pki/dogtag/ra-ui/shared/docroot/css/pki-base.css
index 8df1389d3..8df1389d3 100644
--- a/pki/linux/ra-ui/shared/docroot/css/pki-base.css
+++ b/pki/dogtag/ra-ui/shared/docroot/css/pki-base.css
diff --git a/pki/linux/ra-ui/shared/docroot/css/pki.css b/pki/dogtag/ra-ui/shared/docroot/css/pki.css
index 2a5a15f67..2a5a15f67 100644
--- a/pki/linux/ra-ui/shared/docroot/css/pki.css
+++ b/pki/dogtag/ra-ui/shared/docroot/css/pki.css
diff --git a/pki/linux/ra-ui/shared/docroot/ee/agent/enroll.vm b/pki/dogtag/ra-ui/shared/docroot/ee/agent/enroll.vm
index 9838e8672..9838e8672 100644
--- a/pki/linux/ra-ui/shared/docroot/ee/agent/enroll.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ee/agent/enroll.vm
diff --git a/pki/linux/ra-ui/shared/docroot/ee/agent/index.vm b/pki/dogtag/ra-ui/shared/docroot/ee/agent/index.vm
index 03eb069bc..03eb069bc 100644
--- a/pki/linux/ra-ui/shared/docroot/ee/agent/index.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ee/agent/index.vm
diff --git a/pki/linux/ra-ui/shared/docroot/ee/agent/new.vm b/pki/dogtag/ra-ui/shared/docroot/ee/agent/new.vm
index a10526aa4..a10526aa4 100644
--- a/pki/linux/ra-ui/shared/docroot/ee/agent/new.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ee/agent/new.vm
diff --git a/pki/linux/ra-ui/shared/docroot/ee/agent/start.vm b/pki/dogtag/ra-ui/shared/docroot/ee/agent/start.vm
index 898d506cc..898d506cc 100644
--- a/pki/linux/ra-ui/shared/docroot/ee/agent/start.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ee/agent/start.vm
diff --git a/pki/linux/ra-ui/shared/docroot/ee/agent/submit.vm b/pki/dogtag/ra-ui/shared/docroot/ee/agent/submit.vm
index c5d3dc66d..c5d3dc66d 100644
--- a/pki/linux/ra-ui/shared/docroot/ee/agent/submit.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ee/agent/submit.vm
diff --git a/pki/linux/ra-ui/shared/docroot/ee/error.vm b/pki/dogtag/ra-ui/shared/docroot/ee/error.vm
index 7f1e8e4a4..7f1e8e4a4 100644
--- a/pki/linux/ra-ui/shared/docroot/ee/error.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ee/error.vm
diff --git a/pki/linux/ra-ui/shared/docroot/ee/index.vm b/pki/dogtag/ra-ui/shared/docroot/ee/index.vm
index 25d70215a..25d70215a 100644
--- a/pki/linux/ra-ui/shared/docroot/ee/index.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ee/index.vm
diff --git a/pki/linux/ra-ui/shared/docroot/ee/request/getcert.vm b/pki/dogtag/ra-ui/shared/docroot/ee/request/getcert.vm
index 4ad801389..4ad801389 100644
--- a/pki/linux/ra-ui/shared/docroot/ee/request/getcert.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ee/request/getcert.vm
diff --git a/pki/linux/ra-ui/shared/docroot/ee/request/index.vm b/pki/dogtag/ra-ui/shared/docroot/ee/request/index.vm
index b85dd2251..b85dd2251 100644
--- a/pki/linux/ra-ui/shared/docroot/ee/request/index.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ee/request/index.vm
diff --git a/pki/linux/ra-ui/shared/docroot/ee/request/status.vm b/pki/dogtag/ra-ui/shared/docroot/ee/request/status.vm
index 48c0ff24d..48c0ff24d 100644
--- a/pki/linux/ra-ui/shared/docroot/ee/request/status.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ee/request/status.vm
diff --git a/pki/linux/ra-ui/shared/docroot/ee/scep/enroll.vm b/pki/dogtag/ra-ui/shared/docroot/ee/scep/enroll.vm
index 6d28539a4..6d28539a4 100644
--- a/pki/linux/ra-ui/shared/docroot/ee/scep/enroll.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ee/scep/enroll.vm
diff --git a/pki/linux/ra-ui/shared/docroot/ee/scep/index.vm b/pki/dogtag/ra-ui/shared/docroot/ee/scep/index.vm
index c1c1e7b6f..c1c1e7b6f 100644
--- a/pki/linux/ra-ui/shared/docroot/ee/scep/index.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ee/scep/index.vm
diff --git a/pki/linux/ra-ui/shared/docroot/ee/scep/installer.vm b/pki/dogtag/ra-ui/shared/docroot/ee/scep/installer.vm
index 166abc011..166abc011 100644
--- a/pki/linux/ra-ui/shared/docroot/ee/scep/installer.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ee/scep/installer.vm
diff --git a/pki/linux/ra-ui/shared/docroot/ee/scep/manager.vm b/pki/dogtag/ra-ui/shared/docroot/ee/scep/manager.vm
index bea25ca03..bea25ca03 100644
--- a/pki/linux/ra-ui/shared/docroot/ee/scep/manager.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ee/scep/manager.vm
diff --git a/pki/linux/ra-ui/shared/docroot/ee/scep/submit.vm b/pki/dogtag/ra-ui/shared/docroot/ee/scep/submit.vm
index 7b89477d0..7b89477d0 100644
--- a/pki/linux/ra-ui/shared/docroot/ee/scep/submit.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ee/scep/submit.vm
diff --git a/pki/linux/ra-ui/shared/docroot/ee/server/admin.vm b/pki/dogtag/ra-ui/shared/docroot/ee/server/admin.vm
index 44a876522..44a876522 100644
--- a/pki/linux/ra-ui/shared/docroot/ee/server/admin.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ee/server/admin.vm
diff --git a/pki/linux/ra-ui/shared/docroot/ee/server/index.vm b/pki/dogtag/ra-ui/shared/docroot/ee/server/index.vm
index d2c667c93..d2c667c93 100644
--- a/pki/linux/ra-ui/shared/docroot/ee/server/index.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ee/server/index.vm
diff --git a/pki/linux/ra-ui/shared/docroot/ee/server/submit.vm b/pki/dogtag/ra-ui/shared/docroot/ee/server/submit.vm
index 5478e9312..5478e9312 100644
--- a/pki/linux/ra-ui/shared/docroot/ee/server/submit.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ee/server/submit.vm
diff --git a/pki/linux/ra-ui/shared/docroot/ee/user/index.vm b/pki/dogtag/ra-ui/shared/docroot/ee/user/index.vm
index 24bcbbd44..24bcbbd44 100644
--- a/pki/linux/ra-ui/shared/docroot/ee/user/index.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ee/user/index.vm
diff --git a/pki/linux/ra-ui/shared/docroot/ee/user/renew.vm b/pki/dogtag/ra-ui/shared/docroot/ee/user/renew.vm
index 48da45ebc..48da45ebc 100644
--- a/pki/linux/ra-ui/shared/docroot/ee/user/renew.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ee/user/renew.vm
diff --git a/pki/linux/ra-ui/shared/docroot/ee/user/renewal.vm b/pki/dogtag/ra-ui/shared/docroot/ee/user/renewal.vm
index 850b5f6bf..850b5f6bf 100644
--- a/pki/linux/ra-ui/shared/docroot/ee/user/renewal.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ee/user/renewal.vm
diff --git a/pki/linux/ra-ui/shared/docroot/ee/user/submit.vm b/pki/dogtag/ra-ui/shared/docroot/ee/user/submit.vm
index 9eda15286..9eda15286 100644
--- a/pki/linux/ra-ui/shared/docroot/ee/user/submit.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ee/user/submit.vm
diff --git a/pki/linux/ra-ui/shared/docroot/ee/user/user.vm b/pki/dogtag/ra-ui/shared/docroot/ee/user/user.vm
index 83d9d9517..83d9d9517 100644
--- a/pki/linux/ra-ui/shared/docroot/ee/user/user.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ee/user/user.vm
diff --git a/pki/linux/ra-ui/shared/docroot/footer.vm b/pki/dogtag/ra-ui/shared/docroot/footer.vm
index 8c41a0224..8c41a0224 100644
--- a/pki/linux/ra-ui/shared/docroot/footer.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/footer.vm
diff --git a/pki/linux/ra-ui/shared/docroot/header.vm b/pki/dogtag/ra-ui/shared/docroot/header.vm
index 23af0439c..23af0439c 100644
--- a/pki/linux/ra-ui/shared/docroot/header.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/header.vm
diff --git a/pki/linux/ra-ui/shared/docroot/images/logo_header.gif b/pki/dogtag/ra-ui/shared/docroot/images/logo_header.gif
index 20f74410e..20f74410e 100644
--- a/pki/linux/ra-ui/shared/docroot/images/logo_header.gif
+++ b/pki/dogtag/ra-ui/shared/docroot/images/logo_header.gif
diff --git a/pki/linux/ra-ui/shared/docroot/images/pki-icon-help.gif b/pki/dogtag/ra-ui/shared/docroot/images/pki-icon-help.gif
index 21d9f13d6..21d9f13d6 100644
--- a/pki/linux/ra-ui/shared/docroot/images/pki-icon-help.gif
+++ b/pki/dogtag/ra-ui/shared/docroot/images/pki-icon-help.gif
diff --git a/pki/linux/ra-ui/shared/docroot/images/pki-icon-home.gif b/pki/dogtag/ra-ui/shared/docroot/images/pki-icon-home.gif
index ef1726b74..ef1726b74 100644
--- a/pki/linux/ra-ui/shared/docroot/images/pki-icon-home.gif
+++ b/pki/dogtag/ra-ui/shared/docroot/images/pki-icon-home.gif
diff --git a/pki/linux/ra-ui/shared/docroot/images/pki-icon-software.gif b/pki/dogtag/ra-ui/shared/docroot/images/pki-icon-software.gif
index dd64b485c..dd64b485c 100644
--- a/pki/linux/ra-ui/shared/docroot/images/pki-icon-software.gif
+++ b/pki/dogtag/ra-ui/shared/docroot/images/pki-icon-software.gif
diff --git a/pki/linux/ra-ui/shared/docroot/index.vm b/pki/dogtag/ra-ui/shared/docroot/index.vm
index 3036d3a0c..3036d3a0c 100644
--- a/pki/linux/ra-ui/shared/docroot/index.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/index.vm
diff --git a/pki/linux/ra-ui/shared/docroot/ra/admin/console/config/adminauthenticatepanel.vm b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/adminauthenticatepanel.vm
index 5608878d9..5608878d9 100644
--- a/pki/linux/ra-ui/shared/docroot/ra/admin/console/config/adminauthenticatepanel.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/adminauthenticatepanel.vm
diff --git a/pki/linux/ra-ui/shared/docroot/ra/admin/console/config/adminpanel.vm b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/adminpanel.vm
index 36e99097b..36e99097b 100644
--- a/pki/linux/ra-ui/shared/docroot/ra/admin/console/config/adminpanel.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/adminpanel.vm
diff --git a/pki/linux/ra-ui/shared/docroot/ra/admin/console/config/agentauthenticatepanel.vm b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/agentauthenticatepanel.vm
index 4a7e79174..4a7e79174 100644
--- a/pki/linux/ra-ui/shared/docroot/ra/admin/console/config/agentauthenticatepanel.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/agentauthenticatepanel.vm
diff --git a/pki/linux/ra-ui/shared/docroot/ra/admin/console/config/authdbpanel.vm b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/authdbpanel.vm
index 43c0ed544..43c0ed544 100644
--- a/pki/linux/ra-ui/shared/docroot/ra/admin/console/config/authdbpanel.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/authdbpanel.vm
diff --git a/pki/linux/ra-ui/shared/docroot/ra/admin/console/config/cainfopanel.vm b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/cainfopanel.vm
index ff4a4a153..ff4a4a153 100644
--- a/pki/linux/ra-ui/shared/docroot/ra/admin/console/config/cainfopanel.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/cainfopanel.vm
diff --git a/pki/linux/ra-ui/shared/docroot/ra/admin/console/config/certchainpanel.vm b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/certchainpanel.vm
index 08bcc1331..08bcc1331 100644
--- a/pki/linux/ra-ui/shared/docroot/ra/admin/console/config/certchainpanel.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/certchainpanel.vm
diff --git a/pki/linux/ra-ui/shared/docroot/ra/admin/console/config/certprettyprintpanel.vm b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/certprettyprintpanel.vm
index ac8da10ee..ac8da10ee 100644
--- a/pki/linux/ra-ui/shared/docroot/ra/admin/console/config/certprettyprintpanel.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/certprettyprintpanel.vm
diff --git a/pki/linux/ra-ui/shared/docroot/ra/admin/console/config/certrequestpanel.vm b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/certrequestpanel.vm
index 883cb6589..883cb6589 100644
--- a/pki/linux/ra-ui/shared/docroot/ra/admin/console/config/certrequestpanel.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/certrequestpanel.vm
diff --git a/pki/linux/ra-ui/shared/docroot/ra/admin/console/config/config_addhsm.vm b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/config_addhsm.vm
index c947c1c9a..c947c1c9a 100644
--- a/pki/linux/ra-ui/shared/docroot/ra/admin/console/config/config_addhsm.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/config_addhsm.vm
diff --git a/pki/linux/ra-ui/shared/docroot/ra/admin/console/config/config_db.vm b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/config_db.vm
index 09220443e..09220443e 100644
--- a/pki/linux/ra-ui/shared/docroot/ra/admin/console/config/config_db.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/config_db.vm
diff --git a/pki/linux/ra-ui/shared/docroot/ra/admin/console/config/config_hsm.vm b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/config_hsm.vm
index 144032830..144032830 100644
--- a/pki/linux/ra-ui/shared/docroot/ra/admin/console/config/config_hsm.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/config_hsm.vm
diff --git a/pki/linux/ra-ui/shared/docroot/ra/admin/console/config/config_hsmloginpanel.vm b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/config_hsmloginpanel.vm
index 46d8ae0ea..46d8ae0ea 100644
--- a/pki/linux/ra-ui/shared/docroot/ra/admin/console/config/config_hsmloginpanel.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/config_hsmloginpanel.vm
diff --git a/pki/linux/ra-ui/shared/docroot/ra/admin/console/config/config_join.vm b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/config_join.vm
index 8f5db2fad..8f5db2fad 100644
--- a/pki/linux/ra-ui/shared/docroot/ra/admin/console/config/config_join.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/config_join.vm
diff --git a/pki/linux/ra-ui/shared/docroot/ra/admin/console/config/config_rootca.vm b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/config_rootca.vm
index 615ef3a1e..615ef3a1e 100644
--- a/pki/linux/ra-ui/shared/docroot/ra/admin/console/config/config_rootca.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/config_rootca.vm
diff --git a/pki/linux/ra-ui/shared/docroot/ra/admin/console/config/createsubsystempanel.vm b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/createsubsystempanel.vm
index 9473acd99..9473acd99 100644
--- a/pki/linux/ra-ui/shared/docroot/ra/admin/console/config/createsubsystempanel.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/createsubsystempanel.vm
diff --git a/pki/linux/ra-ui/shared/docroot/ra/admin/console/config/databasepanel.vm b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/databasepanel.vm
index 76c3c887d..76c3c887d 100644
--- a/pki/linux/ra-ui/shared/docroot/ra/admin/console/config/databasepanel.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/databasepanel.vm
diff --git a/pki/linux/ra-ui/shared/docroot/ra/admin/console/config/displaycertchain2panel.vm b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/displaycertchain2panel.vm
index 068fd9283..068fd9283 100644
--- a/pki/linux/ra-ui/shared/docroot/ra/admin/console/config/displaycertchain2panel.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/displaycertchain2panel.vm
diff --git a/pki/linux/ra-ui/shared/docroot/ra/admin/console/config/displaycertchainpanel.vm b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/displaycertchainpanel.vm
index 829ee24cb..829ee24cb 100644
--- a/pki/linux/ra-ui/shared/docroot/ra/admin/console/config/displaycertchainpanel.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/displaycertchainpanel.vm
diff --git a/pki/linux/ra-ui/shared/docroot/ra/admin/console/config/donepanel.vm b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/donepanel.vm
index 4f28fa085..4f28fa085 100644
--- a/pki/linux/ra-ui/shared/docroot/ra/admin/console/config/donepanel.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/donepanel.vm
diff --git a/pki/linux/ra-ui/shared/docroot/ra/admin/console/config/drminfopanel.vm b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/drminfopanel.vm
index 35f61fa3a..35f61fa3a 100644
--- a/pki/linux/ra-ui/shared/docroot/ra/admin/console/config/drminfopanel.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/drminfopanel.vm
diff --git a/pki/linux/ra-ui/shared/docroot/ra/admin/console/config/footer.vm b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/footer.vm
index bca378ff4..bca378ff4 100644
--- a/pki/linux/ra-ui/shared/docroot/ra/admin/console/config/footer.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/footer.vm
diff --git a/pki/linux/ra-ui/shared/docroot/ra/admin/console/config/header.vm b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/header.vm
index 23a1837f5..23a1837f5 100644
--- a/pki/linux/ra-ui/shared/docroot/ra/admin/console/config/header.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/header.vm
diff --git a/pki/linux/ra-ui/shared/docroot/ra/admin/console/config/hierarchypanel.vm b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/hierarchypanel.vm
index bde310882..bde310882 100644
--- a/pki/linux/ra-ui/shared/docroot/ra/admin/console/config/hierarchypanel.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/hierarchypanel.vm
diff --git a/pki/linux/ra-ui/shared/docroot/ra/admin/console/config/importadmincertpanel.vm b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/importadmincertpanel.vm
index a6f54cb37..a6f54cb37 100644
--- a/pki/linux/ra-ui/shared/docroot/ra/admin/console/config/importadmincertpanel.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/importadmincertpanel.vm
diff --git a/pki/linux/ra-ui/shared/docroot/ra/admin/console/config/login.vm b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/login.vm
index 35904eb91..35904eb91 100644
--- a/pki/linux/ra-ui/shared/docroot/ra/admin/console/config/login.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/login.vm
diff --git a/pki/linux/ra-ui/shared/docroot/ra/admin/console/config/modulepanel.vm b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/modulepanel.vm
index cb9a1eaf8..cb9a1eaf8 100644
--- a/pki/linux/ra-ui/shared/docroot/ra/admin/console/config/modulepanel.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/modulepanel.vm
diff --git a/pki/linux/ra-ui/shared/docroot/ra/admin/console/config/namepanel.vm b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/namepanel.vm
index 3fd932df4..3fd932df4 100644
--- a/pki/linux/ra-ui/shared/docroot/ra/admin/console/config/namepanel.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/namepanel.vm
diff --git a/pki/linux/ra-ui/shared/docroot/ra/admin/console/config/securitydomainloginpanel.vm b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/securitydomainloginpanel.vm
index 04d86eb4a..04d86eb4a 100644
--- a/pki/linux/ra-ui/shared/docroot/ra/admin/console/config/securitydomainloginpanel.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/securitydomainloginpanel.vm
diff --git a/pki/linux/ra-ui/shared/docroot/ra/admin/console/config/securitydomainpanel.vm b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/securitydomainpanel.vm
index 205e18bb5..205e18bb5 100644
--- a/pki/linux/ra-ui/shared/docroot/ra/admin/console/config/securitydomainpanel.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/securitydomainpanel.vm
diff --git a/pki/linux/ra-ui/shared/docroot/ra/admin/console/config/sidemenu.vm b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/sidemenu.vm
index 09fe16870..09fe16870 100644
--- a/pki/linux/ra-ui/shared/docroot/ra/admin/console/config/sidemenu.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/sidemenu.vm
diff --git a/pki/linux/ra-ui/shared/docroot/ra/admin/console/config/sizepanel.vm b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/sizepanel.vm
index 08a36a438..08a36a438 100644
--- a/pki/linux/ra-ui/shared/docroot/ra/admin/console/config/sizepanel.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/sizepanel.vm
diff --git a/pki/linux/ra-ui/shared/docroot/ra/admin/console/config/tksinfopanel.vm b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/tksinfopanel.vm
index d30144074..d30144074 100644
--- a/pki/linux/ra-ui/shared/docroot/ra/admin/console/config/tksinfopanel.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/tksinfopanel.vm
diff --git a/pki/linux/ra-ui/shared/docroot/ra/admin/console/config/topmenu.vm b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/topmenu.vm
index 64881066f..64881066f 100644
--- a/pki/linux/ra-ui/shared/docroot/ra/admin/console/config/topmenu.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/topmenu.vm
diff --git a/pki/linux/ra-ui/shared/docroot/ra/admin/console/config/welcomepanel.vm b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/welcomepanel.vm
index fd478d1a8..fd478d1a8 100644
--- a/pki/linux/ra-ui/shared/docroot/ra/admin/console/config/welcomepanel.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/welcomepanel.vm
diff --git a/pki/linux/ra-ui/shared/docroot/ra/admin/console/config/wizard.vm b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/wizard.vm
index 13e8490da..13e8490da 100644
--- a/pki/linux/ra-ui/shared/docroot/ra/admin/console/config/wizard.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/wizard.vm
diff --git a/pki/linux/ra-ui/shared/docroot/ra/admin/console/config/xml.vm b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/xml.vm
index 31ff72aa2..31ff72aa2 100644
--- a/pki/linux/ra-ui/shared/docroot/ra/admin/console/config/xml.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/xml.vm
diff --git a/pki/linux/ra-ui/shared/docroot/ra/admin/console/img/bigrotation2.gif b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/img/bigrotation2.gif
index 5bb90fd6a..5bb90fd6a 100644
--- a/pki/linux/ra-ui/shared/docroot/ra/admin/console/img/bigrotation2.gif
+++ b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/img/bigrotation2.gif
diff --git a/pki/linux/ra-ui/shared/docroot/ra/admin/console/img/button-clear.gif b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/img/button-clear.gif
index 336e6e5d9..336e6e5d9 100644
--- a/pki/linux/ra-ui/shared/docroot/ra/admin/console/img/button-clear.gif
+++ b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/img/button-clear.gif
diff --git a/pki/linux/ra-ui/shared/docroot/ra/admin/console/img/button-manage.gif b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/img/button-manage.gif
index 8f2f3db5e..8f2f3db5e 100644
--- a/pki/linux/ra-ui/shared/docroot/ra/admin/console/img/button-manage.gif
+++ b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/img/button-manage.gif
diff --git a/pki/linux/ra-ui/shared/docroot/ra/admin/console/img/button-search.gif b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/img/button-search.gif
index b015c82a9..b015c82a9 100644
--- a/pki/linux/ra-ui/shared/docroot/ra/admin/console/img/button-search.gif
+++ b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/img/button-search.gif
diff --git a/pki/linux/ra-ui/shared/docroot/ra/admin/console/img/certificate.png b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/img/certificate.png
index 2ea9f88bb..2ea9f88bb 100644
--- a/pki/linux/ra-ui/shared/docroot/ra/admin/console/img/certificate.png
+++ b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/img/certificate.png
diff --git a/pki/linux/ra-ui/shared/docroot/ra/admin/console/img/clearpixel.gif b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/img/clearpixel.gif
index ae710460b..ae710460b 100644
--- a/pki/linux/ra-ui/shared/docroot/ra/admin/console/img/clearpixel.gif
+++ b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/img/clearpixel.gif
diff --git a/pki/linux/ra-ui/shared/docroot/ra/admin/console/img/icon_crit_update.gif b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/img/icon_crit_update.gif
index cf3c47907..cf3c47907 100644
--- a/pki/linux/ra-ui/shared/docroot/ra/admin/console/img/icon_crit_update.gif
+++ b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/img/icon_crit_update.gif
diff --git a/pki/linux/ra-ui/shared/docroot/ra/admin/console/img/id.png b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/img/id.png
index 2c54191e1..2c54191e1 100644
--- a/pki/linux/ra-ui/shared/docroot/ra/admin/console/img/id.png
+++ b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/img/id.png
diff --git a/pki/linux/ra-ui/shared/docroot/ra/admin/console/img/key.png b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/img/key.png
index db2896248..db2896248 100644
--- a/pki/linux/ra-ui/shared/docroot/ra/admin/console/img/key.png
+++ b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/img/key.png
diff --git a/pki/linux/ra-ui/shared/docroot/ra/admin/console/img/logo_header.gif b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/img/logo_header.gif
index 20f74410e..20f74410e 100644
--- a/pki/linux/ra-ui/shared/docroot/ra/admin/console/img/logo_header.gif
+++ b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/img/logo_header.gif
diff --git a/pki/linux/ra-ui/shared/docroot/ra/admin/console/img/no-certificate.png b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/img/no-certificate.png
index 7d93a41c3..7d93a41c3 100644
--- a/pki/linux/ra-ui/shared/docroot/ra/admin/console/img/no-certificate.png
+++ b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/img/no-certificate.png
diff --git a/pki/linux/ra-ui/shared/docroot/ra/admin/console/img/pki-icon-help.gif b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/img/pki-icon-help.gif
index 21d9f13d6..21d9f13d6 100644
--- a/pki/linux/ra-ui/shared/docroot/ra/admin/console/img/pki-icon-help.gif
+++ b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/img/pki-icon-help.gif
diff --git a/pki/linux/ra-ui/shared/docroot/ra/admin/console/img/pki-icon-home.gif b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/img/pki-icon-home.gif
index ef1726b74..ef1726b74 100644
--- a/pki/linux/ra-ui/shared/docroot/ra/admin/console/img/pki-icon-home.gif
+++ b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/img/pki-icon-home.gif
diff --git a/pki/linux/ra-ui/shared/docroot/ra/admin/console/img/pki-icon-software.gif b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/img/pki-icon-software.gif
index dd64b485c..dd64b485c 100644
--- a/pki/linux/ra-ui/shared/docroot/ra/admin/console/img/pki-icon-software.gif
+++ b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/img/pki-icon-software.gif
diff --git a/pki/linux/ra-ui/shared/docroot/ra/admin/console/js/misc.js b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/js/misc.js
index d4dc336ab..d4dc336ab 100644
--- a/pki/linux/ra-ui/shared/docroot/ra/admin/console/js/misc.js
+++ b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/js/misc.js
diff --git a/pki/linux/ra/build_linux b/pki/dogtag/ra/build_linux
index 8b9c03b57..8b9c03b57 100755
--- a/pki/linux/ra/build_linux
+++ b/pki/dogtag/ra/build_linux
diff --git a/pki/linux/ra/config-ext/build_linux_pki b/pki/dogtag/ra/config-ext/build_linux_pki
index d9ea91e8c..d9ea91e8c 100755
--- a/pki/linux/ra/config-ext/build_linux_pki
+++ b/pki/dogtag/ra/config-ext/build_linux_pki
diff --git a/pki/linux/ra/config/product.xml b/pki/dogtag/ra/config/product.xml
index 33caf48ed..33caf48ed 100644
--- a/pki/linux/ra/config/product.xml
+++ b/pki/dogtag/ra/config/product.xml
diff --git a/pki/linux/ra/config/release.xml b/pki/dogtag/ra/config/release.xml
index fc43aaeb7..fc43aaeb7 100644
--- a/pki/linux/ra/config/release.xml
+++ b/pki/dogtag/ra/config/release.xml
diff --git a/pki/linux/ra/pki-ra.spec b/pki/dogtag/ra/pki-ra.spec
index 6902f830d..6902f830d 100644
--- a/pki/linux/ra/pki-ra.spec
+++ b/pki/dogtag/ra/pki-ra.spec
diff --git a/pki/linux/scripts/build_ca b/pki/dogtag/scripts/build_ca
index e581096e2..e581096e2 100755
--- a/pki/linux/scripts/build_ca
+++ b/pki/dogtag/scripts/build_ca
diff --git a/pki/linux/scripts/build_pki b/pki/dogtag/scripts/build_pki
index 9d248e6c2..9d248e6c2 100755
--- a/pki/linux/scripts/build_pki
+++ b/pki/dogtag/scripts/build_pki
diff --git a/pki/linux/scripts/ds_remove_cgi_32 b/pki/dogtag/scripts/ds_remove_cgi_32
index 8759499d0..8759499d0 100755
--- a/pki/linux/scripts/ds_remove_cgi_32
+++ b/pki/dogtag/scripts/ds_remove_cgi_32
diff --git a/pki/linux/scripts/ds_remove_cgi_64 b/pki/dogtag/scripts/ds_remove_cgi_64
index 73bcc8a34..73bcc8a34 100755
--- a/pki/linux/scripts/ds_remove_cgi_64
+++ b/pki/dogtag/scripts/ds_remove_cgi_64
diff --git a/pki/linux/scripts/linux_svn_external_properties_db b/pki/dogtag/scripts/linux_svn_external_properties_db
index f73b03339..f73b03339 100644
--- a/pki/linux/scripts/linux_svn_external_properties_db
+++ b/pki/dogtag/scripts/linux_svn_external_properties_db
diff --git a/pki/linux/scripts/prepare_ca b/pki/dogtag/scripts/prepare_ca
index 98ebafc9e..98ebafc9e 100755
--- a/pki/linux/scripts/prepare_ca
+++ b/pki/dogtag/scripts/prepare_ca
diff --git a/pki/linux/scripts/prepare_pki b/pki/dogtag/scripts/prepare_pki
index f11b7363f..f11b7363f 100755
--- a/pki/linux/scripts/prepare_pki
+++ b/pki/dogtag/scripts/prepare_pki
diff --git a/pki/linux/scripts/remove_default_pki_instances b/pki/dogtag/scripts/remove_default_pki_instances
index aa67c6ca9..aa67c6ca9 100755
--- a/pki/linux/scripts/remove_default_pki_instances
+++ b/pki/dogtag/scripts/remove_default_pki_instances
diff --git a/pki/linux/scripts/remove_ds_instance b/pki/dogtag/scripts/remove_ds_instance
index d81326c63..d81326c63 100755
--- a/pki/linux/scripts/remove_ds_instance
+++ b/pki/dogtag/scripts/remove_ds_instance
diff --git a/pki/linux/scripts/remove_pki_components b/pki/dogtag/scripts/remove_pki_components
index 543028e8d..543028e8d 100755
--- a/pki/linux/scripts/remove_pki_components
+++ b/pki/dogtag/scripts/remove_pki_components
diff --git a/pki/linux/scripts/set_linux_SVN_external_properties b/pki/dogtag/scripts/set_linux_SVN_external_properties
index 902f0b9eb..902f0b9eb 100755
--- a/pki/linux/scripts/set_linux_SVN_external_properties
+++ b/pki/dogtag/scripts/set_linux_SVN_external_properties
diff --git a/pki/linux/setup/build_linux b/pki/dogtag/setup/build_linux
index 84726f767..84726f767 100755
--- a/pki/linux/setup/build_linux
+++ b/pki/dogtag/setup/build_linux
diff --git a/pki/linux/setup/config-ext/build_linux_pki b/pki/dogtag/setup/config-ext/build_linux_pki
index d9ea91e8c..d9ea91e8c 100755
--- a/pki/linux/setup/config-ext/build_linux_pki
+++ b/pki/dogtag/setup/config-ext/build_linux_pki
diff --git a/pki/linux/setup/config/product.xml b/pki/dogtag/setup/config/product.xml
index 33caf48ed..33caf48ed 100644
--- a/pki/linux/setup/config/product.xml
+++ b/pki/dogtag/setup/config/product.xml
diff --git a/pki/linux/setup/config/release.xml b/pki/dogtag/setup/config/release.xml
index fc43aaeb7..fc43aaeb7 100644
--- a/pki/linux/setup/config/release.xml
+++ b/pki/dogtag/setup/config/release.xml
diff --git a/pki/linux/setup/pki-setup.spec b/pki/dogtag/setup/pki-setup.spec
index 7b3a0196a..7b3a0196a 100644
--- a/pki/linux/setup/pki-setup.spec
+++ b/pki/dogtag/setup/pki-setup.spec
diff --git a/pki/linux/silent/build_linux b/pki/dogtag/silent/build_linux
index 4405ed28d..4405ed28d 100755
--- a/pki/linux/silent/build_linux
+++ b/pki/dogtag/silent/build_linux
diff --git a/pki/linux/silent/config-ext/build_linux_pki b/pki/dogtag/silent/config-ext/build_linux_pki
index d9ea91e8c..d9ea91e8c 100755
--- a/pki/linux/silent/config-ext/build_linux_pki
+++ b/pki/dogtag/silent/config-ext/build_linux_pki
diff --git a/pki/linux/silent/config/product.xml b/pki/dogtag/silent/config/product.xml
index 33caf48ed..33caf48ed 100644
--- a/pki/linux/silent/config/product.xml
+++ b/pki/dogtag/silent/config/product.xml
diff --git a/pki/linux/silent/config/release.xml b/pki/dogtag/silent/config/release.xml
index fc43aaeb7..fc43aaeb7 100644
--- a/pki/linux/silent/config/release.xml
+++ b/pki/dogtag/silent/config/release.xml
diff --git a/pki/linux/silent/pki-silent.spec b/pki/dogtag/silent/pki-silent.spec
index ee89fd90d..ee89fd90d 100644
--- a/pki/linux/silent/pki-silent.spec
+++ b/pki/dogtag/silent/pki-silent.spec
diff --git a/pki/linux/symkey/build_linux b/pki/dogtag/symkey/build_linux
index 845692d6a..845692d6a 100755
--- a/pki/linux/symkey/build_linux
+++ b/pki/dogtag/symkey/build_linux
diff --git a/pki/linux/symkey/config-ext/build_linux_pki b/pki/dogtag/symkey/config-ext/build_linux_pki
index d9ea91e8c..d9ea91e8c 100755
--- a/pki/linux/symkey/config-ext/build_linux_pki
+++ b/pki/dogtag/symkey/config-ext/build_linux_pki
diff --git a/pki/linux/symkey/config/product.xml b/pki/dogtag/symkey/config/product.xml
index 33caf48ed..33caf48ed 100644
--- a/pki/linux/symkey/config/product.xml
+++ b/pki/dogtag/symkey/config/product.xml
diff --git a/pki/linux/symkey/config/release.xml b/pki/dogtag/symkey/config/release.xml
index fc43aaeb7..fc43aaeb7 100644
--- a/pki/linux/symkey/config/release.xml
+++ b/pki/dogtag/symkey/config/release.xml
diff --git a/pki/linux/symkey/symkey.spec b/pki/dogtag/symkey/symkey.spec
index f57baedbf..f57baedbf 100644
--- a/pki/linux/symkey/symkey.spec
+++ b/pki/dogtag/symkey/symkey.spec
diff --git a/pki/linux/tks-ui/LICENSE b/pki/dogtag/tks-ui/LICENSE
index e36f2269a..e36f2269a 100644
--- a/pki/linux/tks-ui/LICENSE
+++ b/pki/dogtag/tks-ui/LICENSE
diff --git a/pki/linux/tks-ui/build.xml b/pki/dogtag/tks-ui/build.xml
index b4ffd1c92..b4ffd1c92 100644
--- a/pki/linux/tks-ui/build.xml
+++ b/pki/dogtag/tks-ui/build.xml
diff --git a/pki/linux/tks-ui/build_linux b/pki/dogtag/tks-ui/build_linux
index 2d85d3c90..2d85d3c90 100755
--- a/pki/linux/tks-ui/build_linux
+++ b/pki/dogtag/tks-ui/build_linux
diff --git a/pki/linux/tks-ui/config-ext/build_linux_pki b/pki/dogtag/tks-ui/config-ext/build_linux_pki
index d9ea91e8c..d9ea91e8c 100755
--- a/pki/linux/tks-ui/config-ext/build_linux_pki
+++ b/pki/dogtag/tks-ui/config-ext/build_linux_pki
diff --git a/pki/linux/tks-ui/config/product.xml b/pki/dogtag/tks-ui/config/product.xml
index 33caf48ed..33caf48ed 100644
--- a/pki/linux/tks-ui/config/product.xml
+++ b/pki/dogtag/tks-ui/config/product.xml
diff --git a/pki/linux/tks-ui/config/release.xml b/pki/dogtag/tks-ui/config/release.xml
index fc43aaeb7..fc43aaeb7 100644
--- a/pki/linux/tks-ui/config/release.xml
+++ b/pki/dogtag/tks-ui/config/release.xml
diff --git a/pki/linux/tks-ui/pki-tks-ui.spec b/pki/dogtag/tks-ui/pki-tks-ui.spec
index 4043338af..4043338af 100644
--- a/pki/linux/tks-ui/pki-tks-ui.spec
+++ b/pki/dogtag/tks-ui/pki-tks-ui.spec
diff --git a/pki/linux/tks-ui/shared/webapps/tks/GenUnexpectedError.template b/pki/dogtag/tks-ui/shared/webapps/tks/GenUnexpectedError.template
index c69aaad1f..c69aaad1f 100644
--- a/pki/linux/tks-ui/shared/webapps/tks/GenUnexpectedError.template
+++ b/pki/dogtag/tks-ui/shared/webapps/tks/GenUnexpectedError.template
diff --git a/pki/linux/tks-ui/shared/webapps/tks/agent/GenError.template b/pki/dogtag/tks-ui/shared/webapps/tks/agent/GenError.template
index f0cca1ea8..f0cca1ea8 100644
--- a/pki/linux/tks-ui/shared/webapps/tks/agent/GenError.template
+++ b/pki/dogtag/tks-ui/shared/webapps/tks/agent/GenError.template
diff --git a/pki/linux/tks-ui/shared/webapps/tks/agent/GenPending.template b/pki/dogtag/tks-ui/shared/webapps/tks/agent/GenPending.template
index 0ff5f4383..0ff5f4383 100644
--- a/pki/linux/tks-ui/shared/webapps/tks/agent/GenPending.template
+++ b/pki/dogtag/tks-ui/shared/webapps/tks/agent/GenPending.template
diff --git a/pki/linux/tks-ui/shared/webapps/tks/agent/GenRejected.template b/pki/dogtag/tks-ui/shared/webapps/tks/agent/GenRejected.template
index a5dd68f49..a5dd68f49 100644
--- a/pki/linux/tks-ui/shared/webapps/tks/agent/GenRejected.template
+++ b/pki/dogtag/tks-ui/shared/webapps/tks/agent/GenRejected.template
diff --git a/pki/linux/tks-ui/shared/webapps/tks/agent/GenSuccess.template b/pki/dogtag/tks-ui/shared/webapps/tks/agent/GenSuccess.template
index 9a0ead814..9a0ead814 100644
--- a/pki/linux/tks-ui/shared/webapps/tks/agent/GenSuccess.template
+++ b/pki/dogtag/tks-ui/shared/webapps/tks/agent/GenSuccess.template
diff --git a/pki/linux/tks-ui/shared/webapps/tks/agent/GenSvcPending.template b/pki/dogtag/tks-ui/shared/webapps/tks/agent/GenSvcPending.template
index f639a39a9..f639a39a9 100644
--- a/pki/linux/tks-ui/shared/webapps/tks/agent/GenSvcPending.template
+++ b/pki/dogtag/tks-ui/shared/webapps/tks/agent/GenSvcPending.template
diff --git a/pki/linux/tks-ui/shared/webapps/tks/agent/GenUnauthorized.template b/pki/dogtag/tks-ui/shared/webapps/tks/agent/GenUnauthorized.template
index c29372843..c29372843 100644
--- a/pki/linux/tks-ui/shared/webapps/tks/agent/GenUnauthorized.template
+++ b/pki/dogtag/tks-ui/shared/webapps/tks/agent/GenUnauthorized.template
diff --git a/pki/linux/tks-ui/shared/webapps/tks/agent/GenUnexpectedError.template b/pki/dogtag/tks-ui/shared/webapps/tks/agent/GenUnexpectedError.template
index c69aaad1f..c69aaad1f 100644
--- a/pki/linux/tks-ui/shared/webapps/tks/agent/GenUnexpectedError.template
+++ b/pki/dogtag/tks-ui/shared/webapps/tks/agent/GenUnexpectedError.template
diff --git a/pki/linux/tks-ui/shared/webapps/tks/agent/cms-funcs.js b/pki/dogtag/tks-ui/shared/webapps/tks/agent/cms-funcs.js
index c8ffd51c7..c8ffd51c7 100644
--- a/pki/linux/tks-ui/shared/webapps/tks/agent/cms-funcs.js
+++ b/pki/dogtag/tks-ui/shared/webapps/tks/agent/cms-funcs.js
diff --git a/pki/linux/tks-ui/shared/webapps/tks/agent/funcs.js b/pki/dogtag/tks-ui/shared/webapps/tks/agent/funcs.js
index daef83d17..daef83d17 100644
--- a/pki/linux/tks-ui/shared/webapps/tks/agent/funcs.js
+++ b/pki/dogtag/tks-ui/shared/webapps/tks/agent/funcs.js
diff --git a/pki/linux/tks-ui/shared/webapps/tks/agent/graphics/dgLeftTab.gif b/pki/dogtag/tks-ui/shared/webapps/tks/agent/graphics/dgLeftTab.gif
index 35a76c859..35a76c859 100644
--- a/pki/linux/tks-ui/shared/webapps/tks/agent/graphics/dgLeftTab.gif
+++ b/pki/dogtag/tks-ui/shared/webapps/tks/agent/graphics/dgLeftTab.gif
diff --git a/pki/linux/tks-ui/shared/webapps/tks/agent/graphics/dgRightTab.gif b/pki/dogtag/tks-ui/shared/webapps/tks/agent/graphics/dgRightTab.gif
index a519bc759..a519bc759 100644
--- a/pki/linux/tks-ui/shared/webapps/tks/agent/graphics/dgRightTab.gif
+++ b/pki/dogtag/tks-ui/shared/webapps/tks/agent/graphics/dgRightTab.gif
diff --git a/pki/linux/tks-ui/shared/webapps/tks/agent/graphics/goto-tall.gif b/pki/dogtag/tks-ui/shared/webapps/tks/agent/graphics/goto-tall.gif
index 6eea3ef5c..6eea3ef5c 100644
--- a/pki/linux/tks-ui/shared/webapps/tks/agent/graphics/goto-tall.gif
+++ b/pki/dogtag/tks-ui/shared/webapps/tks/agent/graphics/goto-tall.gif
diff --git a/pki/linux/tks-ui/shared/webapps/tks/agent/graphics/graphics.tmp b/pki/dogtag/tks-ui/shared/webapps/tks/agent/graphics/graphics.tmp
index e69de29bb..e69de29bb 100644
--- a/pki/linux/tks-ui/shared/webapps/tks/agent/graphics/graphics.tmp
+++ b/pki/dogtag/tks-ui/shared/webapps/tks/agent/graphics/graphics.tmp
diff --git a/pki/linux/tks-ui/shared/webapps/tks/agent/graphics/gray90.gif b/pki/dogtag/tks-ui/shared/webapps/tks/agent/graphics/gray90.gif
index c6f811102..c6f811102 100644
--- a/pki/linux/tks-ui/shared/webapps/tks/agent/graphics/gray90.gif
+++ b/pki/dogtag/tks-ui/shared/webapps/tks/agent/graphics/gray90.gif
diff --git a/pki/linux/tks-ui/shared/webapps/tks/agent/graphics/hr.gif b/pki/dogtag/tks-ui/shared/webapps/tks/agent/graphics/hr.gif
index 14f8acf92..14f8acf92 100644
--- a/pki/linux/tks-ui/shared/webapps/tks/agent/graphics/hr.gif
+++ b/pki/dogtag/tks-ui/shared/webapps/tks/agent/graphics/hr.gif
diff --git a/pki/linux/tks-ui/shared/webapps/tks/agent/graphics/lgLeftTab.gif b/pki/dogtag/tks-ui/shared/webapps/tks/agent/graphics/lgLeftTab.gif
index a78fbc89d..a78fbc89d 100644
--- a/pki/linux/tks-ui/shared/webapps/tks/agent/graphics/lgLeftTab.gif
+++ b/pki/dogtag/tks-ui/shared/webapps/tks/agent/graphics/lgLeftTab.gif
diff --git a/pki/linux/tks-ui/shared/webapps/tks/agent/graphics/lgRightTab.gif b/pki/dogtag/tks-ui/shared/webapps/tks/agent/graphics/lgRightTab.gif
index 71852402d..71852402d 100644
--- a/pki/linux/tks-ui/shared/webapps/tks/agent/graphics/lgRightTab.gif
+++ b/pki/dogtag/tks-ui/shared/webapps/tks/agent/graphics/lgRightTab.gif
diff --git a/pki/linux/tks-ui/shared/webapps/tks/agent/graphics/spacer.gif b/pki/dogtag/tks-ui/shared/webapps/tks/agent/graphics/spacer.gif
index 13acffe53..13acffe53 100644
--- a/pki/linux/tks-ui/shared/webapps/tks/agent/graphics/spacer.gif
+++ b/pki/dogtag/tks-ui/shared/webapps/tks/agent/graphics/spacer.gif
diff --git a/pki/linux/tks-ui/shared/webapps/tks/agent/header.template b/pki/dogtag/tks-ui/shared/webapps/tks/agent/header.template
index 3ef2d8416..3ef2d8416 100644
--- a/pki/linux/tks-ui/shared/webapps/tks/agent/header.template
+++ b/pki/dogtag/tks-ui/shared/webapps/tks/agent/header.template
diff --git a/pki/linux/tks-ui/shared/webapps/tks/agent/helpfun.js b/pki/dogtag/tks-ui/shared/webapps/tks/agent/helpfun.js
index f9580279a..f9580279a 100644
--- a/pki/linux/tks-ui/shared/webapps/tks/agent/helpfun.js
+++ b/pki/dogtag/tks-ui/shared/webapps/tks/agent/helpfun.js
diff --git a/pki/linux/tks-ui/shared/webapps/tks/agent/index.html b/pki/dogtag/tks-ui/shared/webapps/tks/agent/index.html
index 620a83a45..620a83a45 100644
--- a/pki/linux/tks-ui/shared/webapps/tks/agent/index.html
+++ b/pki/dogtag/tks-ui/shared/webapps/tks/agent/index.html
diff --git a/pki/linux/tks-ui/shared/webapps/tks/agent/index.template b/pki/dogtag/tks-ui/shared/webapps/tks/agent/index.template
index 4995377d7..4995377d7 100644
--- a/pki/linux/tks-ui/shared/webapps/tks/agent/index.template
+++ b/pki/dogtag/tks-ui/shared/webapps/tks/agent/index.template
diff --git a/pki/linux/tks-ui/shared/webapps/tks/agent/ports.template b/pki/dogtag/tks-ui/shared/webapps/tks/agent/ports.template
index d2bd028aa..d2bd028aa 100644
--- a/pki/linux/tks-ui/shared/webapps/tks/agent/ports.template
+++ b/pki/dogtag/tks-ui/shared/webapps/tks/agent/ports.template
diff --git a/pki/linux/tks-ui/shared/webapps/tks/agent/tks/getStats.template b/pki/dogtag/tks-ui/shared/webapps/tks/agent/tks/getStats.template
index c6f56b1f7..c6f56b1f7 100644
--- a/pki/linux/tks-ui/shared/webapps/tks/agent/tks/getStats.template
+++ b/pki/dogtag/tks-ui/shared/webapps/tks/agent/tks/getStats.template
diff --git a/pki/linux/tks-ui/shared/webapps/tks/agent/tks/index.html b/pki/dogtag/tks-ui/shared/webapps/tks/agent/tks/index.html
index b967035d9..b967035d9 100644
--- a/pki/linux/tks-ui/shared/webapps/tks/agent/tks/index.html
+++ b/pki/dogtag/tks-ui/shared/webapps/tks/agent/tks/index.html
diff --git a/pki/linux/tks-ui/shared/webapps/tks/services.template b/pki/dogtag/tks-ui/shared/webapps/tks/services.template
index 0f326e0df..0f326e0df 100644
--- a/pki/linux/tks-ui/shared/webapps/tks/services.template
+++ b/pki/dogtag/tks-ui/shared/webapps/tks/services.template
diff --git a/pki/linux/tks/build_linux b/pki/dogtag/tks/build_linux
index 91e2b581f..91e2b581f 100755
--- a/pki/linux/tks/build_linux
+++ b/pki/dogtag/tks/build_linux
diff --git a/pki/linux/tks/config-ext/build_linux_pki b/pki/dogtag/tks/config-ext/build_linux_pki
index d9ea91e8c..d9ea91e8c 100755
--- a/pki/linux/tks/config-ext/build_linux_pki
+++ b/pki/dogtag/tks/config-ext/build_linux_pki
diff --git a/pki/linux/tks/config/product.xml b/pki/dogtag/tks/config/product.xml
index 33caf48ed..33caf48ed 100644
--- a/pki/linux/tks/config/product.xml
+++ b/pki/dogtag/tks/config/product.xml
diff --git a/pki/linux/tks/config/release.xml b/pki/dogtag/tks/config/release.xml
index fc43aaeb7..fc43aaeb7 100644
--- a/pki/linux/tks/config/release.xml
+++ b/pki/dogtag/tks/config/release.xml
diff --git a/pki/linux/tks/pki-tks.spec b/pki/dogtag/tks/pki-tks.spec
index 85cd5a550..85cd5a550 100644
--- a/pki/linux/tks/pki-tks.spec
+++ b/pki/dogtag/tks/pki-tks.spec
diff --git a/pki/linux/tps-ui/LICENSE b/pki/dogtag/tps-ui/LICENSE
index e36f2269a..e36f2269a 100644
--- a/pki/linux/tps-ui/LICENSE
+++ b/pki/dogtag/tps-ui/LICENSE
diff --git a/pki/linux/tps-ui/build.xml b/pki/dogtag/tps-ui/build.xml
index 8874336bc..8874336bc 100644
--- a/pki/linux/tps-ui/build.xml
+++ b/pki/dogtag/tps-ui/build.xml
diff --git a/pki/linux/tps-ui/build_linux b/pki/dogtag/tps-ui/build_linux
index 428562e99..428562e99 100755
--- a/pki/linux/tps-ui/build_linux
+++ b/pki/dogtag/tps-ui/build_linux
diff --git a/pki/linux/tps-ui/config-ext/build_linux_pki b/pki/dogtag/tps-ui/config-ext/build_linux_pki
index d9ea91e8c..d9ea91e8c 100755
--- a/pki/linux/tps-ui/config-ext/build_linux_pki
+++ b/pki/dogtag/tps-ui/config-ext/build_linux_pki
diff --git a/pki/linux/tps-ui/config/product.xml b/pki/dogtag/tps-ui/config/product.xml
index 33caf48ed..33caf48ed 100644
--- a/pki/linux/tps-ui/config/product.xml
+++ b/pki/dogtag/tps-ui/config/product.xml
diff --git a/pki/linux/tps-ui/config/release.xml b/pki/dogtag/tps-ui/config/release.xml
index fc43aaeb7..fc43aaeb7 100644
--- a/pki/linux/tps-ui/config/release.xml
+++ b/pki/dogtag/tps-ui/config/release.xml
diff --git a/pki/linux/tps-ui/pki-tps-ui.spec b/pki/dogtag/tps-ui/pki-tps-ui.spec
index a88367d64..a88367d64 100644
--- a/pki/linux/tps-ui/pki-tps-ui.spec
+++ b/pki/dogtag/tps-ui/pki-tps-ui.spec
diff --git a/pki/linux/tps-ui/shared/cgi-bin/demo/Enroll.html b/pki/dogtag/tps-ui/shared/cgi-bin/demo/Enroll.html
index 79d5a30f1..79d5a30f1 100755
--- a/pki/linux/tps-ui/shared/cgi-bin/demo/Enroll.html
+++ b/pki/dogtag/tps-ui/shared/cgi-bin/demo/Enroll.html
diff --git a/pki/linux/tps-ui/shared/cgi-bin/home/Enroll.html b/pki/dogtag/tps-ui/shared/cgi-bin/home/Enroll.html
index 0d2f2735f..0d2f2735f 100755
--- a/pki/linux/tps-ui/shared/cgi-bin/home/Enroll.html
+++ b/pki/dogtag/tps-ui/shared/cgi-bin/home/Enroll.html
diff --git a/pki/linux/tps-ui/shared/cgi-bin/so/Enroll.html b/pki/dogtag/tps-ui/shared/cgi-bin/so/Enroll.html
index 7980a9cf0..7980a9cf0 100755
--- a/pki/linux/tps-ui/shared/cgi-bin/so/Enroll.html
+++ b/pki/dogtag/tps-ui/shared/cgi-bin/so/Enroll.html
diff --git a/pki/linux/tps-ui/shared/cgi-bin/sow/cfg.pl b/pki/dogtag/tps-ui/shared/cgi-bin/sow/cfg.pl
index 79c236bbd..79c236bbd 100755
--- a/pki/linux/tps-ui/shared/cgi-bin/sow/cfg.pl
+++ b/pki/dogtag/tps-ui/shared/cgi-bin/sow/cfg.pl
diff --git a/pki/linux/tps-ui/shared/cgi-bin/sow/enroll.html b/pki/dogtag/tps-ui/shared/cgi-bin/sow/enroll.html
index 605d2274e..605d2274e 100755
--- a/pki/linux/tps-ui/shared/cgi-bin/sow/enroll.html
+++ b/pki/dogtag/tps-ui/shared/cgi-bin/sow/enroll.html
diff --git a/pki/linux/tps-ui/shared/cgi-bin/sow/enroll_temp.html b/pki/dogtag/tps-ui/shared/cgi-bin/sow/enroll_temp.html
index b72add5c5..b72add5c5 100755
--- a/pki/linux/tps-ui/shared/cgi-bin/sow/enroll_temp.html
+++ b/pki/dogtag/tps-ui/shared/cgi-bin/sow/enroll_temp.html
diff --git a/pki/linux/tps-ui/shared/cgi-bin/sow/format.html b/pki/dogtag/tps-ui/shared/cgi-bin/sow/format.html
index 30989aa07..30989aa07 100755
--- a/pki/linux/tps-ui/shared/cgi-bin/sow/format.html
+++ b/pki/dogtag/tps-ui/shared/cgi-bin/sow/format.html
diff --git a/pki/linux/tps-ui/shared/cgi-bin/sow/formatso.html b/pki/dogtag/tps-ui/shared/cgi-bin/sow/formatso.html
index dcfae82d9..dcfae82d9 100755
--- a/pki/linux/tps-ui/shared/cgi-bin/sow/formatso.html
+++ b/pki/dogtag/tps-ui/shared/cgi-bin/sow/formatso.html
diff --git a/pki/linux/tps-ui/shared/cgi-bin/sow/main.html b/pki/dogtag/tps-ui/shared/cgi-bin/sow/main.html
index c4e5fc081..c4e5fc081 100755
--- a/pki/linux/tps-ui/shared/cgi-bin/sow/main.html
+++ b/pki/dogtag/tps-ui/shared/cgi-bin/sow/main.html
diff --git a/pki/linux/tps-ui/shared/cgi-bin/sow/noaccess.html b/pki/dogtag/tps-ui/shared/cgi-bin/sow/noaccess.html
index 1a315019b..1a315019b 100755
--- a/pki/linux/tps-ui/shared/cgi-bin/sow/noaccess.html
+++ b/pki/dogtag/tps-ui/shared/cgi-bin/sow/noaccess.html
diff --git a/pki/linux/tps-ui/shared/cgi-bin/sow/read.html b/pki/dogtag/tps-ui/shared/cgi-bin/sow/read.html
index 640053364..640053364 100755
--- a/pki/linux/tps-ui/shared/cgi-bin/sow/read.html
+++ b/pki/dogtag/tps-ui/shared/cgi-bin/sow/read.html
diff --git a/pki/linux/tps-ui/shared/cgi-bin/sow/read_temp.html b/pki/dogtag/tps-ui/shared/cgi-bin/sow/read_temp.html
index 640053364..640053364 100755
--- a/pki/linux/tps-ui/shared/cgi-bin/sow/read_temp.html
+++ b/pki/dogtag/tps-ui/shared/cgi-bin/sow/read_temp.html
diff --git a/pki/linux/tps-ui/shared/cgi-bin/sow/search.html b/pki/dogtag/tps-ui/shared/cgi-bin/sow/search.html
index b0d00f350..b0d00f350 100755
--- a/pki/linux/tps-ui/shared/cgi-bin/sow/search.html
+++ b/pki/dogtag/tps-ui/shared/cgi-bin/sow/search.html
diff --git a/pki/linux/tps-ui/shared/cgi-bin/sow/search_temp.html b/pki/dogtag/tps-ui/shared/cgi-bin/sow/search_temp.html
index 6f9b6d1d8..6f9b6d1d8 100755
--- a/pki/linux/tps-ui/shared/cgi-bin/sow/search_temp.html
+++ b/pki/dogtag/tps-ui/shared/cgi-bin/sow/search_temp.html
diff --git a/pki/linux/tps-ui/shared/cgi-bin/sow/seturl.html b/pki/dogtag/tps-ui/shared/cgi-bin/sow/seturl.html
index 91ece7d6f..91ece7d6f 100755
--- a/pki/linux/tps-ui/shared/cgi-bin/sow/seturl.html
+++ b/pki/dogtag/tps-ui/shared/cgi-bin/sow/seturl.html
diff --git a/pki/linux/tps-ui/shared/cgi-bin/sow/welcome.html b/pki/dogtag/tps-ui/shared/cgi-bin/sow/welcome.html
index 1ede1edbf..1ede1edbf 100755
--- a/pki/linux/tps-ui/shared/cgi-bin/sow/welcome.html
+++ b/pki/dogtag/tps-ui/shared/cgi-bin/sow/welcome.html
diff --git a/pki/linux/tps-ui/shared/docroot/css/pki-360.css b/pki/dogtag/tps-ui/shared/docroot/css/pki-360.css
index ac94e691b..ac94e691b 100644
--- a/pki/linux/tps-ui/shared/docroot/css/pki-360.css
+++ b/pki/dogtag/tps-ui/shared/docroot/css/pki-360.css
diff --git a/pki/linux/tps-ui/shared/docroot/css/pki-base.css b/pki/dogtag/tps-ui/shared/docroot/css/pki-base.css
index f752e84b1..f752e84b1 100644
--- a/pki/linux/tps-ui/shared/docroot/css/pki-base.css
+++ b/pki/dogtag/tps-ui/shared/docroot/css/pki-base.css
diff --git a/pki/linux/tps-ui/shared/docroot/css/pki.css b/pki/dogtag/tps-ui/shared/docroot/css/pki.css
index 39461f35f..39461f35f 100644
--- a/pki/linux/tps-ui/shared/docroot/css/pki.css
+++ b/pki/dogtag/tps-ui/shared/docroot/css/pki.css
diff --git a/pki/linux/tps-ui/shared/docroot/esc/AdminEsc.html b/pki/dogtag/tps-ui/shared/docroot/esc/AdminEsc.html
index 997de8e54..997de8e54 100755
--- a/pki/linux/tps-ui/shared/docroot/esc/AdminEsc.html
+++ b/pki/dogtag/tps-ui/shared/docroot/esc/AdminEsc.html
diff --git a/pki/linux/tps-ui/shared/docroot/esc/AdvancePopup.html b/pki/dogtag/tps-ui/shared/docroot/esc/AdvancePopup.html
index c2698d45e..c2698d45e 100755
--- a/pki/linux/tps-ui/shared/docroot/esc/AdvancePopup.html
+++ b/pki/dogtag/tps-ui/shared/docroot/esc/AdvancePopup.html
diff --git a/pki/linux/tps-ui/shared/docroot/esc/EnrollPopup.html b/pki/dogtag/tps-ui/shared/docroot/esc/EnrollPopup.html
index 46cd6d450..46cd6d450 100755
--- a/pki/linux/tps-ui/shared/docroot/esc/EnrollPopup.html
+++ b/pki/dogtag/tps-ui/shared/docroot/esc/EnrollPopup.html
diff --git a/pki/linux/tps-ui/shared/docroot/esc/GenericAuth.html b/pki/dogtag/tps-ui/shared/docroot/esc/GenericAuth.html
index 0e857c5da..0e857c5da 100755
--- a/pki/linux/tps-ui/shared/docroot/esc/GenericAuth.html
+++ b/pki/dogtag/tps-ui/shared/docroot/esc/GenericAuth.html
diff --git a/pki/linux/tps-ui/shared/docroot/esc/SettingsEsc.html b/pki/dogtag/tps-ui/shared/docroot/esc/SettingsEsc.html
index 9ffeb69a3..9ffeb69a3 100755
--- a/pki/linux/tps-ui/shared/docroot/esc/SettingsEsc.html
+++ b/pki/dogtag/tps-ui/shared/docroot/esc/SettingsEsc.html
diff --git a/pki/linux/tps-ui/shared/docroot/esc/TokenManager.html b/pki/dogtag/tps-ui/shared/docroot/esc/TokenManager.html
index 2f28889ef..2f28889ef 100755
--- a/pki/linux/tps-ui/shared/docroot/esc/TokenManager.html
+++ b/pki/dogtag/tps-ui/shared/docroot/esc/TokenManager.html
diff --git a/pki/linux/tps-ui/shared/docroot/esc/TokenPin.html b/pki/dogtag/tps-ui/shared/docroot/esc/TokenPin.html
index c73d6f108..c73d6f108 100755
--- a/pki/linux/tps-ui/shared/docroot/esc/TokenPin.html
+++ b/pki/dogtag/tps-ui/shared/docroot/esc/TokenPin.html
diff --git a/pki/linux/tps-ui/shared/docroot/esc/demo/EnrollSuccess.html b/pki/dogtag/tps-ui/shared/docroot/esc/demo/EnrollSuccess.html
index c266efef4..c266efef4 100644
--- a/pki/linux/tps-ui/shared/docroot/esc/demo/EnrollSuccess.html
+++ b/pki/dogtag/tps-ui/shared/docroot/esc/demo/EnrollSuccess.html
diff --git a/pki/linux/tps-ui/shared/docroot/esc/demo/GenericAuth.html b/pki/dogtag/tps-ui/shared/docroot/esc/demo/GenericAuth.html
index 7c3189a10..7c3189a10 100755
--- a/pki/linux/tps-ui/shared/docroot/esc/demo/GenericAuth.html
+++ b/pki/dogtag/tps-ui/shared/docroot/esc/demo/GenericAuth.html
diff --git a/pki/linux/tps-ui/shared/docroot/esc/demo/logo.jpg b/pki/dogtag/tps-ui/shared/docroot/esc/demo/logo.jpg
index 7cb31affc..7cb31affc 100644
--- a/pki/linux/tps-ui/shared/docroot/esc/demo/logo.jpg
+++ b/pki/dogtag/tps-ui/shared/docroot/esc/demo/logo.jpg
diff --git a/pki/linux/tps-ui/shared/docroot/esc/demo/style.css b/pki/dogtag/tps-ui/shared/docroot/esc/demo/style.css
index e9d7d9bf7..e9d7d9bf7 100755
--- a/pki/linux/tps-ui/shared/docroot/esc/demo/style.css
+++ b/pki/dogtag/tps-ui/shared/docroot/esc/demo/style.css
diff --git a/pki/linux/tps-ui/shared/docroot/esc/demo/util.js b/pki/dogtag/tps-ui/shared/docroot/esc/demo/util.js
index f4a854fd3..f4a854fd3 100755
--- a/pki/linux/tps-ui/shared/docroot/esc/demo/util.js
+++ b/pki/dogtag/tps-ui/shared/docroot/esc/demo/util.js
diff --git a/pki/linux/tps-ui/shared/docroot/esc/home/EnrollSuccess.html b/pki/dogtag/tps-ui/shared/docroot/esc/home/EnrollSuccess.html
index 5c53f3338..5c53f3338 100644
--- a/pki/linux/tps-ui/shared/docroot/esc/home/EnrollSuccess.html
+++ b/pki/dogtag/tps-ui/shared/docroot/esc/home/EnrollSuccess.html
diff --git a/pki/linux/tps-ui/shared/docroot/esc/home/GenericAuth.html b/pki/dogtag/tps-ui/shared/docroot/esc/home/GenericAuth.html
index 5660a7c50..5660a7c50 100755
--- a/pki/linux/tps-ui/shared/docroot/esc/home/GenericAuth.html
+++ b/pki/dogtag/tps-ui/shared/docroot/esc/home/GenericAuth.html
diff --git a/pki/linux/tps-ui/shared/docroot/esc/home/logo.jpg b/pki/dogtag/tps-ui/shared/docroot/esc/home/logo.jpg
index 7cb31affc..7cb31affc 100644
--- a/pki/linux/tps-ui/shared/docroot/esc/home/logo.jpg
+++ b/pki/dogtag/tps-ui/shared/docroot/esc/home/logo.jpg
diff --git a/pki/linux/tps-ui/shared/docroot/esc/home/style.css b/pki/dogtag/tps-ui/shared/docroot/esc/home/style.css
index e9d7d9bf7..e9d7d9bf7 100755
--- a/pki/linux/tps-ui/shared/docroot/esc/home/style.css
+++ b/pki/dogtag/tps-ui/shared/docroot/esc/home/style.css
diff --git a/pki/linux/tps-ui/shared/docroot/esc/home/util.js b/pki/dogtag/tps-ui/shared/docroot/esc/home/util.js
index a4d4396b3..a4d4396b3 100755
--- a/pki/linux/tps-ui/shared/docroot/esc/home/util.js
+++ b/pki/dogtag/tps-ui/shared/docroot/esc/home/util.js
diff --git a/pki/linux/tps-ui/shared/docroot/esc/images/BannerBackground.gif b/pki/dogtag/tps-ui/shared/docroot/esc/images/BannerBackground.gif
index 55d41f6ea..55d41f6ea 100755
--- a/pki/linux/tps-ui/shared/docroot/esc/images/BannerBackground.gif
+++ b/pki/dogtag/tps-ui/shared/docroot/esc/images/BannerBackground.gif
diff --git a/pki/linux/tps-ui/shared/docroot/esc/images/CancelButton.gif b/pki/dogtag/tps-ui/shared/docroot/esc/images/CancelButton.gif
index 5b2f7e53a..5b2f7e53a 100755
--- a/pki/linux/tps-ui/shared/docroot/esc/images/CancelButton.gif
+++ b/pki/dogtag/tps-ui/shared/docroot/esc/images/CancelButton.gif
diff --git a/pki/linux/tps-ui/shared/docroot/esc/images/CloseButton.gif b/pki/dogtag/tps-ui/shared/docroot/esc/images/CloseButton.gif
index f0a8230a1..f0a8230a1 100755
--- a/pki/linux/tps-ui/shared/docroot/esc/images/CloseButton.gif
+++ b/pki/dogtag/tps-ui/shared/docroot/esc/images/CloseButton.gif
diff --git a/pki/linux/tps-ui/shared/docroot/esc/images/ContinueButton.gif b/pki/dogtag/tps-ui/shared/docroot/esc/images/ContinueButton.gif
index 3a6867258..3a6867258 100755
--- a/pki/linux/tps-ui/shared/docroot/esc/images/ContinueButton.gif
+++ b/pki/dogtag/tps-ui/shared/docroot/esc/images/ContinueButton.gif
diff --git a/pki/linux/tps-ui/shared/docroot/esc/images/HelpButton.gif b/pki/dogtag/tps-ui/shared/docroot/esc/images/HelpButton.gif
index 43e55dce2..43e55dce2 100755
--- a/pki/linux/tps-ui/shared/docroot/esc/images/HelpButton.gif
+++ b/pki/dogtag/tps-ui/shared/docroot/esc/images/HelpButton.gif
diff --git a/pki/linux/tps-ui/shared/docroot/esc/images/NetKey-Small.gif b/pki/dogtag/tps-ui/shared/docroot/esc/images/NetKey-Small.gif
index 6fed0d5ce..6fed0d5ce 100755
--- a/pki/linux/tps-ui/shared/docroot/esc/images/NetKey-Small.gif
+++ b/pki/dogtag/tps-ui/shared/docroot/esc/images/NetKey-Small.gif
diff --git a/pki/linux/tps-ui/shared/docroot/esc/images/NetKeyInsert.gif b/pki/dogtag/tps-ui/shared/docroot/esc/images/NetKeyInsert.gif
index 4fb74b2b7..4fb74b2b7 100755
--- a/pki/linux/tps-ui/shared/docroot/esc/images/NetKeyInsert.gif
+++ b/pki/dogtag/tps-ui/shared/docroot/esc/images/NetKeyInsert.gif
diff --git a/pki/linux/tps-ui/shared/docroot/esc/images/NetKeyLogo.gif b/pki/dogtag/tps-ui/shared/docroot/esc/images/NetKeyLogo.gif
index 53af00410..53af00410 100755
--- a/pki/linux/tps-ui/shared/docroot/esc/images/NetKeyLogo.gif
+++ b/pki/dogtag/tps-ui/shared/docroot/esc/images/NetKeyLogo.gif
diff --git a/pki/linux/tps-ui/shared/docroot/esc/images/NetKeyPair.gif b/pki/dogtag/tps-ui/shared/docroot/esc/images/NetKeyPair.gif
index b1ff91b5e..b1ff91b5e 100755
--- a/pki/linux/tps-ui/shared/docroot/esc/images/NetKeyPair.gif
+++ b/pki/dogtag/tps-ui/shared/docroot/esc/images/NetKeyPair.gif
diff --git a/pki/linux/tps-ui/shared/docroot/esc/images/NetKeyProgress.gif b/pki/dogtag/tps-ui/shared/docroot/esc/images/NetKeyProgress.gif
index aaadf358f..aaadf358f 100755
--- a/pki/linux/tps-ui/shared/docroot/esc/images/NetKeyProgress.gif
+++ b/pki/dogtag/tps-ui/shared/docroot/esc/images/NetKeyProgress.gif
diff --git a/pki/linux/tps-ui/shared/docroot/esc/images/NetKeyQuestionMark.gif b/pki/dogtag/tps-ui/shared/docroot/esc/images/NetKeyQuestionMark.gif
index b12a77908..b12a77908 100755
--- a/pki/linux/tps-ui/shared/docroot/esc/images/NetKeyQuestionMark.gif
+++ b/pki/dogtag/tps-ui/shared/docroot/esc/images/NetKeyQuestionMark.gif
diff --git a/pki/linux/tps-ui/shared/docroot/esc/images/OKButton.gif b/pki/dogtag/tps-ui/shared/docroot/esc/images/OKButton.gif
index 64d69e440..64d69e440 100755
--- a/pki/linux/tps-ui/shared/docroot/esc/images/OKButton.gif
+++ b/pki/dogtag/tps-ui/shared/docroot/esc/images/OKButton.gif
diff --git a/pki/linux/tps-ui/shared/docroot/esc/images/PadLock.gif b/pki/dogtag/tps-ui/shared/docroot/esc/images/PadLock.gif
index 5e4e044c8..5e4e044c8 100755
--- a/pki/linux/tps-ui/shared/docroot/esc/images/PadLock.gif
+++ b/pki/dogtag/tps-ui/shared/docroot/esc/images/PadLock.gif
diff --git a/pki/linux/tps-ui/shared/docroot/esc/images/PurchaseButton.gif b/pki/dogtag/tps-ui/shared/docroot/esc/images/PurchaseButton.gif
index beb0dacab..beb0dacab 100755
--- a/pki/linux/tps-ui/shared/docroot/esc/images/PurchaseButton.gif
+++ b/pki/dogtag/tps-ui/shared/docroot/esc/images/PurchaseButton.gif
diff --git a/pki/linux/tps-ui/shared/docroot/esc/images/ReactivateButton.gif b/pki/dogtag/tps-ui/shared/docroot/esc/images/ReactivateButton.gif
index 86de2eb68..86de2eb68 100755
--- a/pki/linux/tps-ui/shared/docroot/esc/images/ReactivateButton.gif
+++ b/pki/dogtag/tps-ui/shared/docroot/esc/images/ReactivateButton.gif
diff --git a/pki/linux/tps-ui/shared/docroot/esc/images/ReleaseButton.gif b/pki/dogtag/tps-ui/shared/docroot/esc/images/ReleaseButton.gif
index 7ab79be8c..7ab79be8c 100755
--- a/pki/linux/tps-ui/shared/docroot/esc/images/ReleaseButton.gif
+++ b/pki/dogtag/tps-ui/shared/docroot/esc/images/ReleaseButton.gif
diff --git a/pki/linux/tps-ui/shared/docroot/esc/images/SecureButton.gif b/pki/dogtag/tps-ui/shared/docroot/esc/images/SecureButton.gif
index fc37f2a77..fc37f2a77 100755
--- a/pki/linux/tps-ui/shared/docroot/esc/images/SecureButton.gif
+++ b/pki/dogtag/tps-ui/shared/docroot/esc/images/SecureButton.gif
diff --git a/pki/linux/tps-ui/shared/docroot/esc/images/SuspendButton.gif b/pki/dogtag/tps-ui/shared/docroot/esc/images/SuspendButton.gif
index 24ac0337a..24ac0337a 100755
--- a/pki/linux/tps-ui/shared/docroot/esc/images/SuspendButton.gif
+++ b/pki/dogtag/tps-ui/shared/docroot/esc/images/SuspendButton.gif
diff --git a/pki/linux/tps-ui/shared/docroot/esc/images/TryAgainButton.gif b/pki/dogtag/tps-ui/shared/docroot/esc/images/TryAgainButton.gif
index e71934677..e71934677 100755
--- a/pki/linux/tps-ui/shared/docroot/esc/images/TryAgainButton.gif
+++ b/pki/dogtag/tps-ui/shared/docroot/esc/images/TryAgainButton.gif
diff --git a/pki/linux/tps-ui/shared/docroot/esc/images/bg.jpg b/pki/dogtag/tps-ui/shared/docroot/esc/images/bg.jpg
index 56a4af048..56a4af048 100755
--- a/pki/linux/tps-ui/shared/docroot/esc/images/bg.jpg
+++ b/pki/dogtag/tps-ui/shared/docroot/esc/images/bg.jpg
diff --git a/pki/linux/tps-ui/shared/docroot/esc/images/logo.gif b/pki/dogtag/tps-ui/shared/docroot/esc/images/logo.gif
index 2d1ea5579..2d1ea5579 100644
--- a/pki/linux/tps-ui/shared/docroot/esc/images/logo.gif
+++ b/pki/dogtag/tps-ui/shared/docroot/esc/images/logo.gif
diff --git a/pki/linux/tps-ui/shared/docroot/esc/so/EnrollSuccess.html b/pki/dogtag/tps-ui/shared/docroot/esc/so/EnrollSuccess.html
index edfa30e6b..edfa30e6b 100644
--- a/pki/linux/tps-ui/shared/docroot/esc/so/EnrollSuccess.html
+++ b/pki/dogtag/tps-ui/shared/docroot/esc/so/EnrollSuccess.html
diff --git a/pki/linux/tps-ui/shared/docroot/esc/so/GenericAuth.html b/pki/dogtag/tps-ui/shared/docroot/esc/so/GenericAuth.html
index 5660a7c50..5660a7c50 100755
--- a/pki/linux/tps-ui/shared/docroot/esc/so/GenericAuth.html
+++ b/pki/dogtag/tps-ui/shared/docroot/esc/so/GenericAuth.html
diff --git a/pki/linux/tps-ui/shared/docroot/esc/so/logo.jpg b/pki/dogtag/tps-ui/shared/docroot/esc/so/logo.jpg
index 7cb31affc..7cb31affc 100644
--- a/pki/linux/tps-ui/shared/docroot/esc/so/logo.jpg
+++ b/pki/dogtag/tps-ui/shared/docroot/esc/so/logo.jpg
diff --git a/pki/linux/tps-ui/shared/docroot/esc/so/style.css b/pki/dogtag/tps-ui/shared/docroot/esc/so/style.css
index e9d7d9bf7..e9d7d9bf7 100755
--- a/pki/linux/tps-ui/shared/docroot/esc/so/style.css
+++ b/pki/dogtag/tps-ui/shared/docroot/esc/so/style.css
diff --git a/pki/linux/tps-ui/shared/docroot/esc/so/util.js b/pki/dogtag/tps-ui/shared/docroot/esc/so/util.js
index 76e14014c..76e14014c 100755
--- a/pki/linux/tps-ui/shared/docroot/esc/so/util.js
+++ b/pki/dogtag/tps-ui/shared/docroot/esc/so/util.js
diff --git a/pki/linux/tps-ui/shared/docroot/esc/sow/EnrollSuccess.html b/pki/dogtag/tps-ui/shared/docroot/esc/sow/EnrollSuccess.html
index 3b2096308..3b2096308 100644
--- a/pki/linux/tps-ui/shared/docroot/esc/sow/EnrollSuccess.html
+++ b/pki/dogtag/tps-ui/shared/docroot/esc/sow/EnrollSuccess.html
diff --git a/pki/linux/tps-ui/shared/docroot/esc/sow/GenericAuth.html b/pki/dogtag/tps-ui/shared/docroot/esc/sow/GenericAuth.html
index 5660a7c50..5660a7c50 100755
--- a/pki/linux/tps-ui/shared/docroot/esc/sow/GenericAuth.html
+++ b/pki/dogtag/tps-ui/shared/docroot/esc/sow/GenericAuth.html
diff --git a/pki/linux/tps-ui/shared/docroot/esc/sow/images/logo.gif b/pki/dogtag/tps-ui/shared/docroot/esc/sow/images/logo.gif
index 2d1ea5579..2d1ea5579 100644
--- a/pki/linux/tps-ui/shared/docroot/esc/sow/images/logo.gif
+++ b/pki/dogtag/tps-ui/shared/docroot/esc/sow/images/logo.gif
diff --git a/pki/linux/tps-ui/shared/docroot/esc/sow/logo.jpg b/pki/dogtag/tps-ui/shared/docroot/esc/sow/logo.jpg
index 7cb31affc..7cb31affc 100644
--- a/pki/linux/tps-ui/shared/docroot/esc/sow/logo.jpg
+++ b/pki/dogtag/tps-ui/shared/docroot/esc/sow/logo.jpg
diff --git a/pki/linux/tps-ui/shared/docroot/esc/sow/style.css b/pki/dogtag/tps-ui/shared/docroot/esc/sow/style.css
index e9d7d9bf7..e9d7d9bf7 100755
--- a/pki/linux/tps-ui/shared/docroot/esc/sow/style.css
+++ b/pki/dogtag/tps-ui/shared/docroot/esc/sow/style.css
diff --git a/pki/linux/tps-ui/shared/docroot/esc/sow/util.js b/pki/dogtag/tps-ui/shared/docroot/esc/sow/util.js
index 2af341937..2af341937 100755
--- a/pki/linux/tps-ui/shared/docroot/esc/sow/util.js
+++ b/pki/dogtag/tps-ui/shared/docroot/esc/sow/util.js
diff --git a/pki/linux/tps-ui/shared/docroot/esc/style.css b/pki/dogtag/tps-ui/shared/docroot/esc/style.css
index f85d18ee2..f85d18ee2 100755
--- a/pki/linux/tps-ui/shared/docroot/esc/style.css
+++ b/pki/dogtag/tps-ui/shared/docroot/esc/style.css
diff --git a/pki/linux/tps-ui/shared/docroot/tokendb/addResults.template b/pki/dogtag/tps-ui/shared/docroot/tokendb/addResults.template
index c02b2d9dc..c02b2d9dc 100644
--- a/pki/linux/tps-ui/shared/docroot/tokendb/addResults.template
+++ b/pki/dogtag/tps-ui/shared/docroot/tokendb/addResults.template
diff --git a/pki/linux/tps-ui/shared/docroot/tokendb/delete.template b/pki/dogtag/tps-ui/shared/docroot/tokendb/delete.template
index bb5dda0dc..bb5dda0dc 100644
--- a/pki/linux/tps-ui/shared/docroot/tokendb/delete.template
+++ b/pki/dogtag/tps-ui/shared/docroot/tokendb/delete.template
diff --git a/pki/linux/tps-ui/shared/docroot/tokendb/deleteResults.template b/pki/dogtag/tps-ui/shared/docroot/tokendb/deleteResults.template
index d15dd6827..d15dd6827 100644
--- a/pki/linux/tps-ui/shared/docroot/tokendb/deleteResults.template
+++ b/pki/dogtag/tps-ui/shared/docroot/tokendb/deleteResults.template
diff --git a/pki/linux/tps-ui/shared/docroot/tokendb/doToken.template b/pki/dogtag/tps-ui/shared/docroot/tokendb/doToken.template
index e682df99f..e682df99f 100644
--- a/pki/linux/tps-ui/shared/docroot/tokendb/doToken.template
+++ b/pki/dogtag/tps-ui/shared/docroot/tokendb/doToken.template
diff --git a/pki/linux/tps-ui/shared/docroot/tokendb/doTokenConfirm.template b/pki/dogtag/tps-ui/shared/docroot/tokendb/doTokenConfirm.template
index 06b642ead..06b642ead 100644
--- a/pki/linux/tps-ui/shared/docroot/tokendb/doTokenConfirm.template
+++ b/pki/dogtag/tps-ui/shared/docroot/tokendb/doTokenConfirm.template
diff --git a/pki/linux/tps-ui/shared/docroot/tokendb/edit.template b/pki/dogtag/tps-ui/shared/docroot/tokendb/edit.template
index e94bdf91e..e94bdf91e 100644
--- a/pki/linux/tps-ui/shared/docroot/tokendb/edit.template
+++ b/pki/dogtag/tps-ui/shared/docroot/tokendb/edit.template
diff --git a/pki/linux/tps-ui/shared/docroot/tokendb/editAdmin.template b/pki/dogtag/tps-ui/shared/docroot/tokendb/editAdmin.template
index fea19cba3..fea19cba3 100644
--- a/pki/linux/tps-ui/shared/docroot/tokendb/editAdmin.template
+++ b/pki/dogtag/tps-ui/shared/docroot/tokendb/editAdmin.template
diff --git a/pki/linux/tps-ui/shared/docroot/tokendb/editAdminResults.template b/pki/dogtag/tps-ui/shared/docroot/tokendb/editAdminResults.template
index 07a25b833..07a25b833 100644
--- a/pki/linux/tps-ui/shared/docroot/tokendb/editAdminResults.template
+++ b/pki/dogtag/tps-ui/shared/docroot/tokendb/editAdminResults.template
diff --git a/pki/linux/tps-ui/shared/docroot/tokendb/editResults.template b/pki/dogtag/tps-ui/shared/docroot/tokendb/editResults.template
index f0f52b701..f0f52b701 100644
--- a/pki/linux/tps-ui/shared/docroot/tokendb/editResults.template
+++ b/pki/dogtag/tps-ui/shared/docroot/tokendb/editResults.template
diff --git a/pki/linux/tps-ui/shared/docroot/tokendb/error.template b/pki/dogtag/tps-ui/shared/docroot/tokendb/error.template
index e0bfcb22b..e0bfcb22b 100644
--- a/pki/linux/tps-ui/shared/docroot/tokendb/error.template
+++ b/pki/dogtag/tps-ui/shared/docroot/tokendb/error.template
diff --git a/pki/linux/tps-ui/shared/docroot/tokendb/index.template b/pki/dogtag/tps-ui/shared/docroot/tokendb/index.template
index 69c377f1a..69c377f1a 100644
--- a/pki/linux/tps-ui/shared/docroot/tokendb/index.template
+++ b/pki/dogtag/tps-ui/shared/docroot/tokendb/index.template
diff --git a/pki/linux/tps-ui/shared/docroot/tokendb/indexAdmin.template b/pki/dogtag/tps-ui/shared/docroot/tokendb/indexAdmin.template
index 7f5413409..7f5413409 100644
--- a/pki/linux/tps-ui/shared/docroot/tokendb/indexAdmin.template
+++ b/pki/dogtag/tps-ui/shared/docroot/tokendb/indexAdmin.template
diff --git a/pki/linux/tps-ui/shared/docroot/tokendb/new.template b/pki/dogtag/tps-ui/shared/docroot/tokendb/new.template
index a429ce5ad..a429ce5ad 100644
--- a/pki/linux/tps-ui/shared/docroot/tokendb/new.template
+++ b/pki/dogtag/tps-ui/shared/docroot/tokendb/new.template
diff --git a/pki/linux/tps-ui/shared/docroot/tokendb/revoke.template b/pki/dogtag/tps-ui/shared/docroot/tokendb/revoke.template
index 2d223287c..2d223287c 100644
--- a/pki/linux/tps-ui/shared/docroot/tokendb/revoke.template
+++ b/pki/dogtag/tps-ui/shared/docroot/tokendb/revoke.template
diff --git a/pki/linux/tps-ui/shared/docroot/tokendb/search.template b/pki/dogtag/tps-ui/shared/docroot/tokendb/search.template
index 929796080..929796080 100644
--- a/pki/linux/tps-ui/shared/docroot/tokendb/search.template
+++ b/pki/dogtag/tps-ui/shared/docroot/tokendb/search.template
diff --git a/pki/linux/tps-ui/shared/docroot/tokendb/searchActivity.template b/pki/dogtag/tps-ui/shared/docroot/tokendb/searchActivity.template
index d271f0144..d271f0144 100644
--- a/pki/linux/tps-ui/shared/docroot/tokendb/searchActivity.template
+++ b/pki/dogtag/tps-ui/shared/docroot/tokendb/searchActivity.template
diff --git a/pki/linux/tps-ui/shared/docroot/tokendb/searchActivityResults.template b/pki/dogtag/tps-ui/shared/docroot/tokendb/searchActivityResults.template
index 505ded271..505ded271 100644
--- a/pki/linux/tps-ui/shared/docroot/tokendb/searchActivityResults.template
+++ b/pki/dogtag/tps-ui/shared/docroot/tokendb/searchActivityResults.template
diff --git a/pki/linux/tps-ui/shared/docroot/tokendb/searchAdmin.template b/pki/dogtag/tps-ui/shared/docroot/tokendb/searchAdmin.template
index 29cbff70c..29cbff70c 100644
--- a/pki/linux/tps-ui/shared/docroot/tokendb/searchAdmin.template
+++ b/pki/dogtag/tps-ui/shared/docroot/tokendb/searchAdmin.template
diff --git a/pki/linux/tps-ui/shared/docroot/tokendb/searchAdminResults.template b/pki/dogtag/tps-ui/shared/docroot/tokendb/searchAdminResults.template
index efe4cc37d..efe4cc37d 100644
--- a/pki/linux/tps-ui/shared/docroot/tokendb/searchAdminResults.template
+++ b/pki/dogtag/tps-ui/shared/docroot/tokendb/searchAdminResults.template
diff --git a/pki/linux/tps-ui/shared/docroot/tokendb/searchCertificate.template b/pki/dogtag/tps-ui/shared/docroot/tokendb/searchCertificate.template
index 9bb630cc5..9bb630cc5 100644
--- a/pki/linux/tps-ui/shared/docroot/tokendb/searchCertificate.template
+++ b/pki/dogtag/tps-ui/shared/docroot/tokendb/searchCertificate.template
diff --git a/pki/linux/tps-ui/shared/docroot/tokendb/searchCertificateResults.template b/pki/dogtag/tps-ui/shared/docroot/tokendb/searchCertificateResults.template
index 219ccf9a3..219ccf9a3 100644
--- a/pki/linux/tps-ui/shared/docroot/tokendb/searchCertificateResults.template
+++ b/pki/dogtag/tps-ui/shared/docroot/tokendb/searchCertificateResults.template
diff --git a/pki/linux/tps-ui/shared/docroot/tokendb/searchResults.template b/pki/dogtag/tps-ui/shared/docroot/tokendb/searchResults.template
index 833796ce6..833796ce6 100644
--- a/pki/linux/tps-ui/shared/docroot/tokendb/searchResults.template
+++ b/pki/dogtag/tps-ui/shared/docroot/tokendb/searchResults.template
diff --git a/pki/linux/tps-ui/shared/docroot/tokendb/show.template b/pki/dogtag/tps-ui/shared/docroot/tokendb/show.template
index dd5922f6f..dd5922f6f 100644
--- a/pki/linux/tps-ui/shared/docroot/tokendb/show.template
+++ b/pki/dogtag/tps-ui/shared/docroot/tokendb/show.template
diff --git a/pki/linux/tps-ui/shared/docroot/tokendb/showAdmin.template b/pki/dogtag/tps-ui/shared/docroot/tokendb/showAdmin.template
index c4f182773..c4f182773 100644
--- a/pki/linux/tps-ui/shared/docroot/tokendb/showAdmin.template
+++ b/pki/dogtag/tps-ui/shared/docroot/tokendb/showAdmin.template
diff --git a/pki/linux/tps-ui/shared/docroot/tokendb/showCert.template b/pki/dogtag/tps-ui/shared/docroot/tokendb/showCert.template
index a9c4822f0..a9c4822f0 100644
--- a/pki/linux/tps-ui/shared/docroot/tokendb/showCert.template
+++ b/pki/dogtag/tps-ui/shared/docroot/tokendb/showCert.template
diff --git a/pki/linux/tps-ui/shared/docroot/tps/admin/console/config/adminauthenticatepanel.vm b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/adminauthenticatepanel.vm
index 958ac5b1a..958ac5b1a 100644
--- a/pki/linux/tps-ui/shared/docroot/tps/admin/console/config/adminauthenticatepanel.vm
+++ b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/adminauthenticatepanel.vm
diff --git a/pki/linux/tps-ui/shared/docroot/tps/admin/console/config/adminpanel.vm b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/adminpanel.vm
index af1192adc..af1192adc 100644
--- a/pki/linux/tps-ui/shared/docroot/tps/admin/console/config/adminpanel.vm
+++ b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/adminpanel.vm
diff --git a/pki/linux/tps-ui/shared/docroot/tps/admin/console/config/agentauthenticatepanel.vm b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/agentauthenticatepanel.vm
index b4cd94704..b4cd94704 100644
--- a/pki/linux/tps-ui/shared/docroot/tps/admin/console/config/agentauthenticatepanel.vm
+++ b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/agentauthenticatepanel.vm
diff --git a/pki/linux/tps-ui/shared/docroot/tps/admin/console/config/authdbpanel.vm b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/authdbpanel.vm
index f8967afd0..f8967afd0 100644
--- a/pki/linux/tps-ui/shared/docroot/tps/admin/console/config/authdbpanel.vm
+++ b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/authdbpanel.vm
diff --git a/pki/linux/tps-ui/shared/docroot/tps/admin/console/config/cainfopanel.vm b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/cainfopanel.vm
index f53c5756e..f53c5756e 100644
--- a/pki/linux/tps-ui/shared/docroot/tps/admin/console/config/cainfopanel.vm
+++ b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/cainfopanel.vm
diff --git a/pki/linux/tps-ui/shared/docroot/tps/admin/console/config/certchainpanel.vm b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/certchainpanel.vm
index 382fd87a1..382fd87a1 100644
--- a/pki/linux/tps-ui/shared/docroot/tps/admin/console/config/certchainpanel.vm
+++ b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/certchainpanel.vm
diff --git a/pki/linux/tps-ui/shared/docroot/tps/admin/console/config/certprettyprintpanel.vm b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/certprettyprintpanel.vm
index 911b4c3c6..911b4c3c6 100644
--- a/pki/linux/tps-ui/shared/docroot/tps/admin/console/config/certprettyprintpanel.vm
+++ b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/certprettyprintpanel.vm
diff --git a/pki/linux/tps-ui/shared/docroot/tps/admin/console/config/certrequestpanel.vm b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/certrequestpanel.vm
index a0610243f..a0610243f 100644
--- a/pki/linux/tps-ui/shared/docroot/tps/admin/console/config/certrequestpanel.vm
+++ b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/certrequestpanel.vm
diff --git a/pki/linux/tps-ui/shared/docroot/tps/admin/console/config/config_addhsm.vm b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/config_addhsm.vm
index 2884625de..2884625de 100644
--- a/pki/linux/tps-ui/shared/docroot/tps/admin/console/config/config_addhsm.vm
+++ b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/config_addhsm.vm
diff --git a/pki/linux/tps-ui/shared/docroot/tps/admin/console/config/config_db.vm b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/config_db.vm
index cd87a7147..cd87a7147 100644
--- a/pki/linux/tps-ui/shared/docroot/tps/admin/console/config/config_db.vm
+++ b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/config_db.vm
diff --git a/pki/linux/tps-ui/shared/docroot/tps/admin/console/config/config_hsm.vm b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/config_hsm.vm
index 9dcb10597..9dcb10597 100644
--- a/pki/linux/tps-ui/shared/docroot/tps/admin/console/config/config_hsm.vm
+++ b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/config_hsm.vm
diff --git a/pki/linux/tps-ui/shared/docroot/tps/admin/console/config/config_hsmloginpanel.vm b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/config_hsmloginpanel.vm
index 0c2f7bdac..0c2f7bdac 100644
--- a/pki/linux/tps-ui/shared/docroot/tps/admin/console/config/config_hsmloginpanel.vm
+++ b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/config_hsmloginpanel.vm
diff --git a/pki/linux/tps-ui/shared/docroot/tps/admin/console/config/config_join.vm b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/config_join.vm
index 01106cf6a..01106cf6a 100644
--- a/pki/linux/tps-ui/shared/docroot/tps/admin/console/config/config_join.vm
+++ b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/config_join.vm
diff --git a/pki/linux/tps-ui/shared/docroot/tps/admin/console/config/config_rootca.vm b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/config_rootca.vm
index daf68be24..daf68be24 100644
--- a/pki/linux/tps-ui/shared/docroot/tps/admin/console/config/config_rootca.vm
+++ b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/config_rootca.vm
diff --git a/pki/linux/tps-ui/shared/docroot/tps/admin/console/config/createsubsystempanel.vm b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/createsubsystempanel.vm
index 1433954e7..1433954e7 100644
--- a/pki/linux/tps-ui/shared/docroot/tps/admin/console/config/createsubsystempanel.vm
+++ b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/createsubsystempanel.vm
diff --git a/pki/linux/tps-ui/shared/docroot/tps/admin/console/config/databasepanel.vm b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/databasepanel.vm
index c5fac4fcb..c5fac4fcb 100644
--- a/pki/linux/tps-ui/shared/docroot/tps/admin/console/config/databasepanel.vm
+++ b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/databasepanel.vm
diff --git a/pki/linux/tps-ui/shared/docroot/tps/admin/console/config/displaycertchain2panel.vm b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/displaycertchain2panel.vm
index 916619b81..916619b81 100644
--- a/pki/linux/tps-ui/shared/docroot/tps/admin/console/config/displaycertchain2panel.vm
+++ b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/displaycertchain2panel.vm
diff --git a/pki/linux/tps-ui/shared/docroot/tps/admin/console/config/displaycertchainpanel.vm b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/displaycertchainpanel.vm
index 4370cc737..4370cc737 100644
--- a/pki/linux/tps-ui/shared/docroot/tps/admin/console/config/displaycertchainpanel.vm
+++ b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/displaycertchainpanel.vm
diff --git a/pki/linux/tps-ui/shared/docroot/tps/admin/console/config/donepanel.vm b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/donepanel.vm
index db18fd64f..db18fd64f 100644
--- a/pki/linux/tps-ui/shared/docroot/tps/admin/console/config/donepanel.vm
+++ b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/donepanel.vm
diff --git a/pki/linux/tps-ui/shared/docroot/tps/admin/console/config/drminfopanel.vm b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/drminfopanel.vm
index be777240c..be777240c 100644
--- a/pki/linux/tps-ui/shared/docroot/tps/admin/console/config/drminfopanel.vm
+++ b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/drminfopanel.vm
diff --git a/pki/linux/tps-ui/shared/docroot/tps/admin/console/config/footer.vm b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/footer.vm
index 3cb61244f..3cb61244f 100644
--- a/pki/linux/tps-ui/shared/docroot/tps/admin/console/config/footer.vm
+++ b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/footer.vm
diff --git a/pki/linux/tps-ui/shared/docroot/tps/admin/console/config/header.vm b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/header.vm
index b8d0e9d1a..b8d0e9d1a 100644
--- a/pki/linux/tps-ui/shared/docroot/tps/admin/console/config/header.vm
+++ b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/header.vm
diff --git a/pki/linux/tps-ui/shared/docroot/tps/admin/console/config/hierarchypanel.vm b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/hierarchypanel.vm
index 3eddc67a8..3eddc67a8 100644
--- a/pki/linux/tps-ui/shared/docroot/tps/admin/console/config/hierarchypanel.vm
+++ b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/hierarchypanel.vm
diff --git a/pki/linux/tps-ui/shared/docroot/tps/admin/console/config/importadmincertpanel.vm b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/importadmincertpanel.vm
index b597db6fd..b597db6fd 100644
--- a/pki/linux/tps-ui/shared/docroot/tps/admin/console/config/importadmincertpanel.vm
+++ b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/importadmincertpanel.vm
diff --git a/pki/linux/tps-ui/shared/docroot/tps/admin/console/config/login.vm b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/login.vm
index 26efabee2..26efabee2 100644
--- a/pki/linux/tps-ui/shared/docroot/tps/admin/console/config/login.vm
+++ b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/login.vm
diff --git a/pki/linux/tps-ui/shared/docroot/tps/admin/console/config/modulepanel.vm b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/modulepanel.vm
index a70200bec..a70200bec 100644
--- a/pki/linux/tps-ui/shared/docroot/tps/admin/console/config/modulepanel.vm
+++ b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/modulepanel.vm
diff --git a/pki/linux/tps-ui/shared/docroot/tps/admin/console/config/namepanel.vm b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/namepanel.vm
index a5bddc270..a5bddc270 100644
--- a/pki/linux/tps-ui/shared/docroot/tps/admin/console/config/namepanel.vm
+++ b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/namepanel.vm
diff --git a/pki/linux/tps-ui/shared/docroot/tps/admin/console/config/securitydomainloginpanel.vm b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/securitydomainloginpanel.vm
index 811a7a36c..811a7a36c 100644
--- a/pki/linux/tps-ui/shared/docroot/tps/admin/console/config/securitydomainloginpanel.vm
+++ b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/securitydomainloginpanel.vm
diff --git a/pki/linux/tps-ui/shared/docroot/tps/admin/console/config/securitydomainpanel.vm b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/securitydomainpanel.vm
index a746d0160..a746d0160 100644
--- a/pki/linux/tps-ui/shared/docroot/tps/admin/console/config/securitydomainpanel.vm
+++ b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/securitydomainpanel.vm
diff --git a/pki/linux/tps-ui/shared/docroot/tps/admin/console/config/sidemenu.vm b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/sidemenu.vm
index 3f6400261..3f6400261 100644
--- a/pki/linux/tps-ui/shared/docroot/tps/admin/console/config/sidemenu.vm
+++ b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/sidemenu.vm
diff --git a/pki/linux/tps-ui/shared/docroot/tps/admin/console/config/sizepanel.vm b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/sizepanel.vm
index 51486889a..51486889a 100644
--- a/pki/linux/tps-ui/shared/docroot/tps/admin/console/config/sizepanel.vm
+++ b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/sizepanel.vm
diff --git a/pki/linux/tps-ui/shared/docroot/tps/admin/console/config/tksinfopanel.vm b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/tksinfopanel.vm
index 9580613bb..9580613bb 100644
--- a/pki/linux/tps-ui/shared/docroot/tps/admin/console/config/tksinfopanel.vm
+++ b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/tksinfopanel.vm
diff --git a/pki/linux/tps-ui/shared/docroot/tps/admin/console/config/topmenu.vm b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/topmenu.vm
index 90a4ec16d..90a4ec16d 100644
--- a/pki/linux/tps-ui/shared/docroot/tps/admin/console/config/topmenu.vm
+++ b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/topmenu.vm
diff --git a/pki/linux/tps-ui/shared/docroot/tps/admin/console/config/welcomepanel.vm b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/welcomepanel.vm
index e69095690..e69095690 100644
--- a/pki/linux/tps-ui/shared/docroot/tps/admin/console/config/welcomepanel.vm
+++ b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/welcomepanel.vm
diff --git a/pki/linux/tps-ui/shared/docroot/tps/admin/console/config/wizard.vm b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/wizard.vm
index f8efbdb5f..f8efbdb5f 100644
--- a/pki/linux/tps-ui/shared/docroot/tps/admin/console/config/wizard.vm
+++ b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/wizard.vm
diff --git a/pki/linux/tps-ui/shared/docroot/tps/admin/console/config/xml.vm b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/xml.vm
index 31ff72aa2..31ff72aa2 100644
--- a/pki/linux/tps-ui/shared/docroot/tps/admin/console/config/xml.vm
+++ b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/xml.vm
diff --git a/pki/linux/tps-ui/shared/docroot/tps/admin/console/img/badge.png b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/badge.png
index 5fe0223b5..5fe0223b5 100644
--- a/pki/linux/tps-ui/shared/docroot/tps/admin/console/img/badge.png
+++ b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/badge.png
diff --git a/pki/linux/tps-ui/shared/docroot/tps/admin/console/img/bigrotation2.gif b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/bigrotation2.gif
index 5bb90fd6a..5bb90fd6a 100644
--- a/pki/linux/tps-ui/shared/docroot/tps/admin/console/img/bigrotation2.gif
+++ b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/bigrotation2.gif
diff --git a/pki/linux/tps-ui/shared/docroot/tps/admin/console/img/button-clear.gif b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/button-clear.gif
index 336e6e5d9..336e6e5d9 100644
--- a/pki/linux/tps-ui/shared/docroot/tps/admin/console/img/button-clear.gif
+++ b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/button-clear.gif
diff --git a/pki/linux/tps-ui/shared/docroot/tps/admin/console/img/button-manage.gif b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/button-manage.gif
index 8f2f3db5e..8f2f3db5e 100644
--- a/pki/linux/tps-ui/shared/docroot/tps/admin/console/img/button-manage.gif
+++ b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/button-manage.gif
diff --git a/pki/linux/tps-ui/shared/docroot/tps/admin/console/img/button-search.gif b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/button-search.gif
index b015c82a9..b015c82a9 100644
--- a/pki/linux/tps-ui/shared/docroot/tps/admin/console/img/button-search.gif
+++ b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/button-search.gif
diff --git a/pki/linux/tps-ui/shared/docroot/tps/admin/console/img/certificate.png b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/certificate.png
index 2ea9f88bb..2ea9f88bb 100644
--- a/pki/linux/tps-ui/shared/docroot/tps/admin/console/img/certificate.png
+++ b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/certificate.png
diff --git a/pki/linux/tps-ui/shared/docroot/tps/admin/console/img/clearpixel.gif b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/clearpixel.gif
index ae710460b..ae710460b 100644
--- a/pki/linux/tps-ui/shared/docroot/tps/admin/console/img/clearpixel.gif
+++ b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/clearpixel.gif
diff --git a/pki/linux/tps-ui/shared/docroot/tps/admin/console/img/favicon.ico b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/favicon.ico
index efc1d33f4..efc1d33f4 100644
--- a/pki/linux/tps-ui/shared/docroot/tps/admin/console/img/favicon.ico
+++ b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/favicon.ico
diff --git a/pki/linux/tps-ui/shared/docroot/tps/admin/console/img/icon_checkin.gif b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/icon_checkin.gif
index cb77e9f3f..cb77e9f3f 100644
--- a/pki/linux/tps-ui/shared/docroot/tps/admin/console/img/icon_checkin.gif
+++ b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/icon_checkin.gif
diff --git a/pki/linux/tps-ui/shared/docroot/tps/admin/console/img/icon_crit_update.gif b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/icon_crit_update.gif
index cf3c47907..cf3c47907 100644
--- a/pki/linux/tps-ui/shared/docroot/tps/admin/console/img/icon_crit_update.gif
+++ b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/icon_crit_update.gif
diff --git a/pki/linux/tps-ui/shared/docroot/tps/admin/console/img/icon_locked.gif b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/icon_locked.gif
index fa0989276..fa0989276 100644
--- a/pki/linux/tps-ui/shared/docroot/tps/admin/console/img/icon_locked.gif
+++ b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/icon_locked.gif
diff --git a/pki/linux/tps-ui/shared/docroot/tps/admin/console/img/icon_reg_update.gif b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/icon_reg_update.gif
index 662e17a84..662e17a84 100644
--- a/pki/linux/tps-ui/shared/docroot/tps/admin/console/img/icon_reg_update.gif
+++ b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/icon_reg_update.gif
diff --git a/pki/linux/tps-ui/shared/docroot/tps/admin/console/img/icon_up2date.gif b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/icon_up2date.gif
index 7f2f9d4c0..7f2f9d4c0 100644
--- a/pki/linux/tps-ui/shared/docroot/tps/admin/console/img/icon_up2date.gif
+++ b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/icon_up2date.gif
diff --git a/pki/linux/tps-ui/shared/docroot/tps/admin/console/img/id.png b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/id.png
index 2c54191e1..2c54191e1 100644
--- a/pki/linux/tps-ui/shared/docroot/tps/admin/console/img/id.png
+++ b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/id.png
diff --git a/pki/linux/tps-ui/shared/docroot/tps/admin/console/img/idkey.png b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/idkey.png
index 3e27d2d05..3e27d2d05 100644
--- a/pki/linux/tps-ui/shared/docroot/tps/admin/console/img/idkey.png
+++ b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/idkey.png
diff --git a/pki/linux/tps-ui/shared/docroot/tps/admin/console/img/key.png b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/key.png
index db2896248..db2896248 100644
--- a/pki/linux/tps-ui/shared/docroot/tps/admin/console/img/key.png
+++ b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/key.png
diff --git a/pki/linux/tps-ui/shared/docroot/tps/admin/console/img/lock.png b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/lock.png
index 56be3b755..56be3b755 100644
--- a/pki/linux/tps-ui/shared/docroot/tps/admin/console/img/lock.png
+++ b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/lock.png
diff --git a/pki/linux/tps-ui/shared/docroot/tps/admin/console/img/logo_header.gif b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/logo_header.gif
index 20f74410e..20f74410e 100644
--- a/pki/linux/tps-ui/shared/docroot/tps/admin/console/img/logo_header.gif
+++ b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/logo_header.gif
diff --git a/pki/linux/tps-ui/shared/docroot/tps/admin/console/img/no-certificate.png b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/no-certificate.png
index 7d93a41c3..7d93a41c3 100644
--- a/pki/linux/tps-ui/shared/docroot/tps/admin/console/img/no-certificate.png
+++ b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/no-certificate.png
diff --git a/pki/linux/tps-ui/shared/docroot/tps/admin/console/img/pki-icon-help.gif b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/pki-icon-help.gif
index 21d9f13d6..21d9f13d6 100644
--- a/pki/linux/tps-ui/shared/docroot/tps/admin/console/img/pki-icon-help.gif
+++ b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/pki-icon-help.gif
diff --git a/pki/linux/tps-ui/shared/docroot/tps/admin/console/img/pki-icon-home.gif b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/pki-icon-home.gif
index ef1726b74..ef1726b74 100644
--- a/pki/linux/tps-ui/shared/docroot/tps/admin/console/img/pki-icon-home.gif
+++ b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/pki-icon-home.gif
diff --git a/pki/linux/tps-ui/shared/docroot/tps/admin/console/img/pki-icon-software.gif b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/pki-icon-software.gif
index dd64b485c..dd64b485c 100644
--- a/pki/linux/tps-ui/shared/docroot/tps/admin/console/img/pki-icon-software.gif
+++ b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/pki-icon-software.gif
diff --git a/pki/linux/tps-ui/shared/docroot/tps/admin/console/js/misc.js b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/js/misc.js
index da7899be2..da7899be2 100644
--- a/pki/linux/tps-ui/shared/docroot/tps/admin/console/js/misc.js
+++ b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/js/misc.js
diff --git a/pki/linux/tps/build_linux b/pki/dogtag/tps/build_linux
index fa3f9c958..fa3f9c958 100755
--- a/pki/linux/tps/build_linux
+++ b/pki/dogtag/tps/build_linux
diff --git a/pki/linux/tps/config-ext/build_linux_pki b/pki/dogtag/tps/config-ext/build_linux_pki
index d9ea91e8c..d9ea91e8c 100755
--- a/pki/linux/tps/config-ext/build_linux_pki
+++ b/pki/dogtag/tps/config-ext/build_linux_pki
diff --git a/pki/linux/tps/config/product.xml b/pki/dogtag/tps/config/product.xml
index 33caf48ed..33caf48ed 100644
--- a/pki/linux/tps/config/product.xml
+++ b/pki/dogtag/tps/config/product.xml
diff --git a/pki/linux/tps/config/release.xml b/pki/dogtag/tps/config/release.xml
index fc43aaeb7..fc43aaeb7 100644
--- a/pki/linux/tps/config/release.xml
+++ b/pki/dogtag/tps/config/release.xml
diff --git a/pki/linux/tps/pki-tps.spec b/pki/dogtag/tps/pki-tps.spec
index 2e1905bd4..2e1905bd4 100644
--- a/pki/linux/tps/pki-tps.spec
+++ b/pki/dogtag/tps/pki-tps.spec
diff --git a/pki/linux/util/build_linux b/pki/dogtag/util/build_linux
index 4a33825cd..4a33825cd 100755
--- a/pki/linux/util/build_linux
+++ b/pki/dogtag/util/build_linux
diff --git a/pki/linux/util/config-ext/build_linux_pki b/pki/dogtag/util/config-ext/build_linux_pki
index d9ea91e8c..d9ea91e8c 100755
--- a/pki/linux/util/config-ext/build_linux_pki
+++ b/pki/dogtag/util/config-ext/build_linux_pki
diff --git a/pki/linux/util/config/product.xml b/pki/dogtag/util/config/product.xml
index 33caf48ed..33caf48ed 100644
--- a/pki/linux/util/config/product.xml
+++ b/pki/dogtag/util/config/product.xml
diff --git a/pki/linux/util/config/release.xml b/pki/dogtag/util/config/release.xml
index fc43aaeb7..fc43aaeb7 100644
--- a/pki/linux/util/config/release.xml
+++ b/pki/dogtag/util/config/release.xml
diff --git a/pki/linux/util/pki-util.spec b/pki/dogtag/util/pki-util.spec
index ee1568b58..ee1568b58 100644
--- a/pki/linux/util/pki-util.spec
+++ b/pki/dogtag/util/pki-util.spec