294 files changed, 3 insertions, 8 deletions

diff --git a/dogtag/ca-ui/shared/webapps/ca/404.html b/base/ca/shared/webapps/ca/404.html
index 49f75a9..49f75a9 100755
--- a/dogtag/ca-ui/shared/webapps/ca/404.html
+++ b/base/ca/shared/webapps/ca/404.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/500.html b/base/ca/shared/webapps/ca/500.html
index fe8f8de..fe8f8de 100755
--- a/dogtag/ca-ui/shared/webapps/ca/500.html
+++ b/base/ca/shared/webapps/ca/500.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/GenUnexpectedError.template b/base/ca/shared/webapps/ca/GenUnexpectedError.template
index 3125599..3125599 100644
--- a/dogtag/ca-ui/shared/webapps/ca/GenUnexpectedError.template
+++ b/base/ca/shared/webapps/ca/GenUnexpectedError.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/admin/GenUnexpectedError.template b/base/ca/shared/webapps/ca/admin/GenUnexpectedError.template
index 57d118a..57d118a 100644
--- a/dogtag/ca-ui/shared/webapps/ca/admin/GenUnexpectedError.template
+++ b/base/ca/shared/webapps/ca/admin/GenUnexpectedError.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/admin/ca/EnrollSuccess.template b/base/ca/shared/webapps/ca/admin/ca/EnrollSuccess.template
index d370983..d370983 100644
--- a/dogtag/ca-ui/shared/webapps/ca/admin/ca/EnrollSuccess.template
+++ b/base/ca/shared/webapps/ca/admin/ca/EnrollSuccess.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/admin/ca/ImportAdminCert.template b/base/ca/shared/webapps/ca/admin/ca/ImportAdminCert.template
index e52764e..e52764e 100644
--- a/dogtag/ca-ui/shared/webapps/ca/admin/ca/ImportAdminCert.template
+++ b/base/ca/shared/webapps/ca/admin/ca/ImportAdminCert.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/admin/ca/ImportCert.template b/base/ca/shared/webapps/ca/admin/ca/ImportCert.template
index 5530cf2..5530cf2 100644
--- a/dogtag/ca-ui/shared/webapps/ca/admin/ca/ImportCert.template
+++ b/base/ca/shared/webapps/ca/admin/ca/ImportCert.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/admin/ca/adminEnroll.html b/base/ca/shared/webapps/ca/admin/ca/adminEnroll.html
index 8b6335a..8b6335a 100644
--- a/dogtag/ca-ui/shared/webapps/ca/admin/ca/adminEnroll.html
+++ b/base/ca/shared/webapps/ca/admin/ca/adminEnroll.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/admin/ca/securitydomainlogin.template b/base/ca/shared/webapps/ca/admin/ca/securitydomainlogin.template
index eac3ac4..eac3ac4 100644
--- a/dogtag/ca-ui/shared/webapps/ca/admin/ca/securitydomainlogin.template
+++ b/base/ca/shared/webapps/ca/admin/ca/securitydomainlogin.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/admin/ca/sendCookie.template b/base/ca/shared/webapps/ca/admin/ca/sendCookie.template
index b35881e..b35881e 100644
--- a/dogtag/ca-ui/shared/webapps/ca/admin/ca/sendCookie.template
+++ b/base/ca/shared/webapps/ca/admin/ca/sendCookie.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/admin/cms-funcs.js b/base/ca/shared/webapps/ca/admin/cms-funcs.js
index c8ffd51..c8ffd51 100644
--- a/dogtag/ca-ui/shared/webapps/ca/admin/cms-funcs.js
+++ b/base/ca/shared/webapps/ca/admin/cms-funcs.js
diff --git a/dogtag/ca-ui/shared/webapps/ca/admin/helpfun.js b/base/ca/shared/webapps/ca/admin/helpfun.js
index 14a80bb..14a80bb 100644
--- a/dogtag/ca-ui/shared/webapps/ca/admin/helpfun.js
+++ b/base/ca/shared/webapps/ca/admin/helpfun.js
diff --git a/dogtag/ca-ui/shared/webapps/ca/admin/index.html b/base/ca/shared/webapps/ca/admin/index.html
index 30662d4..30662d4 100644
--- a/dogtag/ca-ui/shared/webapps/ca/admin/index.html
+++ b/base/ca/shared/webapps/ca/admin/index.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/GenError.template b/base/ca/shared/webapps/ca/agent/GenError.template
index 19f85f7..19f85f7 100644
--- a/dogtag/ca-ui/shared/webapps/ca/agent/GenError.template
+++ b/base/ca/shared/webapps/ca/agent/GenError.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/GenPending.template b/base/ca/shared/webapps/ca/agent/GenPending.template
index 50d23ee..50d23ee 100644
--- a/dogtag/ca-ui/shared/webapps/ca/agent/GenPending.template
+++ b/base/ca/shared/webapps/ca/agent/GenPending.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/GenRejected.template b/base/ca/shared/webapps/ca/agent/GenRejected.template
index 81d1264..81d1264 100644
--- a/dogtag/ca-ui/shared/webapps/ca/agent/GenRejected.template
+++ b/base/ca/shared/webapps/ca/agent/GenRejected.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/GenSuccess.template b/base/ca/shared/webapps/ca/agent/GenSuccess.template
index f3531f0..f3531f0 100644
--- a/dogtag/ca-ui/shared/webapps/ca/agent/GenSuccess.template
+++ b/base/ca/shared/webapps/ca/agent/GenSuccess.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/GenSvcPending.template b/base/ca/shared/webapps/ca/agent/GenSvcPending.template
index 584402c..584402c 100644
--- a/dogtag/ca-ui/shared/webapps/ca/agent/GenSvcPending.template
+++ b/base/ca/shared/webapps/ca/agent/GenSvcPending.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/GenUnauthorized.template b/base/ca/shared/webapps/ca/agent/GenUnauthorized.template
index f0016cd..f0016cd 100644
--- a/dogtag/ca-ui/shared/webapps/ca/agent/GenUnauthorized.template
+++ b/base/ca/shared/webapps/ca/agent/GenUnauthorized.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/GenUnexpectedError.template b/base/ca/shared/webapps/ca/agent/GenUnexpectedError.template
index 58534e0..58534e0 100644
--- a/dogtag/ca-ui/shared/webapps/ca/agent/GenUnexpectedError.template
+++ b/base/ca/shared/webapps/ca/agent/GenUnexpectedError.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/EnrollSuccess.template b/base/ca/shared/webapps/ca/agent/ca/EnrollSuccess.template
index 08bcd52..08bcd52 100644
--- a/dogtag/ca-ui/shared/webapps/ca/agent/ca/EnrollSuccess.template
+++ b/base/ca/shared/webapps/ca/agent/ca/EnrollSuccess.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/ImportCert.template b/base/ca/shared/webapps/ca/agent/ca/ImportCert.template
index 37ad258..37ad258 100644
--- a/dogtag/ca-ui/shared/webapps/ca/agent/ca/ImportCert.template
+++ b/base/ca/shared/webapps/ca/agent/ca/ImportCert.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/ListRequests.html b/base/ca/shared/webapps/ca/agent/ca/ListRequests.html
index 882f43e..882f43e 100644
--- a/dogtag/ca-ui/shared/webapps/ca/agent/ca/ListRequests.html
+++ b/base/ca/shared/webapps/ca/agent/ca/ListRequests.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/ProfileApprove.template b/base/ca/shared/webapps/ca/agent/ca/ProfileApprove.template
index ff8613b..ff8613b 100644
--- a/dogtag/ca-ui/shared/webapps/ca/agent/ca/ProfileApprove.template
+++ b/base/ca/shared/webapps/ca/agent/ca/ProfileApprove.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/ProfileList.template b/base/ca/shared/webapps/ca/agent/ca/ProfileList.template
index 42e0f5c..42e0f5c 100644
--- a/dogtag/ca-ui/shared/webapps/ca/agent/ca/ProfileList.template
+++ b/base/ca/shared/webapps/ca/agent/ca/ProfileList.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/ProfileProcess.template b/base/ca/shared/webapps/ca/agent/ca/ProfileProcess.template
index 95c38b2..95c38b2 100644
--- a/dogtag/ca-ui/shared/webapps/ca/agent/ca/ProfileProcess.template
+++ b/base/ca/shared/webapps/ca/agent/ca/ProfileProcess.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/ProfileReview.template b/base/ca/shared/webapps/ca/agent/ca/ProfileReview.template
index d3b9970..d3b9970 100644
--- a/dogtag/ca-ui/shared/webapps/ca/agent/ca/ProfileReview.template
+++ b/base/ca/shared/webapps/ca/agent/ca/ProfileReview.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/ProfileSelect.template b/base/ca/shared/webapps/ca/agent/ca/ProfileSelect.template
index 87bf61f..87bf61f 100644
--- a/dogtag/ca-ui/shared/webapps/ca/agent/ca/ProfileSelect.template
+++ b/base/ca/shared/webapps/ca/agent/ca/ProfileSelect.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/SrchCert.html b/base/ca/shared/webapps/ca/agent/ca/SrchCert.html
index f3c8db0..f3c8db0 100644
--- a/dogtag/ca-ui/shared/webapps/ca/agent/ca/SrchCert.html
+++ b/base/ca/shared/webapps/ca/agent/ca/SrchCert.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/SrchRequests.html b/base/ca/shared/webapps/ca/agent/ca/SrchRequests.html
index 08433aa..08433aa 100644
--- a/dogtag/ca-ui/shared/webapps/ca/agent/ca/SrchRequests.html
+++ b/base/ca/shared/webapps/ca/agent/ca/SrchRequests.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/SrchRevokeCert.html b/base/ca/shared/webapps/ca/agent/ca/SrchRevokeCert.html
index 4f11ddf..4f11ddf 100644
--- a/dogtag/ca-ui/shared/webapps/ca/agent/ca/SrchRevokeCert.html
+++ b/base/ca/shared/webapps/ca/agent/ca/SrchRevokeCert.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/UpdateDir.html b/base/ca/shared/webapps/ca/agent/ca/UpdateDir.html
index 1fb9541..1fb9541 100644
--- a/dogtag/ca-ui/shared/webapps/ca/agent/ca/UpdateDir.html
+++ b/base/ca/shared/webapps/ca/agent/ca/UpdateDir.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/blank.html b/base/ca/shared/webapps/ca/agent/ca/blank.html
index e41af69..e41af69 100644
--- a/dogtag/ca-ui/shared/webapps/ca/agent/ca/blank.html
+++ b/base/ca/shared/webapps/ca/agent/ca/blank.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/bulkissuance.template b/base/ca/shared/webapps/ca/agent/ca/bulkissuance.template
index 01f5745..01f5745 100644
--- a/dogtag/ca-ui/shared/webapps/ca/agent/ca/bulkissuance.template
+++ b/base/ca/shared/webapps/ca/agent/ca/bulkissuance.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/cloneRedirect.template b/base/ca/shared/webapps/ca/agent/ca/cloneRedirect.template
index 0f1ad78..0f1ad78 100644
--- a/dogtag/ca-ui/shared/webapps/ca/agent/ca/cloneRedirect.template
+++ b/base/ca/shared/webapps/ca/agent/ca/cloneRedirect.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/confirmRevocation.template b/base/ca/shared/webapps/ca/agent/ca/confirmRevocation.template
index c1061af..c1061af 100644
--- a/dogtag/ca-ui/shared/webapps/ca/agent/ca/confirmRevocation.template
+++ b/base/ca/shared/webapps/ca/agent/ca/confirmRevocation.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/displayBySerial.template b/base/ca/shared/webapps/ca/agent/ca/displayBySerial.template
index 5d994cd..5d994cd 100644
--- a/dogtag/ca-ui/shared/webapps/ca/agent/ca/displayBySerial.template
+++ b/base/ca/shared/webapps/ca/agent/ca/displayBySerial.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/displayBySerial2.template b/base/ca/shared/webapps/ca/agent/ca/displayBySerial2.template
index 4a193e3..4a193e3 100644
--- a/dogtag/ca-ui/shared/webapps/ca/agent/ca/displayBySerial2.template
+++ b/base/ca/shared/webapps/ca/agent/ca/displayBySerial2.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/displayCRL.template b/base/ca/shared/webapps/ca/agent/ca/displayCRL.template
index 988c6db..988c6db 100644
--- a/dogtag/ca-ui/shared/webapps/ca/agent/ca/displayCRL.template
+++ b/base/ca/shared/webapps/ca/agent/ca/displayCRL.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/displayCertFromRequest.template b/base/ca/shared/webapps/ca/agent/ca/displayCertFromRequest.template
index f114857..f114857 100644
--- a/dogtag/ca-ui/shared/webapps/ca/agent/ca/displayCertFromRequest.template
+++ b/base/ca/shared/webapps/ca/agent/ca/displayCertFromRequest.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/error.template b/base/ca/shared/webapps/ca/agent/ca/error.template
index b1940a8..b1940a8 100644
--- a/dogtag/ca-ui/shared/webapps/ca/agent/ca/error.template
+++ b/base/ca/shared/webapps/ca/agent/ca/error.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameCRL.html b/base/ca/shared/webapps/ca/agent/ca/frameCRL.html
index a0483c7..a0483c7 100644
--- a/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameCRL.html
+++ b/base/ca/shared/webapps/ca/agent/ca/frameCRL.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameDir.html b/base/ca/shared/webapps/ca/agent/ca/frameDir.html
index bcf5df1..bcf5df1 100644
--- a/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameDir.html
+++ b/base/ca/shared/webapps/ca/agent/ca/frameDir.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameDisplayCRL.html b/base/ca/shared/webapps/ca/agent/ca/frameDisplayCRL.html
index 79a11aa..79a11aa 100644
--- a/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameDisplayCRL.html
+++ b/base/ca/shared/webapps/ca/agent/ca/frameDisplayCRL.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameList.html b/base/ca/shared/webapps/ca/agent/ca/frameList.html
index 98f5146..98f5146 100644
--- a/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameList.html
+++ b/base/ca/shared/webapps/ca/agent/ca/frameList.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameListReq.html b/base/ca/shared/webapps/ca/agent/ca/frameListReq.html
index c4b3d1e..c4b3d1e 100644
--- a/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameListReq.html
+++ b/base/ca/shared/webapps/ca/agent/ca/frameListReq.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameOCSP.html b/base/ca/shared/webapps/ca/agent/ca/frameOCSP.html
index 8cc976d..8cc976d 100644
--- a/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameOCSP.html
+++ b/base/ca/shared/webapps/ca/agent/ca/frameOCSP.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameProfile.html b/base/ca/shared/webapps/ca/agent/ca/frameProfile.html
index 2a15bae..2a15bae 100644
--- a/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameProfile.html
+++ b/base/ca/shared/webapps/ca/agent/ca/frameProfile.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameRevoke.html b/base/ca/shared/webapps/ca/agent/ca/frameRevoke.html
index ebaee6d..ebaee6d 100644
--- a/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameRevoke.html
+++ b/base/ca/shared/webapps/ca/agent/ca/frameRevoke.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameSearch.html b/base/ca/shared/webapps/ca/agent/ca/frameSearch.html
index b75a627..b75a627 100644
--- a/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameSearch.html
+++ b/base/ca/shared/webapps/ca/agent/ca/frameSearch.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameSrchRequests.html b/base/ca/shared/webapps/ca/agent/ca/frameSrchRequests.html
index 0e73ea8..0e73ea8 100644
--- a/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameSrchRequests.html
+++ b/base/ca/shared/webapps/ca/agent/ca/frameSrchRequests.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameStats.html b/base/ca/shared/webapps/ca/agent/ca/frameStats.html
index 75a4dbe..75a4dbe 100644
--- a/dogtag/ca-ui/shared/webapps/ca/agent/ca/frameStats.html
+++ b/base/ca/shared/webapps/ca/agent/ca/frameStats.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/getOCSPInfo.template b/base/ca/shared/webapps/ca/agent/ca/getOCSPInfo.template
index cfafd62..cfafd62 100644
--- a/dogtag/ca-ui/shared/webapps/ca/agent/ca/getOCSPInfo.template
+++ b/base/ca/shared/webapps/ca/agent/ca/getOCSPInfo.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/getStats.template b/base/ca/shared/webapps/ca/agent/ca/getStats.template
index 0af6708..0af6708 100644
--- a/dogtag/ca-ui/shared/webapps/ca/agent/ca/getStats.template
+++ b/base/ca/shared/webapps/ca/agent/ca/getStats.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/index.html b/base/ca/shared/webapps/ca/agent/ca/index.html
index 9dc5799..9dc5799 100644
--- a/dogtag/ca-ui/shared/webapps/ca/agent/ca/index.html
+++ b/base/ca/shared/webapps/ca/agent/ca/index.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuCRL.html b/base/ca/shared/webapps/ca/agent/ca/menuCRL.html
index 2c4984e..2c4984e 100644
--- a/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuCRL.html
+++ b/base/ca/shared/webapps/ca/agent/ca/menuCRL.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuDir.html b/base/ca/shared/webapps/ca/agent/ca/menuDir.html
index 7fa9f65..7fa9f65 100644
--- a/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuDir.html
+++ b/base/ca/shared/webapps/ca/agent/ca/menuDir.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuDisplayCRL.html b/base/ca/shared/webapps/ca/agent/ca/menuDisplayCRL.html
index de76603..de76603 100644
--- a/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuDisplayCRL.html
+++ b/base/ca/shared/webapps/ca/agent/ca/menuDisplayCRL.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuList.html b/base/ca/shared/webapps/ca/agent/ca/menuList.html
index 2145259..2145259 100644
--- a/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuList.html
+++ b/base/ca/shared/webapps/ca/agent/ca/menuList.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuListReq.html b/base/ca/shared/webapps/ca/agent/ca/menuListReq.html
index f3b5419..f3b5419 100644
--- a/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuListReq.html
+++ b/base/ca/shared/webapps/ca/agent/ca/menuListReq.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuOCSP.html b/base/ca/shared/webapps/ca/agent/ca/menuOCSP.html
index 0b73aa6..0b73aa6 100644
--- a/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuOCSP.html
+++ b/base/ca/shared/webapps/ca/agent/ca/menuOCSP.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuProfile.html b/base/ca/shared/webapps/ca/agent/ca/menuProfile.html
index a7bcd66..a7bcd66 100644
--- a/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuProfile.html
+++ b/base/ca/shared/webapps/ca/agent/ca/menuProfile.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuRevoke.html b/base/ca/shared/webapps/ca/agent/ca/menuRevoke.html
index 1148bf7..1148bf7 100644
--- a/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuRevoke.html
+++ b/base/ca/shared/webapps/ca/agent/ca/menuRevoke.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuSearch.html b/base/ca/shared/webapps/ca/agent/ca/menuSearch.html
index a088ef0..a088ef0 100644
--- a/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuSearch.html
+++ b/base/ca/shared/webapps/ca/agent/ca/menuSearch.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuSrchRequests.html b/base/ca/shared/webapps/ca/agent/ca/menuSrchRequests.html
index 3b16a1a..3b16a1a 100644
--- a/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuSrchRequests.html
+++ b/base/ca/shared/webapps/ca/agent/ca/menuSrchRequests.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuStats.html b/base/ca/shared/webapps/ca/agent/ca/menuStats.html
index c251356..c251356 100644
--- a/dogtag/ca-ui/shared/webapps/ca/agent/ca/menuStats.html
+++ b/base/ca/shared/webapps/ca/agent/ca/menuStats.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/monitor.html b/base/ca/shared/webapps/ca/agent/ca/monitor.html
index 59e2f40..59e2f40 100644
--- a/dogtag/ca-ui/shared/webapps/ca/agent/ca/monitor.html
+++ b/base/ca/shared/webapps/ca/agent/ca/monitor.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/monitor.template b/base/ca/shared/webapps/ca/agent/ca/monitor.template
index 73c3eb7..73c3eb7 100644
--- a/dogtag/ca-ui/shared/webapps/ca/agent/ca/monitor.template
+++ b/base/ca/shared/webapps/ca/agent/ca/monitor.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/notImplemented.html b/base/ca/shared/webapps/ca/agent/ca/notImplemented.html
index cbdd43f..cbdd43f 100644
--- a/dogtag/ca-ui/shared/webapps/ca/agent/ca/notImplemented.html
+++ b/base/ca/shared/webapps/ca/agent/ca/notImplemented.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/processCertReq.template b/base/ca/shared/webapps/ca/agent/ca/processCertReq.template
index 4d263fe..4d263fe 100644
--- a/dogtag/ca-ui/shared/webapps/ca/agent/ca/processCertReq.template
+++ b/base/ca/shared/webapps/ca/agent/ca/processCertReq.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/processReq.template b/base/ca/shared/webapps/ca/agent/ca/processReq.template
index 172125e..172125e 100644
--- a/dogtag/ca-ui/shared/webapps/ca/agent/ca/processReq.template
+++ b/base/ca/shared/webapps/ca/agent/ca/processReq.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/queryBySerial.html b/base/ca/shared/webapps/ca/agent/ca/queryBySerial.html
index 4cc7b91..4cc7b91 100644
--- a/dogtag/ca-ui/shared/webapps/ca/agent/ca/queryBySerial.html
+++ b/base/ca/shared/webapps/ca/agent/ca/queryBySerial.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/queryCert.html b/base/ca/shared/webapps/ca/agent/ca/queryCert.html
index a7ba0d0..a7ba0d0 100644
--- a/dogtag/ca-ui/shared/webapps/ca/agent/ca/queryCert.html
+++ b/base/ca/shared/webapps/ca/agent/ca/queryCert.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/queryCert.template b/base/ca/shared/webapps/ca/agent/ca/queryCert.template
index 40ee64b..40ee64b 100644
--- a/dogtag/ca-ui/shared/webapps/ca/agent/ca/queryCert.template
+++ b/base/ca/shared/webapps/ca/agent/ca/queryCert.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/queryReq.template b/base/ca/shared/webapps/ca/agent/ca/queryReq.template
index ed8285b..ed8285b 100644
--- a/dogtag/ca-ui/shared/webapps/ca/agent/ca/queryReq.template
+++ b/base/ca/shared/webapps/ca/agent/ca/queryReq.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/reasonToRevoke.template b/base/ca/shared/webapps/ca/agent/ca/reasonToRevoke.template
index ffb648b..ffb648b 100644
--- a/dogtag/ca-ui/shared/webapps/ca/agent/ca/reasonToRevoke.template
+++ b/base/ca/shared/webapps/ca/agent/ca/reasonToRevoke.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/revocationResult.template b/base/ca/shared/webapps/ca/agent/ca/revocationResult.template
index bd35684..bd35684 100644
--- a/dogtag/ca-ui/shared/webapps/ca/agent/ca/revocationResult.template
+++ b/base/ca/shared/webapps/ca/agent/ca/revocationResult.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/revokeBySerial.template b/base/ca/shared/webapps/ca/agent/ca/revokeBySerial.template
index cae2a93..cae2a93 100644
--- a/dogtag/ca-ui/shared/webapps/ca/agent/ca/revokeBySerial.template
+++ b/base/ca/shared/webapps/ca/agent/ca/revokeBySerial.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/revokeCert.html b/base/ca/shared/webapps/ca/agent/ca/revokeCert.html
index 7bfc6f6..7bfc6f6 100644
--- a/dogtag/ca-ui/shared/webapps/ca/agent/ca/revokeCert.html
+++ b/base/ca/shared/webapps/ca/agent/ca/revokeCert.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/srchCert.template b/base/ca/shared/webapps/ca/agent/ca/srchCert.template
index 001b0e3..001b0e3 100644
--- a/dogtag/ca-ui/shared/webapps/ca/agent/ca/srchCert.template
+++ b/base/ca/shared/webapps/ca/agent/ca/srchCert.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/toDisplayCRL.template b/base/ca/shared/webapps/ca/agent/ca/toDisplayCRL.template
index a2a30dd..a2a30dd 100644
--- a/dogtag/ca-ui/shared/webapps/ca/agent/ca/toDisplayCRL.template
+++ b/base/ca/shared/webapps/ca/agent/ca/toDisplayCRL.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/toUpdateCRL.template b/base/ca/shared/webapps/ca/agent/ca/toUpdateCRL.template
index 8f7e199..8f7e199 100644
--- a/dogtag/ca-ui/shared/webapps/ca/agent/ca/toUpdateCRL.template
+++ b/base/ca/shared/webapps/ca/agent/ca/toUpdateCRL.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/top.html b/base/ca/shared/webapps/ca/agent/ca/top.html
index f4033d0..f4033d0 100644
--- a/dogtag/ca-ui/shared/webapps/ca/agent/ca/top.html
+++ b/base/ca/shared/webapps/ca/agent/ca/top.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/unrevocationResult.template b/base/ca/shared/webapps/ca/agent/ca/unrevocationResult.template
index 8080ce0..8080ce0 100644
--- a/dogtag/ca-ui/shared/webapps/ca/agent/ca/unrevocationResult.template
+++ b/base/ca/shared/webapps/ca/agent/ca/unrevocationResult.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/updateCRL.html b/base/ca/shared/webapps/ca/agent/ca/updateCRL.html
index 700d167..700d167 100644
--- a/dogtag/ca-ui/shared/webapps/ca/agent/ca/updateCRL.html
+++ b/base/ca/shared/webapps/ca/agent/ca/updateCRL.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/updateCRL.template b/base/ca/shared/webapps/ca/agent/ca/updateCRL.template
index 2b05486..2b05486 100644
--- a/dogtag/ca-ui/shared/webapps/ca/agent/ca/updateCRL.template
+++ b/base/ca/shared/webapps/ca/agent/ca/updateCRL.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/updateDir.template b/base/ca/shared/webapps/ca/agent/ca/updateDir.template
index 942db56..942db56 100644
--- a/dogtag/ca-ui/shared/webapps/ca/agent/ca/updateDir.template
+++ b/base/ca/shared/webapps/ca/agent/ca/updateDir.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/cms-funcs.js b/base/ca/shared/webapps/ca/agent/cms-funcs.js
index c8ffd51..c8ffd51 100644
--- a/dogtag/ca-ui/shared/webapps/ca/agent/cms-funcs.js
+++ b/base/ca/shared/webapps/ca/agent/cms-funcs.js
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/funcs.js b/base/ca/shared/webapps/ca/agent/funcs.js
index 958612d..958612d 100644
--- a/dogtag/ca-ui/shared/webapps/ca/agent/funcs.js
+++ b/base/ca/shared/webapps/ca/agent/funcs.js
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/header.template b/base/ca/shared/webapps/ca/agent/header.template
index d1221b1..d1221b1 100644
--- a/dogtag/ca-ui/shared/webapps/ca/agent/header.template
+++ b/base/ca/shared/webapps/ca/agent/header.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/helpfun.js b/base/ca/shared/webapps/ca/agent/helpfun.js
index 14a80bb..14a80bb 100644
--- a/dogtag/ca-ui/shared/webapps/ca/agent/helpfun.js
+++ b/base/ca/shared/webapps/ca/agent/helpfun.js
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/index.html b/base/ca/shared/webapps/ca/agent/index.html
index 30662d4..30662d4 100644
--- a/dogtag/ca-ui/shared/webapps/ca/agent/index.html
+++ b/base/ca/shared/webapps/ca/agent/index.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/index.template b/base/ca/shared/webapps/ca/agent/index.template
index 4f45c73..4f45c73 100644
--- a/dogtag/ca-ui/shared/webapps/ca/agent/index.template
+++ b/base/ca/shared/webapps/ca/agent/index.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ports.template b/base/ca/shared/webapps/ca/agent/ports.template
index bfec339..bfec339 100644
--- a/dogtag/ca-ui/shared/webapps/ca/agent/ports.template
+++ b/base/ca/shared/webapps/ca/agent/ports.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/xenroll.dll b/base/ca/shared/webapps/ca/agent/xenroll.dll
index 9375e98..9375e98 100644
--- a/dogtag/ca-ui/shared/webapps/ca/agent/xenroll.dll
+++ b/base/ca/shared/webapps/ca/agent/xenroll.dll
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/GenError.template b/base/ca/shared/webapps/ca/ee/GenError.template
index 729525a..729525a 100644
--- a/dogtag/ca-ui/shared/webapps/ca/ee/GenError.template
+++ b/base/ca/shared/webapps/ca/ee/GenError.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/GenPending.template b/base/ca/shared/webapps/ca/ee/GenPending.template
index 15ab731..15ab731 100644
--- a/dogtag/ca-ui/shared/webapps/ca/ee/GenPending.template
+++ b/base/ca/shared/webapps/ca/ee/GenPending.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/GenRejected.template b/base/ca/shared/webapps/ca/ee/GenRejected.template
index 6e0ca83..6e0ca83 100644
--- a/dogtag/ca-ui/shared/webapps/ca/ee/GenRejected.template
+++ b/base/ca/shared/webapps/ca/ee/GenRejected.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/GenSuccess.template b/base/ca/shared/webapps/ca/ee/GenSuccess.template
index 5e17ecd..5e17ecd 100644
--- a/dogtag/ca-ui/shared/webapps/ca/ee/GenSuccess.template
+++ b/base/ca/shared/webapps/ca/ee/GenSuccess.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/GenSvcPending.template b/base/ca/shared/webapps/ca/ee/GenSvcPending.template
index e61acbe..e61acbe 100644
--- a/dogtag/ca-ui/shared/webapps/ca/ee/GenSvcPending.template
+++ b/base/ca/shared/webapps/ca/ee/GenSvcPending.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/GenUnauthorized.template b/base/ca/shared/webapps/ca/ee/GenUnauthorized.template
index b8526cb..b8526cb 100644
--- a/dogtag/ca-ui/shared/webapps/ca/ee/GenUnauthorized.template
+++ b/base/ca/shared/webapps/ca/ee/GenUnauthorized.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/GenUnexpectedError.template b/base/ca/shared/webapps/ca/ee/GenUnexpectedError.template
index d93eb0f..d93eb0f 100644
--- a/dogtag/ca-ui/shared/webapps/ca/ee/GenUnexpectedError.template
+++ b/base/ca/shared/webapps/ca/ee/GenUnexpectedError.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/AIMEnroll.html b/base/ca/shared/webapps/ca/ee/ca/AIMEnroll.html
index 79862b3..79862b3 100644
--- a/dogtag/ca-ui/shared/webapps/ca/ee/ca/AIMEnroll.html
+++ b/base/ca/shared/webapps/ca/ee/ca/AIMEnroll.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/CMCEnrollment.html b/base/ca/shared/webapps/ca/ee/ca/CMCEnrollment.html
index 4e0ca29..4e0ca29 100644
--- a/dogtag/ca-ui/shared/webapps/ca/ee/ca/CMCEnrollment.html
+++ b/base/ca/shared/webapps/ca/ee/ca/CMCEnrollment.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/CMCRevReq.html b/base/ca/shared/webapps/ca/ee/ca/CMCRevReq.html
index bd24a21..bd24a21 100644
--- a/dogtag/ca-ui/shared/webapps/ca/ee/ca/CMCRevReq.html
+++ b/base/ca/shared/webapps/ca/ee/ca/CMCRevReq.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/CertBasedDualEnroll.html b/base/ca/shared/webapps/ca/ee/ca/CertBasedDualEnroll.html
index 05d672f..05d672f 100644
--- a/dogtag/ca-ui/shared/webapps/ca/ee/ca/CertBasedDualEnroll.html
+++ b/base/ca/shared/webapps/ca/ee/ca/CertBasedDualEnroll.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/CertBasedEncryptionEnroll.html b/base/ca/shared/webapps/ca/ee/ca/CertBasedEncryptionEnroll.html
index 67cb0cb..67cb0cb 100644
--- a/dogtag/ca-ui/shared/webapps/ca/ee/ca/CertBasedEncryptionEnroll.html
+++ b/base/ca/shared/webapps/ca/ee/ca/CertBasedEncryptionEnroll.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/CertBasedSingleEnroll.html b/base/ca/shared/webapps/ca/ee/ca/CertBasedSingleEnroll.html
index fe6910e..fe6910e 100644
--- a/dogtag/ca-ui/shared/webapps/ca/ee/ca/CertBasedSingleEnroll.html
+++ b/base/ca/shared/webapps/ca/ee/ca/CertBasedSingleEnroll.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/ChallengeRevoke1.html b/base/ca/shared/webapps/ca/ee/ca/ChallengeRevoke1.html
index 00775b1..00775b1 100644
--- a/dogtag/ca-ui/shared/webapps/ca/ee/ca/ChallengeRevoke1.html
+++ b/base/ca/shared/webapps/ca/ee/ca/ChallengeRevoke1.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/DirPinUserEnroll.html b/base/ca/shared/webapps/ca/ee/ca/DirPinUserEnroll.html
index 1c4ca22..1c4ca22 100644
--- a/dogtag/ca-ui/shared/webapps/ca/ee/ca/DirPinUserEnroll.html
+++ b/base/ca/shared/webapps/ca/ee/ca/DirPinUserEnroll.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/DirUserEnroll.html b/base/ca/shared/webapps/ca/ee/ca/DirUserEnroll.html
index 703225a..703225a 100644
--- a/dogtag/ca-ui/shared/webapps/ca/ee/ca/DirUserEnroll.html
+++ b/base/ca/shared/webapps/ca/ee/ca/DirUserEnroll.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/DisplayCRL.html b/base/ca/shared/webapps/ca/ee/ca/DisplayCRL.html
index 5283414..5283414 100644
--- a/dogtag/ca-ui/shared/webapps/ca/ee/ca/DisplayCRL.html
+++ b/base/ca/shared/webapps/ca/ee/ca/DisplayCRL.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/EnrollSuccess.template b/base/ca/shared/webapps/ca/ee/ca/EnrollSuccess.template
index 771c6fb..771c6fb 100644
--- a/dogtag/ca-ui/shared/webapps/ca/ee/ca/EnrollSuccess.template
+++ b/base/ca/shared/webapps/ca/ee/ca/EnrollSuccess.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/GetCAChain.html b/base/ca/shared/webapps/ca/ee/ca/GetCAChain.html
index 2fb7808..2fb7808 100644
--- a/dogtag/ca-ui/shared/webapps/ca/ee/ca/GetCAChain.html
+++ b/base/ca/shared/webapps/ca/ee/ca/GetCAChain.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/ImportAdminCert.template b/base/ca/shared/webapps/ca/ee/ca/ImportAdminCert.template
index e52764e..e52764e 100644
--- a/dogtag/ca-ui/shared/webapps/ca/ee/ca/ImportAdminCert.template
+++ b/base/ca/shared/webapps/ca/ee/ca/ImportAdminCert.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/ImportCert.template b/base/ca/shared/webapps/ca/ee/ca/ImportCert.template
index 5530cf2..5530cf2 100644
--- a/dogtag/ca-ui/shared/webapps/ca/ee/ca/ImportCert.template
+++ b/base/ca/shared/webapps/ca/ee/ca/ImportCert.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/KeyRecovery.html b/base/ca/shared/webapps/ca/ee/ca/KeyRecovery.html
index b3a9e46..b3a9e46 100644
--- a/dogtag/ca-ui/shared/webapps/ca/ee/ca/KeyRecovery.html
+++ b/base/ca/shared/webapps/ca/ee/ca/KeyRecovery.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/ManCAEnroll.html b/base/ca/shared/webapps/ca/ee/ca/ManCAEnroll.html
index 851bca5..851bca5 100644
--- a/dogtag/ca-ui/shared/webapps/ca/ee/ca/ManCAEnroll.html
+++ b/base/ca/shared/webapps/ca/ee/ca/ManCAEnroll.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/ManObjSignEnroll.html b/base/ca/shared/webapps/ca/ee/ca/ManObjSignEnroll.html
index 9c2c86a..9c2c86a 100644
--- a/dogtag/ca-ui/shared/webapps/ca/ee/ca/ManObjSignEnroll.html
+++ b/base/ca/shared/webapps/ca/ee/ca/ManObjSignEnroll.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/ManRAEnroll.html b/base/ca/shared/webapps/ca/ee/ca/ManRAEnroll.html
index 796ef0d..796ef0d 100644
--- a/dogtag/ca-ui/shared/webapps/ca/ee/ca/ManRAEnroll.html
+++ b/base/ca/shared/webapps/ca/ee/ca/ManRAEnroll.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/ManServerEnroll.html b/base/ca/shared/webapps/ca/ee/ca/ManServerEnroll.html
index 148aaee..148aaee 100644
--- a/dogtag/ca-ui/shared/webapps/ca/ee/ca/ManServerEnroll.html
+++ b/base/ca/shared/webapps/ca/ee/ca/ManServerEnroll.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/ManUserEnroll.html b/base/ca/shared/webapps/ca/ee/ca/ManUserEnroll.html
index e552f8e..e552f8e 100644
--- a/dogtag/ca-ui/shared/webapps/ca/ee/ca/ManUserEnroll.html
+++ b/base/ca/shared/webapps/ca/ee/ca/ManUserEnroll.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/NISUserEnroll.html b/base/ca/shared/webapps/ca/ee/ca/NISUserEnroll.html
index d671b4b..d671b4b 100644
--- a/dogtag/ca-ui/shared/webapps/ca/ee/ca/NISUserEnroll.html
+++ b/base/ca/shared/webapps/ca/ee/ca/NISUserEnroll.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/OCSPResponder.html b/base/ca/shared/webapps/ca/ee/ca/OCSPResponder.html
index 33d3733..33d3733 100644
--- a/dogtag/ca-ui/shared/webapps/ca/ee/ca/OCSPResponder.html
+++ b/base/ca/shared/webapps/ca/ee/ca/OCSPResponder.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/ObjSignPKCS10Enroll.html b/base/ca/shared/webapps/ca/ee/ca/ObjSignPKCS10Enroll.html
index 820c1aa..820c1aa 100644
--- a/dogtag/ca-ui/shared/webapps/ca/ee/ca/ObjSignPKCS10Enroll.html
+++ b/base/ca/shared/webapps/ca/ee/ca/ObjSignPKCS10Enroll.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/PortalEnrollment.html b/base/ca/shared/webapps/ca/ee/ca/PortalEnrollment.html
index 8f3a373..8f3a373 100644
--- a/dogtag/ca-ui/shared/webapps/ca/ee/ca/PortalEnrollment.html
+++ b/base/ca/shared/webapps/ca/ee/ca/PortalEnrollment.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/ProfileList.template b/base/ca/shared/webapps/ca/ee/ca/ProfileList.template
index fc063e1..fc063e1 100644
--- a/dogtag/ca-ui/shared/webapps/ca/ee/ca/ProfileList.template
+++ b/base/ca/shared/webapps/ca/ee/ca/ProfileList.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/ProfileSelect.template b/base/ca/shared/webapps/ca/ee/ca/ProfileSelect.template
index bcb047d..bcb047d 100644
--- a/dogtag/ca-ui/shared/webapps/ca/ee/ca/ProfileSelect.template
+++ b/base/ca/shared/webapps/ca/ee/ca/ProfileSelect.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/ProfileSubmit.html b/base/ca/shared/webapps/ca/ee/ca/ProfileSubmit.html
index 90d5086..90d5086 100644
--- a/dogtag/ca-ui/shared/webapps/ca/ee/ca/ProfileSubmit.html
+++ b/base/ca/shared/webapps/ca/ee/ca/ProfileSubmit.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/ProfileSubmit.template b/base/ca/shared/webapps/ca/ee/ca/ProfileSubmit.template
index ce1ec12..ce1ec12 100644
--- a/dogtag/ca-ui/shared/webapps/ca/ee/ca/ProfileSubmit.template
+++ b/base/ca/shared/webapps/ca/ee/ca/ProfileSubmit.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/RenewalSuccess.template b/base/ca/shared/webapps/ca/ee/ca/RenewalSuccess.template
index cb840d2..cb840d2 100644
--- a/dogtag/ca-ui/shared/webapps/ca/ee/ca/RenewalSuccess.template
+++ b/base/ca/shared/webapps/ca/ee/ca/RenewalSuccess.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/RevocationSuccess.template b/base/ca/shared/webapps/ca/ee/ca/RevocationSuccess.template
index d024a3d..d024a3d 100644
--- a/dogtag/ca-ui/shared/webapps/ca/ee/ca/RevocationSuccess.template
+++ b/base/ca/shared/webapps/ca/ee/ca/RevocationSuccess.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/UserDnEnroll.html b/base/ca/shared/webapps/ca/ee/ca/UserDnEnroll.html
index f4798d4..f4798d4 100644
--- a/dogtag/ca-ui/shared/webapps/ca/ee/ca/UserDnEnroll.html
+++ b/base/ca/shared/webapps/ca/ee/ca/UserDnEnroll.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/UserRenewal.html b/base/ca/shared/webapps/ca/ee/ca/UserRenewal.html
index df65046..df65046 100644
--- a/dogtag/ca-ui/shared/webapps/ca/ee/ca/UserRenewal.html
+++ b/base/ca/shared/webapps/ca/ee/ca/UserRenewal.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/UserRevocation.html b/base/ca/shared/webapps/ca/ee/ca/UserRevocation.html
index 83f0091..83f0091 100644
--- a/dogtag/ca-ui/shared/webapps/ca/ee/ca/UserRevocation.html
+++ b/base/ca/shared/webapps/ca/ee/ca/UserRevocation.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/bench2k.html b/base/ca/shared/webapps/ca/ee/ca/bench2k.html
index ab667f4..ab667f4 100755
--- a/dogtag/ca-ui/shared/webapps/ca/ee/ca/bench2k.html
+++ b/base/ca/shared/webapps/ca/ee/ca/bench2k.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/checkRequest.html b/base/ca/shared/webapps/ca/ee/ca/checkRequest.html
index 2fbaa04..2fbaa04 100644
--- a/dogtag/ca-ui/shared/webapps/ca/ee/ca/checkRequest.html
+++ b/base/ca/shared/webapps/ca/ee/ca/checkRequest.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/displayBySerial.template b/base/ca/shared/webapps/ca/ee/ca/displayBySerial.template
index e9b4d72..e9b4d72 100644
--- a/dogtag/ca-ui/shared/webapps/ca/ee/ca/displayBySerial.template
+++ b/base/ca/shared/webapps/ca/ee/ca/displayBySerial.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/displayBySerial2.template b/base/ca/shared/webapps/ca/ee/ca/displayBySerial2.template
index f8f3064..f8f3064 100644
--- a/dogtag/ca-ui/shared/webapps/ca/ee/ca/displayBySerial2.template
+++ b/base/ca/shared/webapps/ca/ee/ca/displayBySerial2.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/displayCRL.template b/base/ca/shared/webapps/ca/ee/ca/displayCRL.template
index e829387..e829387 100644
--- a/dogtag/ca-ui/shared/webapps/ca/ee/ca/displayCRL.template
+++ b/base/ca/shared/webapps/ca/ee/ca/displayCRL.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/displayCaCert.template b/base/ca/shared/webapps/ca/ee/ca/displayCaCert.template
index 4e93919..4e93919 100644
--- a/dogtag/ca-ui/shared/webapps/ca/ee/ca/displayCaCert.template
+++ b/base/ca/shared/webapps/ca/ee/ca/displayCaCert.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/displayCertFromRequest.template b/base/ca/shared/webapps/ca/ee/ca/displayCertFromRequest.template
index aafa17a..aafa17a 100644
--- a/dogtag/ca-ui/shared/webapps/ca/ee/ca/displayCertFromRequest.template
+++ b/base/ca/shared/webapps/ca/ee/ca/displayCertFromRequest.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/enrollMenu.html b/base/ca/shared/webapps/ca/ee/ca/enrollMenu.html
index cebdc1a..cebdc1a 100644
--- a/dogtag/ca-ui/shared/webapps/ca/ee/ca/enrollMenu.html
+++ b/base/ca/shared/webapps/ca/ee/ca/enrollMenu.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/index.html b/base/ca/shared/webapps/ca/ee/ca/index.html
index 80d8415..80d8415 100644
--- a/dogtag/ca-ui/shared/webapps/ca/ee/ca/index.html
+++ b/base/ca/shared/webapps/ca/ee/ca/index.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/policyEnrollment/index.html b/base/ca/shared/webapps/ca/ee/ca/policyEnrollment/index.html
index 74c3080..74c3080 100644
--- a/dogtag/ca-ui/shared/webapps/ca/ee/ca/policyEnrollment/index.html
+++ b/base/ca/shared/webapps/ca/ee/ca/policyEnrollment/index.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/policyEnrollment/profileMenu.html b/base/ca/shared/webapps/ca/ee/ca/policyEnrollment/profileMenu.html
index 9eabc22..9eabc22 100644
--- a/dogtag/ca-ui/shared/webapps/ca/ee/ca/policyEnrollment/profileMenu.html
+++ b/base/ca/shared/webapps/ca/ee/ca/policyEnrollment/profileMenu.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/policyEnrollment/retrievalMenu.html b/base/ca/shared/webapps/ca/ee/ca/policyEnrollment/retrievalMenu.html
index ec39a7a..ec39a7a 100644
--- a/dogtag/ca-ui/shared/webapps/ca/ee/ca/policyEnrollment/retrievalMenu.html
+++ b/base/ca/shared/webapps/ca/ee/ca/policyEnrollment/retrievalMenu.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/policyEnrollment/revocationMenu.html b/base/ca/shared/webapps/ca/ee/ca/policyEnrollment/revocationMenu.html
index fa810e7..fa810e7 100644
--- a/dogtag/ca-ui/shared/webapps/ca/ee/ca/policyEnrollment/revocationMenu.html
+++ b/base/ca/shared/webapps/ca/ee/ca/policyEnrollment/revocationMenu.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/profileEnrollment/index.html b/base/ca/shared/webapps/ca/ee/ca/profileEnrollment/index.html
index 478c193..478c193 100644
--- a/dogtag/ca-ui/shared/webapps/ca/ee/ca/profileEnrollment/index.html
+++ b/base/ca/shared/webapps/ca/ee/ca/profileEnrollment/index.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/profileEnrollment/profileMenu.html b/base/ca/shared/webapps/ca/ee/ca/profileEnrollment/profileMenu.html
index 8f19d91..8f19d91 100644
--- a/dogtag/ca-ui/shared/webapps/ca/ee/ca/profileEnrollment/profileMenu.html
+++ b/base/ca/shared/webapps/ca/ee/ca/profileEnrollment/profileMenu.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/profileEnrollment/retrievalMenu.html b/base/ca/shared/webapps/ca/ee/ca/profileEnrollment/retrievalMenu.html
index faafe34..faafe34 100644
--- a/dogtag/ca-ui/shared/webapps/ca/ee/ca/profileEnrollment/retrievalMenu.html
+++ b/base/ca/shared/webapps/ca/ee/ca/profileEnrollment/retrievalMenu.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/profileEnrollment/revocationMenu.html b/base/ca/shared/webapps/ca/ee/ca/profileEnrollment/revocationMenu.html
index 21f5f43..21f5f43 100644
--- a/dogtag/ca-ui/shared/webapps/ca/ee/ca/profileEnrollment/revocationMenu.html
+++ b/base/ca/shared/webapps/ca/ee/ca/profileEnrollment/revocationMenu.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/profileMenu.html b/base/ca/shared/webapps/ca/ee/ca/profileMenu.html
index b621c23..b621c23 100644
--- a/dogtag/ca-ui/shared/webapps/ca/ee/ca/profileMenu.html
+++ b/base/ca/shared/webapps/ca/ee/ca/profileMenu.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/queryBySerial.html b/base/ca/shared/webapps/ca/ee/ca/queryBySerial.html
index 557a1cf..557a1cf 100644
--- a/dogtag/ca-ui/shared/webapps/ca/ee/ca/queryBySerial.html
+++ b/base/ca/shared/webapps/ca/ee/ca/queryBySerial.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/queryCert.html b/base/ca/shared/webapps/ca/ee/ca/queryCert.html
index 32e2ac6..32e2ac6 100644
--- a/dogtag/ca-ui/shared/webapps/ca/ee/ca/queryCert.html
+++ b/base/ca/shared/webapps/ca/ee/ca/queryCert.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/queryCert.template b/base/ca/shared/webapps/ca/ee/ca/queryCert.template
index 1165cb3..1165cb3 100644
--- a/dogtag/ca-ui/shared/webapps/ca/ee/ca/queryCert.template
+++ b/base/ca/shared/webapps/ca/ee/ca/queryCert.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/reasonToRevoke.template b/base/ca/shared/webapps/ca/ee/ca/reasonToRevoke.template
index 7edfe7e..7edfe7e 100644
--- a/dogtag/ca-ui/shared/webapps/ca/ee/ca/reasonToRevoke.template
+++ b/base/ca/shared/webapps/ca/ee/ca/reasonToRevoke.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/recoveryMenu.html b/base/ca/shared/webapps/ca/ee/ca/recoveryMenu.html
index c463d2d..c463d2d 100644
--- a/dogtag/ca-ui/shared/webapps/ca/ee/ca/recoveryMenu.html
+++ b/base/ca/shared/webapps/ca/ee/ca/recoveryMenu.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/remoteAuthConfig.template b/base/ca/shared/webapps/ca/ee/ca/remoteAuthConfig.template
index f66f683..f66f683 100644
--- a/dogtag/ca-ui/shared/webapps/ca/ee/ca/remoteAuthConfig.template
+++ b/base/ca/shared/webapps/ca/ee/ca/remoteAuthConfig.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/renewalMenu.html b/base/ca/shared/webapps/ca/ee/ca/renewalMenu.html
index ca2956b..ca2956b 100644
--- a/dogtag/ca-ui/shared/webapps/ca/ee/ca/renewalMenu.html
+++ b/base/ca/shared/webapps/ca/ee/ca/renewalMenu.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/requestStatus.template b/base/ca/shared/webapps/ca/ee/ca/requestStatus.template
index a25f5e2..a25f5e2 100644
--- a/dogtag/ca-ui/shared/webapps/ca/ee/ca/requestStatus.template
+++ b/base/ca/shared/webapps/ca/ee/ca/requestStatus.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/retrievalMenu.html b/base/ca/shared/webapps/ca/ee/ca/retrievalMenu.html
index c7d8d13..c7d8d13 100644
--- a/dogtag/ca-ui/shared/webapps/ca/ee/ca/retrievalMenu.html
+++ b/base/ca/shared/webapps/ca/ee/ca/retrievalMenu.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/revocationMenu.html b/base/ca/shared/webapps/ca/ee/ca/revocationMenu.html
index 1b1d19a..1b1d19a 100644
--- a/dogtag/ca-ui/shared/webapps/ca/ee/ca/revocationMenu.html
+++ b/base/ca/shared/webapps/ca/ee/ca/revocationMenu.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/revocationResult.template b/base/ca/shared/webapps/ca/ee/ca/revocationResult.template
index ddcc661..ddcc661 100644
--- a/dogtag/ca-ui/shared/webapps/ca/ee/ca/revocationResult.template
+++ b/base/ca/shared/webapps/ca/ee/ca/revocationResult.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/srchCert.html b/base/ca/shared/webapps/ca/ee/ca/srchCert.html
index 2676d25..2676d25 100644
--- a/dogtag/ca-ui/shared/webapps/ca/ee/ca/srchCert.html
+++ b/base/ca/shared/webapps/ca/ee/ca/srchCert.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/srchCert.template b/base/ca/shared/webapps/ca/ee/ca/srchCert.template
index 4213d00..4213d00 100644
--- a/dogtag/ca-ui/shared/webapps/ca/ee/ca/srchCert.template
+++ b/base/ca/shared/webapps/ca/ee/ca/srchCert.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/tabs.html b/base/ca/shared/webapps/ca/ee/ca/tabs.html
index 2cf6ee3..2cf6ee3 100644
--- a/dogtag/ca-ui/shared/webapps/ca/ee/ca/tabs.html
+++ b/base/ca/shared/webapps/ca/ee/ca/tabs.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/toDisplayCRL.template b/base/ca/shared/webapps/ca/ee/ca/toDisplayCRL.template
index 2a15838..2a15838 100644
--- a/dogtag/ca-ui/shared/webapps/ca/ee/ca/toDisplayCRL.template
+++ b/base/ca/shared/webapps/ca/ee/ca/toDisplayCRL.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/ca/unrevocationResult.template b/base/ca/shared/webapps/ca/ee/ca/unrevocationResult.template
index b876f6f..b876f6f 100644
--- a/dogtag/ca-ui/shared/webapps/ca/ee/ca/unrevocationResult.template
+++ b/base/ca/shared/webapps/ca/ee/ca/unrevocationResult.template
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/cms-funcs.js b/base/ca/shared/webapps/ca/ee/cms-funcs.js
index 601a842..601a842 100644
--- a/dogtag/ca-ui/shared/webapps/ca/ee/cms-funcs.js
+++ b/base/ca/shared/webapps/ca/ee/cms-funcs.js
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/helpfun.js b/base/ca/shared/webapps/ca/ee/helpfun.js
index 14a80bb..14a80bb 100644
--- a/dogtag/ca-ui/shared/webapps/ca/ee/helpfun.js
+++ b/base/ca/shared/webapps/ca/ee/helpfun.js
diff --git a/dogtag/ca-ui/shared/webapps/ca/ee/index.html b/base/ca/shared/webapps/ca/ee/index.html
index 30662d4..30662d4 100644
--- a/dogtag/ca-ui/shared/webapps/ca/ee/index.html
+++ b/base/ca/shared/webapps/ca/ee/index.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/index.html b/base/ca/shared/webapps/ca/index.html
index 30662d4..30662d4 100644
--- a/dogtag/ca-ui/shared/webapps/ca/index.html
+++ b/base/ca/shared/webapps/ca/index.html
diff --git a/dogtag/ca-ui/shared/webapps/ca/services.template b/base/ca/shared/webapps/ca/services.template
index b4ce801..b4ce801 100644
--- a/dogtag/ca-ui/shared/webapps/ca/services.template
+++ b/base/ca/shared/webapps/ca/services.template
diff --git a/base/deploy/src/scriptlets/webapp_deployment.py b/base/deploy/src/scriptlets/webapp_deployment.py
index 9fca206..ff48189 100644
--- a/base/deploy/src/scriptlets/webapp_deployment.py
+++ b/base/deploy/src/scriptlets/webapp_deployment.py
@@ -62,14 +62,8 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet):
                     "admin"),
                 overwrite_flag=True)
 
-            util.directory.copy(
-                os.path.join(
-                    config.PKI_DEPLOYMENT_SOURCE_ROOT,
-                    master['pki_subsystem'].lower() + "-ui",
-                    "webapps",
-                    master['pki_subsystem'].lower()),
-                master['pki_tomcat_webapps_subsystem_path'],
-                overwrite_flag=True)
+            # Copy /usr/share/pki/<subsystem>/webapps/<subsystem>
+            # to <instance>/webapps/<subsystem>
             util.directory.copy(
                 os.path.join(
                     config.PKI_DEPLOYMENT_SOURCE_ROOT,
@@ -78,6 +72,7 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet):
                     master['pki_subsystem'].lower()),
                 master['pki_tomcat_webapps_subsystem_path'],
                 overwrite_flag=True)
+
             util.directory.create(
                 master['pki_tomcat_webapps_subsystem_webinf_classes_path'])
             util.directory.create(
diff --git a/dogtag/kra-ui/shared/webapps/kra/404.html b/base/kra/shared/webapps/kra/404.html
index 8ccd406..8ccd406 100755
--- a/dogtag/kra-ui/shared/webapps/kra/404.html
+++ b/base/kra/shared/webapps/kra/404.html
diff --git a/dogtag/kra-ui/shared/webapps/kra/500.html b/base/kra/shared/webapps/kra/500.html
index 1dc79ac..1dc79ac 100755
--- a/dogtag/kra-ui/shared/webapps/kra/500.html
+++ b/base/kra/shared/webapps/kra/500.html
diff --git a/dogtag/kra-ui/shared/webapps/kra/GenUnexpectedError.template b/base/kra/shared/webapps/kra/GenUnexpectedError.template
index 8cf1a05..8cf1a05 100644
--- a/dogtag/kra-ui/shared/webapps/kra/GenUnexpectedError.template
+++ b/base/kra/shared/webapps/kra/GenUnexpectedError.template
diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/GenError.template b/base/kra/shared/webapps/kra/agent/GenError.template
index 00fc21d..00fc21d 100644
--- a/dogtag/kra-ui/shared/webapps/kra/agent/GenError.template
+++ b/base/kra/shared/webapps/kra/agent/GenError.template
diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/GenPending.template b/base/kra/shared/webapps/kra/agent/GenPending.template
index 62d4316..62d4316 100644
--- a/dogtag/kra-ui/shared/webapps/kra/agent/GenPending.template
+++ b/base/kra/shared/webapps/kra/agent/GenPending.template
diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/GenRejected.template b/base/kra/shared/webapps/kra/agent/GenRejected.template
index d6c67f2..d6c67f2 100644
--- a/dogtag/kra-ui/shared/webapps/kra/agent/GenRejected.template
+++ b/base/kra/shared/webapps/kra/agent/GenRejected.template
diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/GenSuccess.template b/base/kra/shared/webapps/kra/agent/GenSuccess.template
index dc3a977..dc3a977 100644
--- a/dogtag/kra-ui/shared/webapps/kra/agent/GenSuccess.template
+++ b/base/kra/shared/webapps/kra/agent/GenSuccess.template
diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/GenSvcPending.template b/base/kra/shared/webapps/kra/agent/GenSvcPending.template
index 66a5249..66a5249 100644
--- a/dogtag/kra-ui/shared/webapps/kra/agent/GenSvcPending.template
+++ b/base/kra/shared/webapps/kra/agent/GenSvcPending.template
diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/GenUnauthorized.template b/base/kra/shared/webapps/kra/agent/GenUnauthorized.template
index fc137d0..fc137d0 100644
--- a/dogtag/kra-ui/shared/webapps/kra/agent/GenUnauthorized.template
+++ b/base/kra/shared/webapps/kra/agent/GenUnauthorized.template
diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/GenUnexpectedError.template b/base/kra/shared/webapps/kra/agent/GenUnexpectedError.template
index 2427a67..2427a67 100644
--- a/dogtag/kra-ui/shared/webapps/kra/agent/GenUnexpectedError.template
+++ b/base/kra/shared/webapps/kra/agent/GenUnexpectedError.template
diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/cms-funcs.js b/base/kra/shared/webapps/kra/agent/cms-funcs.js
index c8ffd51..c8ffd51 100644
--- a/dogtag/kra-ui/shared/webapps/kra/agent/cms-funcs.js
+++ b/base/kra/shared/webapps/kra/agent/cms-funcs.js
diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/funcs.js b/base/kra/shared/webapps/kra/agent/funcs.js
index daef83d..daef83d 100644
--- a/dogtag/kra-ui/shared/webapps/kra/agent/funcs.js
+++ b/base/kra/shared/webapps/kra/agent/funcs.js
diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/header.template b/base/kra/shared/webapps/kra/agent/header.template
index d1221b1..d1221b1 100644
--- a/dogtag/kra-ui/shared/webapps/kra/agent/header.template
+++ b/base/kra/shared/webapps/kra/agent/header.template
diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/helpfun.js b/base/kra/shared/webapps/kra/agent/helpfun.js
index 14a80bb..14a80bb 100644
--- a/dogtag/kra-ui/shared/webapps/kra/agent/helpfun.js
+++ b/base/kra/shared/webapps/kra/agent/helpfun.js
diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/index.html b/base/kra/shared/webapps/kra/agent/index.html
index 30662d4..30662d4 100644
--- a/dogtag/kra-ui/shared/webapps/kra/agent/index.html
+++ b/base/kra/shared/webapps/kra/agent/index.html
diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/index.template b/base/kra/shared/webapps/kra/agent/index.template
index c3200bb..c3200bb 100644
--- a/dogtag/kra-ui/shared/webapps/kra/agent/index.template
+++ b/base/kra/shared/webapps/kra/agent/index.template
diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/kra/GrantRecovery.html b/base/kra/shared/webapps/kra/agent/kra/GrantRecovery.html
index 4a2cf01..4a2cf01 100644
--- a/dogtag/kra-ui/shared/webapps/kra/agent/kra/GrantRecovery.html
+++ b/base/kra/shared/webapps/kra/agent/kra/GrantRecovery.html
diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/kra/ListRequests.html b/base/kra/shared/webapps/kra/agent/kra/ListRequests.html
index 7150c5d..7150c5d 100644
--- a/dogtag/kra-ui/shared/webapps/kra/agent/kra/ListRequests.html
+++ b/base/kra/shared/webapps/kra/agent/kra/ListRequests.html
diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/kra/SrchKey.html b/base/kra/shared/webapps/kra/agent/kra/SrchKey.html
index ce2d884..ce2d884 100644
--- a/dogtag/kra-ui/shared/webapps/kra/agent/kra/SrchKey.html
+++ b/base/kra/shared/webapps/kra/agent/kra/SrchKey.html
diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/kra/SrchRecoverKey.html b/base/kra/shared/webapps/kra/agent/kra/SrchRecoverKey.html
index ccffb07..ccffb07 100644
--- a/dogtag/kra-ui/shared/webapps/kra/agent/kra/SrchRecoverKey.html
+++ b/base/kra/shared/webapps/kra/agent/kra/SrchRecoverKey.html
diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/kra/blank.html b/base/kra/shared/webapps/kra/agent/kra/blank.html
index d2c04a6..d2c04a6 100644
--- a/dogtag/kra-ui/shared/webapps/kra/agent/kra/blank.html
+++ b/base/kra/shared/webapps/kra/agent/kra/blank.html
diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/kra/confirmRecover.html b/base/kra/shared/webapps/kra/agent/kra/confirmRecover.html
index 94df8b7..94df8b7 100644
--- a/dogtag/kra-ui/shared/webapps/kra/agent/kra/confirmRecover.html
+++ b/base/kra/shared/webapps/kra/agent/kra/confirmRecover.html
diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/kra/confirmRecoverBySerial.template b/base/kra/shared/webapps/kra/agent/kra/confirmRecoverBySerial.template
index 88a8d5c..88a8d5c 100644
--- a/dogtag/kra-ui/shared/webapps/kra/agent/kra/confirmRecoverBySerial.template
+++ b/base/kra/shared/webapps/kra/agent/kra/confirmRecoverBySerial.template
diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/kra/displayBySerial.template b/base/kra/shared/webapps/kra/agent/kra/displayBySerial.template
index 117535f..117535f 100644
--- a/dogtag/kra-ui/shared/webapps/kra/agent/kra/displayBySerial.template
+++ b/base/kra/shared/webapps/kra/agent/kra/displayBySerial.template
diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/kra/displayBySerial2.template b/base/kra/shared/webapps/kra/agent/kra/displayBySerial2.template
index 30af980..30af980 100644
--- a/dogtag/kra-ui/shared/webapps/kra/agent/kra/displayBySerial2.template
+++ b/base/kra/shared/webapps/kra/agent/kra/displayBySerial2.template
diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/kra/displayBySerialForRecovery.template b/base/kra/shared/webapps/kra/agent/kra/displayBySerialForRecovery.template
index 125e02e..125e02e 100644
--- a/dogtag/kra-ui/shared/webapps/kra/agent/kra/displayBySerialForRecovery.template
+++ b/base/kra/shared/webapps/kra/agent/kra/displayBySerialForRecovery.template
diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/kra/examineRecovery.template b/base/kra/shared/webapps/kra/agent/kra/examineRecovery.template
index f5a1f1f..f5a1f1f 100644
--- a/dogtag/kra-ui/shared/webapps/kra/agent/kra/examineRecovery.template
+++ b/base/kra/shared/webapps/kra/agent/kra/examineRecovery.template
diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/kra/finishAsyncRecovery.template b/base/kra/shared/webapps/kra/agent/kra/finishAsyncRecovery.template
index 0d2caf6..0d2caf6 100644
--- a/dogtag/kra-ui/shared/webapps/kra/agent/kra/finishAsyncRecovery.template
+++ b/base/kra/shared/webapps/kra/agent/kra/finishAsyncRecovery.template
diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/kra/finishRecovery.template b/base/kra/shared/webapps/kra/agent/kra/finishRecovery.template
index e73a262..e73a262 100644
--- a/dogtag/kra-ui/shared/webapps/kra/agent/kra/finishRecovery.template
+++ b/base/kra/shared/webapps/kra/agent/kra/finishRecovery.template
diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/kra/frameGrant.html b/base/kra/shared/webapps/kra/agent/kra/frameGrant.html
index 14b3ced..14b3ced 100644
--- a/dogtag/kra-ui/shared/webapps/kra/agent/kra/frameGrant.html
+++ b/base/kra/shared/webapps/kra/agent/kra/frameGrant.html
diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/kra/frameRecover.html b/base/kra/shared/webapps/kra/agent/kra/frameRecover.html
index 60cd76f..60cd76f 100644
--- a/dogtag/kra-ui/shared/webapps/kra/agent/kra/frameRecover.html
+++ b/base/kra/shared/webapps/kra/agent/kra/frameRecover.html
diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/kra/frameRequest.html b/base/kra/shared/webapps/kra/agent/kra/frameRequest.html
index ae544e3..ae544e3 100644
--- a/dogtag/kra-ui/shared/webapps/kra/agent/kra/frameRequest.html
+++ b/base/kra/shared/webapps/kra/agent/kra/frameRequest.html
diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/kra/frameSearch.html b/base/kra/shared/webapps/kra/agent/kra/frameSearch.html
index a48fee2..a48fee2 100644
--- a/dogtag/kra-ui/shared/webapps/kra/agent/kra/frameSearch.html
+++ b/base/kra/shared/webapps/kra/agent/kra/frameSearch.html
diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/kra/frameStats.html b/base/kra/shared/webapps/kra/agent/kra/frameStats.html
index 57a24de..57a24de 100644
--- a/dogtag/kra-ui/shared/webapps/kra/agent/kra/frameStats.html
+++ b/base/kra/shared/webapps/kra/agent/kra/frameStats.html
diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/kra/getApprovalStatus.template b/base/kra/shared/webapps/kra/agent/kra/getApprovalStatus.template
index 5a6a111..5a6a111 100644
--- a/dogtag/kra-ui/shared/webapps/kra/agent/kra/getApprovalStatus.template
+++ b/base/kra/shared/webapps/kra/agent/kra/getApprovalStatus.template
diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/kra/getStats.template b/base/kra/shared/webapps/kra/agent/kra/getStats.template
index b2cb341..b2cb341 100644
--- a/dogtag/kra-ui/shared/webapps/kra/agent/kra/getStats.template
+++ b/base/kra/shared/webapps/kra/agent/kra/getStats.template
diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/kra/grantAsyncRecovery.template b/base/kra/shared/webapps/kra/agent/kra/grantAsyncRecovery.template
index c76e61a..c76e61a 100644
--- a/dogtag/kra-ui/shared/webapps/kra/agent/kra/grantAsyncRecovery.template
+++ b/base/kra/shared/webapps/kra/agent/kra/grantAsyncRecovery.template
diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/kra/grantRecovery.template b/base/kra/shared/webapps/kra/agent/kra/grantRecovery.template
index 906da83..906da83 100644
--- a/dogtag/kra-ui/shared/webapps/kra/agent/kra/grantRecovery.template
+++ b/base/kra/shared/webapps/kra/agent/kra/grantRecovery.template
diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/kra/index.html b/base/kra/shared/webapps/kra/agent/kra/index.html
index 3caedfb..3caedfb 100644
--- a/dogtag/kra-ui/shared/webapps/kra/agent/kra/index.html
+++ b/base/kra/shared/webapps/kra/agent/kra/index.html
diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/kra/menuCheck.html b/base/kra/shared/webapps/kra/agent/kra/menuCheck.html
index 0787f10..0787f10 100644
--- a/dogtag/kra-ui/shared/webapps/kra/agent/kra/menuCheck.html
+++ b/base/kra/shared/webapps/kra/agent/kra/menuCheck.html
diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/kra/menuGrant.html b/base/kra/shared/webapps/kra/agent/kra/menuGrant.html
index 594dfaf..594dfaf 100644
--- a/dogtag/kra-ui/shared/webapps/kra/agent/kra/menuGrant.html
+++ b/base/kra/shared/webapps/kra/agent/kra/menuGrant.html
diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/kra/menuRecover.html b/base/kra/shared/webapps/kra/agent/kra/menuRecover.html
index 1439917..1439917 100644
--- a/dogtag/kra-ui/shared/webapps/kra/agent/kra/menuRecover.html
+++ b/base/kra/shared/webapps/kra/agent/kra/menuRecover.html
diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/kra/menuRequest.html b/base/kra/shared/webapps/kra/agent/kra/menuRequest.html
index 69a5300..69a5300 100644
--- a/dogtag/kra-ui/shared/webapps/kra/agent/kra/menuRequest.html
+++ b/base/kra/shared/webapps/kra/agent/kra/menuRequest.html
diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/kra/menuSearch.html b/base/kra/shared/webapps/kra/agent/kra/menuSearch.html
index e3f23d5..e3f23d5 100644
--- a/dogtag/kra-ui/shared/webapps/kra/agent/kra/menuSearch.html
+++ b/base/kra/shared/webapps/kra/agent/kra/menuSearch.html
diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/kra/menuStats.html b/base/kra/shared/webapps/kra/agent/kra/menuStats.html
index 2d132b1..2d132b1 100644
--- a/dogtag/kra-ui/shared/webapps/kra/agent/kra/menuStats.html
+++ b/base/kra/shared/webapps/kra/agent/kra/menuStats.html
diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/kra/monitor.template b/base/kra/shared/webapps/kra/agent/kra/monitor.template
index 35896ba..35896ba 100644
--- a/dogtag/kra-ui/shared/webapps/kra/agent/kra/monitor.template
+++ b/base/kra/shared/webapps/kra/agent/kra/monitor.template
diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/kra/processReq.template b/base/kra/shared/webapps/kra/agent/kra/processReq.template
index 078764d..078764d 100644
--- a/dogtag/kra-ui/shared/webapps/kra/agent/kra/processReq.template
+++ b/base/kra/shared/webapps/kra/agent/kra/processReq.template
diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/kra/queryKey.template b/base/kra/shared/webapps/kra/agent/kra/queryKey.template
index fd2348d..fd2348d 100644
--- a/dogtag/kra-ui/shared/webapps/kra/agent/kra/queryKey.template
+++ b/base/kra/shared/webapps/kra/agent/kra/queryKey.template
diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/kra/queryKeyForRecovery.template b/base/kra/shared/webapps/kra/agent/kra/queryKeyForRecovery.template
index aec5446..aec5446 100644
--- a/dogtag/kra-ui/shared/webapps/kra/agent/kra/queryKeyForRecovery.template
+++ b/base/kra/shared/webapps/kra/agent/kra/queryKeyForRecovery.template
diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/kra/queryReq.template b/base/kra/shared/webapps/kra/agent/kra/queryReq.template
index 61a7bb0..61a7bb0 100644
--- a/dogtag/kra-ui/shared/webapps/kra/agent/kra/queryReq.template
+++ b/base/kra/shared/webapps/kra/agent/kra/queryReq.template
diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/kra/recoverBySerial.template b/base/kra/shared/webapps/kra/agent/kra/recoverBySerial.template
index a1209f3..a1209f3 100644
--- a/dogtag/kra-ui/shared/webapps/kra/agent/kra/recoverBySerial.template
+++ b/base/kra/shared/webapps/kra/agent/kra/recoverBySerial.template
diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/kra/srchKey.template b/base/kra/shared/webapps/kra/agent/kra/srchKey.template
index f9d39e1..f9d39e1 100644
--- a/dogtag/kra-ui/shared/webapps/kra/agent/kra/srchKey.template
+++ b/base/kra/shared/webapps/kra/agent/kra/srchKey.template
diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/kra/srchKeyForRecovery.template b/base/kra/shared/webapps/kra/agent/kra/srchKeyForRecovery.template
index a4605ff..a4605ff 100644
--- a/dogtag/kra-ui/shared/webapps/kra/agent/kra/srchKeyForRecovery.template
+++ b/base/kra/shared/webapps/kra/agent/kra/srchKeyForRecovery.template
diff --git a/dogtag/kra-ui/shared/webapps/kra/agent/kra/top.html b/base/kra/shared/webapps/kra/agent/kra/top.html
index f90ad1a..f90ad1a 100644
--- a/dogtag/kra-ui/shared/webapps/kra/agent/kra/top.html
+++ b/base/kra/shared/webapps/kra/agent/kra/top.html
diff --git a/dogtag/kra-ui/shared/webapps/kra/index.html b/base/kra/shared/webapps/kra/index.html
index 30662d4..30662d4 100644
--- a/dogtag/kra-ui/shared/webapps/kra/index.html
+++ b/base/kra/shared/webapps/kra/index.html
diff --git a/dogtag/kra-ui/shared/webapps/kra/services.template b/base/kra/shared/webapps/kra/services.template
index 392c714..392c714 100644
--- a/dogtag/kra-ui/shared/webapps/kra/services.template
+++ b/base/kra/shared/webapps/kra/services.template
diff --git a/dogtag/ocsp-ui/shared/webapps/ocsp/404.html b/base/ocsp/shared/webapps/ocsp/404.html
index fd5264c..fd5264c 100755
--- a/dogtag/ocsp-ui/shared/webapps/ocsp/404.html
+++ b/base/ocsp/shared/webapps/ocsp/404.html
diff --git a/dogtag/ocsp-ui/shared/webapps/ocsp/500.html b/base/ocsp/shared/webapps/ocsp/500.html
index 2749fc7..2749fc7 100755
--- a/dogtag/ocsp-ui/shared/webapps/ocsp/500.html
+++ b/base/ocsp/shared/webapps/ocsp/500.html
diff --git a/dogtag/ocsp-ui/shared/webapps/ocsp/GenUnexpectedError.template b/base/ocsp/shared/webapps/ocsp/GenUnexpectedError.template
index 824bdb9..824bdb9 100644
--- a/dogtag/ocsp-ui/shared/webapps/ocsp/GenUnexpectedError.template
+++ b/base/ocsp/shared/webapps/ocsp/GenUnexpectedError.template
diff --git a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenError.template b/base/ocsp/shared/webapps/ocsp/agent/GenError.template
index 13996d5..13996d5 100644
--- a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenError.template
+++ b/base/ocsp/shared/webapps/ocsp/agent/GenError.template
diff --git a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenPending.template b/base/ocsp/shared/webapps/ocsp/agent/GenPending.template
index 9264d1b..9264d1b 100644
--- a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenPending.template
+++ b/base/ocsp/shared/webapps/ocsp/agent/GenPending.template
diff --git a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenRejected.template b/base/ocsp/shared/webapps/ocsp/agent/GenRejected.template
index 5e51555..5e51555 100644
--- a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenRejected.template
+++ b/base/ocsp/shared/webapps/ocsp/agent/GenRejected.template
diff --git a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenSuccess.template b/base/ocsp/shared/webapps/ocsp/agent/GenSuccess.template
index 9d9022b..9d9022b 100644
--- a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenSuccess.template
+++ b/base/ocsp/shared/webapps/ocsp/agent/GenSuccess.template
diff --git a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenSvcPending.template b/base/ocsp/shared/webapps/ocsp/agent/GenSvcPending.template
index 248f3e5..248f3e5 100644
--- a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenSvcPending.template
+++ b/base/ocsp/shared/webapps/ocsp/agent/GenSvcPending.template
diff --git a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenUnauthorized.template b/base/ocsp/shared/webapps/ocsp/agent/GenUnauthorized.template
index af2aede..af2aede 100644
--- a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenUnauthorized.template
+++ b/base/ocsp/shared/webapps/ocsp/agent/GenUnauthorized.template
diff --git a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenUnexpectedError.template b/base/ocsp/shared/webapps/ocsp/agent/GenUnexpectedError.template
index a929c76..a929c76 100644
--- a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/GenUnexpectedError.template
+++ b/base/ocsp/shared/webapps/ocsp/agent/GenUnexpectedError.template
diff --git a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/cms-funcs.js b/base/ocsp/shared/webapps/ocsp/agent/cms-funcs.js
index 473fb17..473fb17 100644
--- a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/cms-funcs.js
+++ b/base/ocsp/shared/webapps/ocsp/agent/cms-funcs.js
diff --git a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/funcs.js b/base/ocsp/shared/webapps/ocsp/agent/funcs.js
index daef83d..daef83d 100644
--- a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/funcs.js
+++ b/base/ocsp/shared/webapps/ocsp/agent/funcs.js
diff --git a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/header.template b/base/ocsp/shared/webapps/ocsp/agent/header.template
index d1221b1..d1221b1 100644
--- a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/header.template
+++ b/base/ocsp/shared/webapps/ocsp/agent/header.template
diff --git a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/helpfun.js b/base/ocsp/shared/webapps/ocsp/agent/helpfun.js
index 14a80bb..14a80bb 100644
--- a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/helpfun.js
+++ b/base/ocsp/shared/webapps/ocsp/agent/helpfun.js
diff --git a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/index.html b/base/ocsp/shared/webapps/ocsp/agent/index.html
index 30662d4..30662d4 100644
--- a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/index.html
+++ b/base/ocsp/shared/webapps/ocsp/agent/index.html
diff --git a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/index.template b/base/ocsp/shared/webapps/ocsp/agent/index.template
index be2c39d..be2c39d 100644
--- a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/index.template
+++ b/base/ocsp/shared/webapps/ocsp/agent/index.template
diff --git a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/AddCA.html b/base/ocsp/shared/webapps/ocsp/agent/ocsp/AddCA.html
index 43f2503..43f2503 100644
--- a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/AddCA.html
+++ b/base/ocsp/shared/webapps/ocsp/agent/ocsp/AddCA.html
diff --git a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/AddCRL.html b/base/ocsp/shared/webapps/ocsp/agent/ocsp/AddCRL.html
index 4a6878a..4a6878a 100644
--- a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/AddCRL.html
+++ b/base/ocsp/shared/webapps/ocsp/agent/ocsp/AddCRL.html
diff --git a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/CheckCert.html b/base/ocsp/shared/webapps/ocsp/agent/ocsp/CheckCert.html
index ca15f14..ca15f14 100644
--- a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/CheckCert.html
+++ b/base/ocsp/shared/webapps/ocsp/agent/ocsp/CheckCert.html
diff --git a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/addCA.template b/base/ocsp/shared/webapps/ocsp/agent/ocsp/addCA.template
index 3205ee0..3205ee0 100644
--- a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/addCA.template
+++ b/base/ocsp/shared/webapps/ocsp/agent/ocsp/addCA.template
diff --git a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/addCRL.template b/base/ocsp/shared/webapps/ocsp/agent/ocsp/addCRL.template
index 99f227c..99f227c 100644
--- a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/addCRL.template
+++ b/base/ocsp/shared/webapps/ocsp/agent/ocsp/addCRL.template
diff --git a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/checkCert.template b/base/ocsp/shared/webapps/ocsp/agent/ocsp/checkCert.template
index 5e8b893..5e8b893 100644
--- a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/checkCert.template
+++ b/base/ocsp/shared/webapps/ocsp/agent/ocsp/checkCert.template
diff --git a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/frameAddCA.html b/base/ocsp/shared/webapps/ocsp/agent/ocsp/frameAddCA.html
index afb888c..afb888c 100644
--- a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/frameAddCA.html
+++ b/base/ocsp/shared/webapps/ocsp/agent/ocsp/frameAddCA.html
diff --git a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/frameAddCRL.html b/base/ocsp/shared/webapps/ocsp/agent/ocsp/frameAddCRL.html
index 28be035..28be035 100644
--- a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/frameAddCRL.html
+++ b/base/ocsp/shared/webapps/ocsp/agent/ocsp/frameAddCRL.html
diff --git a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/frameCheckCert.html b/base/ocsp/shared/webapps/ocsp/agent/ocsp/frameCheckCert.html
index 21335c8..21335c8 100644
--- a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/frameCheckCert.html
+++ b/base/ocsp/shared/webapps/ocsp/agent/ocsp/frameCheckCert.html
diff --git a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/frameListCA.html b/base/ocsp/shared/webapps/ocsp/agent/ocsp/frameListCA.html
index 90530fd..90530fd 100644
--- a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/frameListCA.html
+++ b/base/ocsp/shared/webapps/ocsp/agent/ocsp/frameListCA.html
diff --git a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/frameOCSP.html b/base/ocsp/shared/webapps/ocsp/agent/ocsp/frameOCSP.html
index 00fad0f..00fad0f 100644
--- a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/frameOCSP.html
+++ b/base/ocsp/shared/webapps/ocsp/agent/ocsp/frameOCSP.html
diff --git a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/frameStats.html b/base/ocsp/shared/webapps/ocsp/agent/ocsp/frameStats.html
index 8efa27a..8efa27a 100644
--- a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/frameStats.html
+++ b/base/ocsp/shared/webapps/ocsp/agent/ocsp/frameStats.html
diff --git a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/getOCSPInfo.template b/base/ocsp/shared/webapps/ocsp/agent/ocsp/getOCSPInfo.template
index 9a27697..9a27697 100644
--- a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/getOCSPInfo.template
+++ b/base/ocsp/shared/webapps/ocsp/agent/ocsp/getOCSPInfo.template
diff --git a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/getStats.template b/base/ocsp/shared/webapps/ocsp/agent/ocsp/getStats.template
index 59ae3e6..59ae3e6 100644
--- a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/getStats.template
+++ b/base/ocsp/shared/webapps/ocsp/agent/ocsp/getStats.template
diff --git a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/index.html b/base/ocsp/shared/webapps/ocsp/agent/ocsp/index.html
index b941352..b941352 100644
--- a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/index.html
+++ b/base/ocsp/shared/webapps/ocsp/agent/ocsp/index.html
diff --git a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/listCAs.template b/base/ocsp/shared/webapps/ocsp/agent/ocsp/listCAs.template
index 93cc6cd..93cc6cd 100644
--- a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/listCAs.template
+++ b/base/ocsp/shared/webapps/ocsp/agent/ocsp/listCAs.template
diff --git a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/menuAddCA.html b/base/ocsp/shared/webapps/ocsp/agent/ocsp/menuAddCA.html
index 6b4419f..6b4419f 100644
--- a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/menuAddCA.html
+++ b/base/ocsp/shared/webapps/ocsp/agent/ocsp/menuAddCA.html
diff --git a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/menuAddCRL.html b/base/ocsp/shared/webapps/ocsp/agent/ocsp/menuAddCRL.html
index 7da3025..7da3025 100644
--- a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/menuAddCRL.html
+++ b/base/ocsp/shared/webapps/ocsp/agent/ocsp/menuAddCRL.html
diff --git a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/menuCheckCert.html b/base/ocsp/shared/webapps/ocsp/agent/ocsp/menuCheckCert.html
index 2e4773a..2e4773a 100644
--- a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/menuCheckCert.html
+++ b/base/ocsp/shared/webapps/ocsp/agent/ocsp/menuCheckCert.html
diff --git a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/menuListCA.html b/base/ocsp/shared/webapps/ocsp/agent/ocsp/menuListCA.html
index ac99b75..ac99b75 100644
--- a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/menuListCA.html
+++ b/base/ocsp/shared/webapps/ocsp/agent/ocsp/menuListCA.html
diff --git a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/menuOCSP.html b/base/ocsp/shared/webapps/ocsp/agent/ocsp/menuOCSP.html
index b019fe8..b019fe8 100644
--- a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/menuOCSP.html
+++ b/base/ocsp/shared/webapps/ocsp/agent/ocsp/menuOCSP.html
diff --git a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/menuStats.html b/base/ocsp/shared/webapps/ocsp/agent/ocsp/menuStats.html
index f86dd05..f86dd05 100644
--- a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/menuStats.html
+++ b/base/ocsp/shared/webapps/ocsp/agent/ocsp/menuStats.html
diff --git a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/removeCA.template b/base/ocsp/shared/webapps/ocsp/agent/ocsp/removeCA.template
index 7da8924..7da8924 100755
--- a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/removeCA.template
+++ b/base/ocsp/shared/webapps/ocsp/agent/ocsp/removeCA.template
diff --git a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ports.template b/base/ocsp/shared/webapps/ocsp/agent/ports.template
index 8413ada..8413ada 100644
--- a/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ports.template
+++ b/base/ocsp/shared/webapps/ocsp/agent/ports.template
diff --git a/dogtag/ocsp-ui/shared/webapps/ocsp/index.html b/base/ocsp/shared/webapps/ocsp/index.html
index 30662d4..30662d4 100644
--- a/dogtag/ocsp-ui/shared/webapps/ocsp/index.html
+++ b/base/ocsp/shared/webapps/ocsp/index.html
diff --git a/dogtag/ocsp-ui/shared/webapps/ocsp/services.template b/base/ocsp/shared/webapps/ocsp/services.template
index 4b45118..4b45118 100644
--- a/dogtag/ocsp-ui/shared/webapps/ocsp/services.template
+++ b/base/ocsp/shared/webapps/ocsp/services.template
diff --git a/dogtag/tks-ui/shared/webapps/tks/404.html b/base/tks/shared/webapps/tks/404.html
index 5122cc2..5122cc2 100755
--- a/dogtag/tks-ui/shared/webapps/tks/404.html
+++ b/base/tks/shared/webapps/tks/404.html
diff --git a/dogtag/tks-ui/shared/webapps/tks/500.html b/base/tks/shared/webapps/tks/500.html
index 7547fa8..7547fa8 100755
--- a/dogtag/tks-ui/shared/webapps/tks/500.html
+++ b/base/tks/shared/webapps/tks/500.html
diff --git a/dogtag/tks-ui/shared/webapps/tks/GenUnexpectedError.template b/base/tks/shared/webapps/tks/GenUnexpectedError.template
index af0683f..af0683f 100644
--- a/dogtag/tks-ui/shared/webapps/tks/GenUnexpectedError.template
+++ b/base/tks/shared/webapps/tks/GenUnexpectedError.template
diff --git a/dogtag/tks-ui/shared/webapps/tks/agent/GenError.template b/base/tks/shared/webapps/tks/agent/GenError.template
index 0db5d1d..0db5d1d 100644
--- a/dogtag/tks-ui/shared/webapps/tks/agent/GenError.template
+++ b/base/tks/shared/webapps/tks/agent/GenError.template
diff --git a/dogtag/tks-ui/shared/webapps/tks/agent/GenPending.template b/base/tks/shared/webapps/tks/agent/GenPending.template
index a75a5eb..a75a5eb 100644
--- a/dogtag/tks-ui/shared/webapps/tks/agent/GenPending.template
+++ b/base/tks/shared/webapps/tks/agent/GenPending.template
diff --git a/dogtag/tks-ui/shared/webapps/tks/agent/GenRejected.template b/base/tks/shared/webapps/tks/agent/GenRejected.template
index 112717a..112717a 100644
--- a/dogtag/tks-ui/shared/webapps/tks/agent/GenRejected.template
+++ b/base/tks/shared/webapps/tks/agent/GenRejected.template
diff --git a/dogtag/tks-ui/shared/webapps/tks/agent/GenSuccess.template b/base/tks/shared/webapps/tks/agent/GenSuccess.template
index 02a9b9b..02a9b9b 100644
--- a/dogtag/tks-ui/shared/webapps/tks/agent/GenSuccess.template
+++ b/base/tks/shared/webapps/tks/agent/GenSuccess.template
diff --git a/dogtag/tks-ui/shared/webapps/tks/agent/GenSvcPending.template b/base/tks/shared/webapps/tks/agent/GenSvcPending.template
index cb36a58..cb36a58 100644
--- a/dogtag/tks-ui/shared/webapps/tks/agent/GenSvcPending.template
+++ b/base/tks/shared/webapps/tks/agent/GenSvcPending.template
diff --git a/dogtag/tks-ui/shared/webapps/tks/agent/GenUnauthorized.template b/base/tks/shared/webapps/tks/agent/GenUnauthorized.template
index c6e62f8..c6e62f8 100644
--- a/dogtag/tks-ui/shared/webapps/tks/agent/GenUnauthorized.template
+++ b/base/tks/shared/webapps/tks/agent/GenUnauthorized.template
diff --git a/dogtag/tks-ui/shared/webapps/tks/agent/GenUnexpectedError.template b/base/tks/shared/webapps/tks/agent/GenUnexpectedError.template
index 4047cd6..4047cd6 100644
--- a/dogtag/tks-ui/shared/webapps/tks/agent/GenUnexpectedError.template
+++ b/base/tks/shared/webapps/tks/agent/GenUnexpectedError.template
diff --git a/dogtag/tks-ui/shared/webapps/tks/agent/cms-funcs.js b/base/tks/shared/webapps/tks/agent/cms-funcs.js
index c8ffd51..c8ffd51 100644
--- a/dogtag/tks-ui/shared/webapps/tks/agent/cms-funcs.js
+++ b/base/tks/shared/webapps/tks/agent/cms-funcs.js
diff --git a/dogtag/tks-ui/shared/webapps/tks/agent/funcs.js b/base/tks/shared/webapps/tks/agent/funcs.js
index daef83d..daef83d 100644
--- a/dogtag/tks-ui/shared/webapps/tks/agent/funcs.js
+++ b/base/tks/shared/webapps/tks/agent/funcs.js
diff --git a/dogtag/tks-ui/shared/webapps/tks/agent/header.template b/base/tks/shared/webapps/tks/agent/header.template
index d1221b1..d1221b1 100644
--- a/dogtag/tks-ui/shared/webapps/tks/agent/header.template
+++ b/base/tks/shared/webapps/tks/agent/header.template
diff --git a/dogtag/tks-ui/shared/webapps/tks/agent/helpfun.js b/base/tks/shared/webapps/tks/agent/helpfun.js
index f958027..f958027 100644
--- a/dogtag/tks-ui/shared/webapps/tks/agent/helpfun.js
+++ b/base/tks/shared/webapps/tks/agent/helpfun.js
diff --git a/dogtag/tks-ui/shared/webapps/tks/agent/index.html b/base/tks/shared/webapps/tks/agent/index.html
index 30662d4..30662d4 100644
--- a/dogtag/tks-ui/shared/webapps/tks/agent/index.html
+++ b/base/tks/shared/webapps/tks/agent/index.html
diff --git a/dogtag/tks-ui/shared/webapps/tks/agent/index.template b/base/tks/shared/webapps/tks/agent/index.template
index 534ad25..534ad25 100644
--- a/dogtag/tks-ui/shared/webapps/tks/agent/index.template
+++ b/base/tks/shared/webapps/tks/agent/index.template
diff --git a/dogtag/tks-ui/shared/webapps/tks/agent/ports.template b/base/tks/shared/webapps/tks/agent/ports.template
index 4d33dd3..4d33dd3 100644
--- a/dogtag/tks-ui/shared/webapps/tks/agent/ports.template
+++ b/base/tks/shared/webapps/tks/agent/ports.template
diff --git a/dogtag/tks-ui/shared/webapps/tks/agent/tks/getStats.template b/base/tks/shared/webapps/tks/agent/tks/getStats.template
index 59ae3e6..59ae3e6 100644
--- a/dogtag/tks-ui/shared/webapps/tks/agent/tks/getStats.template
+++ b/base/tks/shared/webapps/tks/agent/tks/getStats.template
diff --git a/dogtag/tks-ui/shared/webapps/tks/agent/tks/index.html b/base/tks/shared/webapps/tks/agent/tks/index.html
index e9e0252..e9e0252 100644
--- a/dogtag/tks-ui/shared/webapps/tks/agent/tks/index.html
+++ b/base/tks/shared/webapps/tks/agent/tks/index.html
diff --git a/dogtag/tks-ui/shared/webapps/tks/index.html b/base/tks/shared/webapps/tks/index.html
index 30662d4..30662d4 100644
--- a/dogtag/tks-ui/shared/webapps/tks/index.html
+++ b/base/tks/shared/webapps/tks/index.html
diff --git a/dogtag/tks-ui/shared/webapps/tks/services.template b/base/tks/shared/webapps/tks/services.template
index 133bcf2..133bcf2 100644
--- a/dogtag/tks-ui/shared/webapps/tks/services.template
+++ b/base/tks/shared/webapps/tks/services.template