Re: [Pki-devel] [PATCH] 919 Merged /pki webapps.

ACK (with CAVEAT) if tested to work. CAVEAT: This should be separated into three separate patches (one for base changes, one for dogtag changes, and a separate one containing the spec file change) prior to check-in: * Patch 1: o base/server/python/pki/server/deployment/scriptlets/instance_layout.py o base/server/tomcat7/conf/Catalina/localhost/pki#admin.xml o base/server/tomcat7/conf/Catalina/localhost/pki#js.xml o base/server/tomcat7/conf/Catalina/localhost/pki.xml o base/server/tomcat8/conf/Catalina/localhost/pki#admin.xml o base/server/tomcat8/conf/Catalina/localhost/pki#js.xml o base/server/tomcat8/conf/Catalina/localhost/pki.xml o base/server/upgrade/10.4.0/02-MergePKIWebapps o delete mode 100644 base/server/tomcat7/conf/Catalina/localhost/pki#admin.xml o delete mode 100644 base/server/tomcat7/conf/Catalina/localhost/pki#js.xml o delete mode 100644 base/server/tomcat8/conf/Catalina/localhost/pki#admin.xml o delete mode 100644 base/server/tomcat8/conf/Catalina/localhost/pki#js.xml o create mode 100755 base/server/upgrade/10.4.0/02-MergePKIWebapps * Patch 2: o dogtag/common-ui/CMakeLists.txt * Patch 3: o specs/dogtag-pki-theme.spec