diff --git a/scripts/compose_dogtag_pki_theme_packages b/scripts/compose_dogtag_pki_theme_packages
deleted file mode 100755
index eca344e806a..00000000000
--- a/scripts/compose_dogtag_pki_theme_packages
+++ /dev/null
@@ -1,144 +0,0 @@
-#!/bin/sh -e
-
-# BEGIN COPYRIGHT BLOCK
-# (C) 2010 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-
-##
-## Include common 'compose' functions
-##
-
-COMPOSE_PWD=`dirname $0`
-. ${COMPOSE_PWD}/compose_functions
-
-
-## Always switch into the base directory three levels
-## above this shell script prior to executing it so
-## that all of its output is written to this directory
-
-cd `dirname $0`/../..
-
-
-##
-## Retrieve the name of this base directory
-##
-
-PKI_PWD=`pwd`
-
-
-##
-## Establish the 'dogtag-pki' name and version information
-##
-
-DOGTAG_PKI_THEME="dogtag-pki-theme"
-PKI_SPECS_FILE="${PKI_DIR}/specs/${DOGTAG_PKI_THEME}.spec.in"
-DOGTAG_PKI_THEME_VERSION="`rpmspec -P "${PKI_SPECS_FILE}" | grep '^Version:' | awk '{print $2;}'`"
-
-
-##
-## Establish the TARGET files/directories of the 'dogtag-pki' source/spec files
-##
-
-if [ $WORK_DIR ]; then
-    PKI_PACKAGES="`cd $WORK_DIR ; pwd`"
-else
-    PKI_PACKAGES="${PKI_PWD}/packages"
-fi
-
-DOGTAG_PKI_THEME_BUILD_DIR="${PKI_PACKAGES}/BUILD"
-DOGTAG_PKI_THEME_RPMS_DIR="${PKI_PACKAGES}/RPMS"
-DOGTAG_PKI_THEME_SOURCES_DIR="${PKI_PACKAGES}/SOURCES"
-DOGTAG_PKI_THEME_SPECS_DIR="${PKI_PACKAGES}/SPECS"
-DOGTAG_PKI_THEME_SRPMS_DIR="${PKI_PACKAGES}/SRPMS"
-
-DOGTAG_PKI_THEME_TARBALL="pki-${DOGTAG_PKI_THEME_VERSION}.tar.gz"
-DOGTAG_PKI_THEME_SPEC_FILE="${DOGTAG_PKI_THEME_SPECS_DIR}/${DOGTAG_PKI_THEME}.spec"
-
-DOGTAG_PKI_THEME_STAGING_DIR="${PKI_PACKAGES}/staging"
-DOGTAG_PKI_THEME_DIR="${DOGTAG_PKI_THEME_STAGING_DIR}/${DOGTAG_PKI_THEME}-${DOGTAG_PKI_THEME_VERSION}"
-DOGTAG_PKI_THEME_DOGTAG_DIR="${DOGTAG_PKI_THEME_DIR}/dogtag"
-
-
-##
-## Always create a top-level 'packages' directory
-##
-
-mkdir -p ${PKI_PACKAGES}
-
-
-
-##
-## Always create 'dogtag-pki' package directories
-##
-
-mkdir -p ${DOGTAG_PKI_THEME_BUILD_DIR}
-mkdir -p ${DOGTAG_PKI_THEME_RPMS_DIR}
-mkdir -p ${DOGTAG_PKI_THEME_SOURCES_DIR}
-mkdir -p ${DOGTAG_PKI_THEME_SPECS_DIR}
-mkdir -p ${DOGTAG_PKI_THEME_SRPMS_DIR}
-
-
-##
-## Always start with new 'dogtag-pki' package files
-##
-
-rm -rf ${DOGTAG_PKI_THEME_BUILD_DIR}/${DOGTAG_PKI_THEME}-${DOGTAG_PKI_THEME_VERSION}
-rm -f  ${DOGTAG_PKI_THEME_RPMS_DIR}/${DOGTAG_PKI_THEME}-${DOGTAG_PKI_THEME_VERSION}*.rpm
-rm -f  ${DOGTAG_PKI_THEME_SOURCES_DIR}/${DOGTAG_PKI_THEME_TARBALL}
-rm -f  ${DOGTAG_PKI_THEME_SPEC_FILE}
-rm -f  ${DOGTAG_PKI_THEME_SRPMS_DIR}/${DOGTAG_PKI_THEME}-${DOGTAG_PKI_THEME_VERSION}*.rpm
-
-
-##
-## Compute build options
-##
-
-compute_build_options
-
-
-##
-## Insert timestamp and commit ID while copying spec template into actual spec file.
-##
-
-sed "s/%{?_timestamp}/${_TIMESTAMP}/g; s/%{?_commit_id}/${_COMMIT_ID}/g" \
-    ${PKI_SPECS_FILE} > ${DOGTAG_PKI_THEME_SPEC_FILE}
-
-# rpmlint ${DOGTAG_PKI_THEME_SPEC_FILE}
-
-
-##
-## Create the 'dogtag-pki' tarball
-##
-
-tar czf \
- ${DOGTAG_PKI_THEME_SOURCES_DIR}/${DOGTAG_PKI_THEME_TARBALL} \
- --transform "s,^./,pki-${DOGTAG_PKI_THEME_VERSION}/," \
- --exclude .git \
- --exclude .svn \
- --exclude .swp \
- --exclude .metadata \
- --exclude build \
- --exclude .tox \
- --exclude dist \
- --exclude MANIFEST \
- --exclude *.pyc \
- --exclude __pycache__ \
- -C ${PKI_DIR} \
- .
-
-
-##
-## Automatically invoke RPM/SRPM creation
-##
-
-cd ${PKI_PACKAGES}
-rpmbuild \
-  ${RPMBUILD_OP} \
-  --define "_topdir ${PKI_PACKAGES}" \
-  "${OPTIONS[@]}" \
-  ${DOGTAG_PKI_THEME_SPEC_FILE} \
-  | tee package_${DOGTAG_PKI_THEME}.log 2>&1
-
-echo "RPM packages:"
-find "$DOGTAG_PKI_THEME_RPMS_DIR" -type f -printf " %p\n"
diff --git a/scripts/compose_pki_console_packages b/scripts/compose_pki_console_packages
deleted file mode 100755
index cc2039c37b1..00000000000
--- a/scripts/compose_pki_console_packages
+++ /dev/null
@@ -1,144 +0,0 @@
-#!/bin/sh -e
-
-# BEGIN COPYRIGHT BLOCK
-# (C) 2010 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-
-##
-## Include common 'compose' functions
-##
-
-COMPOSE_PWD=`dirname $0`
-. ${COMPOSE_PWD}/compose_functions
-
-
-## Always switch into the base directory three levels
-## above this shell script prior to executing it so
-## that all of its output is written to this directory
-
-cd `dirname $0`/../..
-
-
-##
-## Retrieve the name of this base directory
-##
-
-PKI_PWD=`pwd`
-
-
-##
-## Establish the 'pki-console' name and version information
-##
-
-PKI_CONSOLE="pki-console"
-PKI_SPECS_FILE="${PKI_DIR}/specs/${PKI_CONSOLE}.spec.in"
-PKI_CONSOLE_VERSION="`rpmspec -P "${PKI_SPECS_FILE}" | grep '^Version:' | awk '{print $2;}'`"
-
-
-##
-## Establish the TARGET files/directories of the 'pki-console' source/spec files
-##
-
-if [ $WORK_DIR ]; then
-    PKI_PACKAGES="`cd $WORK_DIR ; pwd`"
-else
-    PKI_PACKAGES="${PKI_PWD}/packages"
-fi
-
-PKI_CONSOLE_BUILD_DIR="${PKI_PACKAGES}/BUILD"
-PKI_CONSOLE_RPMS_DIR="${PKI_PACKAGES}/RPMS"
-PKI_CONSOLE_SOURCES_DIR="${PKI_PACKAGES}/SOURCES"
-PKI_CONSOLE_SPECS_DIR="${PKI_PACKAGES}/SPECS"
-PKI_CONSOLE_SRPMS_DIR="${PKI_PACKAGES}/SRPMS"
-
-PKI_CONSOLE_TARBALL="pki-${PKI_CONSOLE_VERSION}.tar.gz"
-PKI_CONSOLE_SPEC_FILE="${PKI_CONSOLE_SPECS_DIR}/${PKI_CONSOLE}.spec"
-
-PKI_CONSOLE_STAGING_DIR="${PKI_PACKAGES}/staging"
-PKI_CONSOLE_DIR="${PKI_CONSOLE_STAGING_DIR}/${PKI_CONSOLE}-${PKI_CONSOLE_VERSION}"
-PKI_CONSOLE_BASE_DIR="${PKI_CONSOLE_DIR}/base"
-
-
-##
-## Always create a top-level 'packages' directory
-##
-
-mkdir -p ${PKI_PACKAGES}
-
-
-##
-## Always create 'pki-console' package directories
-##
-
-mkdir -p ${PKI_CONSOLE_BUILD_DIR}
-mkdir -p ${PKI_CONSOLE_RPMS_DIR}
-mkdir -p ${PKI_CONSOLE_SOURCES_DIR}
-mkdir -p ${PKI_CONSOLE_SPECS_DIR}
-mkdir -p ${PKI_CONSOLE_SRPMS_DIR}
-
-
-##
-## Always start with new 'pki-console' package files
-##
-
-rm -rf ${PKI_CONSOLE_BUILD_DIR}/${PKI_CONSOLE}-${PKI_CONSOLE_VERSION}
-rm -f  ${PKI_CONSOLE_RPMS_DIR}/${PKI_CONSOLE}-${PKI_CONSOLE_VERSION}*.rpm
-rm -f  ${PKI_CONSOLE_SOURCES_DIR}/${PKI_CONSOLE_TARBALL}
-rm -f  ${PKI_CONSOLE_SPEC_FILE}
-rm -f  ${PKI_CONSOLE_SRPMS_DIR}/${PKI_CONSOLE}-${PKI_CONSOLE_VERSION}*.rpm
-
-
-##
-## Compute build options
-##
-
-compute_build_options
-
-
-##
-## Insert timestamp and commit ID while copying spec template into actual spec file.
-##
-
-sed "s/%{?_timestamp}/${_TIMESTAMP}/g; s/%{?_commit_id}/${_COMMIT_ID}/g" \
-    ${PKI_SPECS_FILE} > ${PKI_CONSOLE_SPEC_FILE}
-
-# rpmlint ${PKI_CONSOLE_SPEC_FILE}
-
-
-##
-## Create the 'pki-console' tarball
-##
-
-
-tar czf \
- ${PKI_CONSOLE_SOURCES_DIR}/${PKI_CONSOLE_TARBALL} \
- --transform "s,^./,pki-${PKI_CONSOLE_VERSION}/," \
- --exclude .git \
- --exclude .svn \
- --exclude .swp \
- --exclude .metadata \
- --exclude build \
- --exclude .tox \
- --exclude dist \
- --exclude MANIFEST \
- --exclude *.pyc \
- --exclude __pycache__ \
- -C ${PKI_DIR} \
- .
-
-
-##
-## Automatically invoke RPM/SRPM creation
-##
-
-cd ${PKI_PACKAGES}
-rpmbuild \
-  ${RPMBUILD_OP} \
-  --define "_topdir ${PKI_PACKAGES}" \
-  "${OPTIONS[@]}" \
-  ${PKI_CONSOLE_SPEC_FILE} \
-  | tee package_${PKI_CONSOLE}.log 2>&1
-
-echo "RPM packages:"
-find "$PKI_CONSOLE_RPMS_DIR" -type f -printf " %p\n"
diff --git a/specs/dogtag-pki-theme.spec.in b/specs/dogtag-pki-theme.spec.in
deleted file mode 100644
index c76f45487b7..00000000000
--- a/specs/dogtag-pki-theme.spec.in
+++ /dev/null
@@ -1,188 +0,0 @@
-################################################################################
-Name:             dogtag-pki-theme
-################################################################################
-
-Summary:          Dogtag PKI Theme Package
-URL:              http://www.dogtagpki.org/
-License:          GPLv2
-
-Version:          10.6.3
-Release:          1%{?_timestamp}%{?_commit_id}%{?dist}
-# global           _phase -a1
-
-# To create a tarball from a version tag:
-# $ git archive \
-#     --format=tar.gz \
-#     --prefix pki-<version>/ \
-#     -o pki-<version>.tar.gz \
-#     <version tag>
-Source: https://github.com/dogtagpki/pki/archive/v%{version}%{?_phase}/pki-%{version}%{?_phase}.tar.gz
-
-# To create a patch for all changes since a version tag:
-# $ git format-patch \
-#     --stdout \
-#     <version tag> \
-#     > pki-VERSION-RELEASE.patch
-# Patch: pki-VERSION-RELEASE.patch
-
-################################################################################
-# Build Dependencies
-################################################################################
-
-# autosetup
-BuildRequires:    git
-
-BuildRequires:    cmake >= 2.8.9-1
-BuildRequires:    gcc-c++
-BuildRequires:    java-1.8.0-openjdk-devel
-BuildRequires:    jpackage-utils >= 1.7.5-10
-
-%description
-Several PKI packages utilize a "virtual" theme component.  These
-"virtual" theme components are "Provided" by various theme "flavors"
-including "dogtag" or a user customized theme package.  Consequently,
-all "dogtag" and any customized theme components MUST be mutually
-exclusive!
-
-################################################################################
-%package -n       dogtag-pki-server-theme
-################################################################################
-
-Summary:          Dogtag PKI Server Theme Package
-BuildArch:        noarch
-
-Obsoletes:        dogtag-pki-common-theme < %{version}-%{release}
-Obsoletes:        dogtag-pki-common-ui < %{version}-%{release}
-Obsoletes:        dogtag-pki-ca-theme < %{version}-%{release}
-Obsoletes:        dogtag-pki-ca-ui < %{version}-%{release}
-Obsoletes:        dogtag-pki-kra-theme < %{version}-%{release}
-Obsoletes:        dogtag-pki-kra-ui < %{version}-%{release}
-Obsoletes:        dogtag-pki-ocsp-theme < %{version}-%{release}
-Obsoletes:        dogtag-pki-ocsp-ui < %{version}-%{release}
-Obsoletes:        dogtag-pki-tks-theme < %{version}-%{release}
-Obsoletes:        dogtag-pki-tks-ui < %{version}-%{release}
-Obsoletes:        dogtag-pki-tps-theme < %{version}-%{release}
-Obsoletes:        dogtag-pki-tps-ui < %{version}-%{release}
-
-Provides:         dogtag-pki-common-theme = %{version}-%{release}
-Provides:         dogtag-pki-common-ui = %{version}-%{release}
-Provides:         dogtag-pki-ca-theme = %{version}-%{release}
-Provides:         dogtag-pki-ca-ui = %{version}-%{release}
-Provides:         dogtag-pki-kra-theme = %{version}-%{release}
-Provides:         dogtag-pki-kra-ui = %{version}-%{release}
-Provides:         dogtag-pki-ocsp-theme = %{version}-%{release}
-Provides:         dogtag-pki-ocsp-ui = %{version}-%{release}
-Provides:         dogtag-pki-tks-theme = %{version}-%{release}
-Provides:         dogtag-pki-tks-ui = %{version}-%{release}
-Provides:         dogtag-pki-tps-theme = %{version}-%{release}
-Provides:         dogtag-pki-tps-ui = %{version}-%{release}
-
-Provides:         pki-server-theme = %{version}-%{release}
-Provides:         pki-common-theme = %{version}-%{release}
-Provides:         pki-common-ui = %{version}-%{release}
-Provides:         pki-ca-theme = %{version}-%{release}
-Provides:         pki-ca-ui = %{version}-%{release}
-Provides:         pki-kra-theme = %{version}-%{release}
-Provides:         pki-kra-ui = %{version}-%{release}
-Provides:         pki-ocsp-theme = %{version}-%{release}
-Provides:         pki-ocsp-ui = %{version}-%{release}
-Provides:         pki-tks-theme = %{version}-%{release}
-Provides:         pki-tks-ui = %{version}-%{release}
-Provides:         pki-tps-theme = %{version}-%{release}
-Provides:         pki-tps-ui = %{version}-%{release}
-
-%description -n   dogtag-pki-server-theme
-This PKI Server Theme Package contains
-Dogtag textual and graphical user interface for PKI Server.
-
-################################################################################
-%package -n       dogtag-pki-console-theme
-################################################################################
-
-Summary:          Dogtag PKI Console Theme Package
-BuildArch:        noarch
-
-%if 0%{?rhel}
-# EPEL version of Dogtag "theme" conflicts with all versions of Red Hat "theme"
-Conflicts:        redhat-pki-console-theme
-Conflicts:        redhat-pki-console-ui
-%endif
-
-Provides:         pki-console-theme = %{version}-%{release}
-Provides:         pki-console-ui = %{version}-%{release}
-
-%description -n   dogtag-pki-console-theme
-This PKI Console Theme Package contains
-Dogtag textual and graphical user interface for PKI Console.
-
-################################################################################
-%prep
-################################################################################
-
-%autosetup -n pki-%{version}%{?_phase} -p 1 -S git
-
-################################################################################
-%build
-################################################################################
-
-%{__mkdir_p} build
-cd build
-%cmake \
-    --no-warn-unused-cli \
-    -DVERSION=%{version}-%{release} \
-    -DVAR_INSTALL_DIR:PATH=/var \
-    -DJAVA_LIB_INSTALL_DIR=%{_jnidir} \
-    -DBUILD_DOGTAG_PKI_THEME:BOOL=ON \
-    ..
-
-################################################################################
-%install
-################################################################################
-
-cd build
-
-# Do not use _smp_mflags to preserve build order
-%{__make} \
-    VERBOSE=%{?_verbose} \
-    CMAKE_NO_VERBOSE=1 \
-    DESTDIR=%{buildroot} \
-    INSTALL="install -p" \
-    --no-print-directory \
-    all install
-
-# NOTE:  Several "theme" packages require ownership of the "/usr/share/pki"
-#        directory because the PKI subsystems (CA, KRA, OCSP, TKS, TPS)
-#        which require them may be installed either independently or in
-#        multiple combinations.
-
-################################################################################
-%files -n dogtag-pki-server-theme
-################################################################################
-
-%defattr(-,root,root,-)
-%doc dogtag/common-ui/LICENSE
-%dir %{_datadir}/pki
-%{_datadir}/pki/common-ui/
-%{_datadir}/pki/server/webapps/pki/ca
-%{_datadir}/pki/server/webapps/pki/css
-%{_datadir}/pki/server/webapps/pki/esc
-%{_datadir}/pki/server/webapps/pki/fonts
-%{_datadir}/pki/server/webapps/pki/images
-%{_datadir}/pki/server/webapps/pki/kra
-%{_datadir}/pki/server/webapps/pki/ocsp
-%{_datadir}/pki/server/webapps/pki/pki.properties
-%{_datadir}/pki/server/webapps/pki/tks
-
-################################################################################
-%files -n dogtag-pki-console-theme
-################################################################################
-
-%defattr(-,root,root,-)
-%doc dogtag/console-ui/LICENSE
-%{_javadir}/pki/pki-console-theme.jar
-
-################################################################################
-%changelog
-* Tue Mar 6 2018 Dogtag PKI Team <pki-devel@redhat.com> 10.6.0-0
-- To list changes in <branch> since <tag>:
-  $ git log --pretty=oneline --abbrev-commit --no-decorate <tag>..<branch>
diff --git a/specs/dogtag-pki.spec.in b/specs/dogtag-pki.spec.in
index b20ad8d96bc..057e2e64686 100644
--- a/specs/dogtag-pki.spec.in
+++ b/specs/dogtag-pki.spec.in
@@ -15,7 +15,7 @@ License:          GPLv2 and LGPLv2
 ExcludeArch:      aarch64 s390x
 %endif
 
-Version:          10.6.3
+Version:          10.6.4
 Release:          1%{?_timestamp}%{?_commit_id}%{?dist}
 # global           _phase -a1
 
@@ -279,9 +279,13 @@ BuildRequires:    python2-pyflakes >= 1.2.3
 %endif  # with_python2
 
 %if 0%{?with_python3}
+%if 0%{?rhel} && 0%{?rhel} <= 7
+# no pylint
+%else
 BuildRequires:    python3-pylint
 BuildRequires:    python3-flake8 >= 2.5.4
 BuildRequires:    python3-pyflakes >= 1.2.3
+%endif
 %endif  # with_python3
 
 %if 0%{?with_python2}
@@ -332,8 +336,8 @@ BuildRequires:    jpackage-utils >= 0:1.7.5-10
 BuildRequires:    jss >= 4.4.0-11
 BuildRequires:    tomcatjss >= 7.2.1-4
 %else
-BuildRequires:    jss >= 4.5.0-0.3
-BuildRequires:    tomcatjss >= 7.3.2
+BuildRequires:    jss >= 4.5.0-0.4
+BuildRequires:    tomcatjss >= 7.3.3
 %endif
 BuildRequires:    systemd-units
 
@@ -423,7 +427,7 @@ Requires:         jpackage-utils >= 0:1.7.5-10
 %if 0%{?rhel} && 0%{?rhel} <= 7
 Requires:         jss >= 4.4.0-11
 %else
-Requires:         jss >= 4.5.0-0.3
+Requires:         jss >= 4.5.0-0.4
 %endif
 Requires:         nss >= 3.36.1
 
@@ -562,7 +566,7 @@ Requires:         jpackage-utils >= 0:1.7.5-10
 %if 0%{?rhel} && 0%{?rhel} <= 7
 Requires:         jss >= 4.4.0-11
 %else
-Requires:         jss >= 4.5.0-0.3
+Requires:         jss >= 4.5.0-0.4
 %endif
 Requires:         ldapjdk >= 4.19-5
 Requires:         pki-base >= %{version}-%{release}
@@ -712,7 +716,7 @@ Requires(pre):    shadow-utils
 %if 0%{?rhel} && 0%{?rhel} <= 7
 Requires:         tomcatjss >= 7.2.1-4
 %else
-Requires:         tomcatjss >= 7.3.2
+Requires:         tomcatjss >= 7.3.3
 %endif
 
 %if 0%{?rhel} && 0%{?rhel} <= 7
diff --git a/specs/pki-console.spec.in b/specs/pki-console.spec.in
deleted file mode 100644
index 1224b5ff4d6..00000000000
--- a/specs/pki-console.spec.in
+++ /dev/null
@@ -1,368 +0,0 @@
-################################################################################
-Name:             pki-console
-################################################################################
-
-Summary:          Dogtag PKI Console Package
-URL:              http://www.dogtagpki.org/
-License:          GPLv2
-
-Version:          10.6.3
-Release:          1%{?_timestamp}%{?_commit_id}%{?dist}
-# global           _phase -a1
-
-# To create a tarball from a version tag:
-# $ git archive \
-#     --format=tar.gz \
-#     --prefix pki-<version>/ \
-#     -o pki-<version>.tar.gz \
-#     <version tag>
-Source: https://github.com/dogtagpki/pki/archive/v%{version}%{?_phase}/pki-%{version}%{?_phase}.tar.gz
-
-# To create a patch for all changes since a version tag:
-# $ git format-patch \
-#     --stdout \
-#     <version tag> \
-#     > pki-VERSION-RELEASE.patch
-# Patch: pki-VERSION-RELEASE.patch
-
-################################################################################
-# NSS
-################################################################################
-
-%if 0%{?rhel} && 0%{?rhel} <= 7 || 0%{?fedora} && 0%{?fedora} <= 27
-%global nss_default_db_type dbm
-%else
-%global nss_default_db_type sql
-%endif
-
-################################################################################
-# Python
-################################################################################
-
-# Python 2 packages
-%if 0%{!?with_python2:1}
-%if 0%{?rhel} && 0%{?rhel} <= 7 || 0%{?fedora} && 0%{?fedora} <= 28
-%global with_python2 1
-%else
-# no python2
-%endif
-%endif
-
-# Python 3 packages
-%if 0%{!?with_python3:1}
-%if 0%{?rhel} && 0%{?rhel} <= 7
-# no python3
-%else
-%global with_python3 1
-%endif
-%endif
-
-# Use Python 3 for all commands?
-%if 0%{!?with_python3_default:1}
-%if 0%{?rhel} && 0%{?rhel} <= 7 || 0%{?fedora} && 0%{?fedora} <= 27
-%global with_python3_default 0
-%else
-%global with_python3_default 1
-%endif
-%endif
-
-################################################################################
-# Java
-################################################################################
-
-%define java_home %{_usr}/lib/jvm/jre-1.8.0-openjdk
-
-################################################################################
-# Tomcat
-################################################################################
-
-%if 0%{?rhel} && 0%{?rhel} <= 7
-%global app_server tomcat-7.0
-%else
-%if 0%{?fedora} && 0%{?fedora} <= 27
-%global app_server tomcat-8.0
-%else
-%global app_server tomcat-8.5
-%endif
-%endif
-
-################################################################################
-# RESTEasy
-################################################################################
-
-%if 0%{?rhel} && 0%{?rhel} <= 7
-%define jaxrs_api_jar /usr/share/java/resteasy-base/jaxrs-api.jar
-%define resteasy_lib /usr/share/java/resteasy-base
-%else
-%define jaxrs_api_jar /usr/share/java/jboss-jaxrs-2.0-api.jar
-%define resteasy_lib /usr/share/java/resteasy
-%endif
-
-################################################################################
-# PKI
-################################################################################
-
-%bcond_without    javadoc
-
-# ignore unpackaged files
-%define _unpackaged_files_terminate_build 0
-
-BuildArch:        noarch
-
-################################################################################
-# Build Dependencies
-################################################################################
-
-# autosetup
-BuildRequires:    git
-
-BuildRequires:    cmake >= 2.8.9-1
-BuildRequires:    gcc-c++
-BuildRequires:    zip
-BuildRequires:    java-1.8.0-openjdk-devel
-BuildRequires:    redhat-rpm-config
-BuildRequires:    ldapjdk >= 4.19-5
-BuildRequires:    apache-commons-cli
-BuildRequires:    apache-commons-codec
-BuildRequires:    apache-commons-io
-BuildRequires:    apache-commons-lang
-BuildRequires:    jakarta-commons-httpclient
-BuildRequires:    slf4j
-%if 0%{?rhel} && 0%{?rhel} <= 7
-# no slf4j-jdk14
-%else
-BuildRequires:    slf4j-jdk14
-%endif
-BuildRequires:    nspr-devel
-BuildRequires:    nss-devel >= 3.36.1
-
-%if 0%{?rhel} && 0%{?rhel} <= 7
-BuildRequires:    nuxwdog-client-java >= 1.0.3-7
-%else
-BuildRequires:    nuxwdog-client-java >= 1.0.3-13
-%endif
-
-BuildRequires:    openldap-devel
-BuildRequires:    pkgconfig
-BuildRequires:    policycoreutils
-
-%if 0%{?rhel} && 0%{?rhel} <= 7
-BuildRequires:    python-lxml
-BuildRequires:    python-sphinx
-%else
-%if 0%{?fedora} && 0%{?fedora} <= 28
-BuildRequires:    python2-lxml
-BuildRequires:    python2-sphinx
-%else
-BuildRequires:    python3-lxml
-BuildRequires:    python3-sphinx
-%endif
-%endif
-
-BuildRequires:    velocity
-BuildRequires:    xalan-j2
-BuildRequires:    xerces-j2
-
-%if 0%{?rhel} && 0%{?rhel} <= 7
-# 'resteasy-base' is a subset of the complete set of
-# 'resteasy' packages and consists of what is needed to
-# support the PKI Restful interface on certain RHEL platforms
-BuildRequires:    resteasy-base-atom-provider >= 3.0.6-1
-BuildRequires:    resteasy-base-client >= 3.0.6-1
-BuildRequires:    resteasy-base-jaxb-provider >= 3.0.6-1
-BuildRequires:    resteasy-base-jaxrs >= 3.0.6-1
-BuildRequires:    resteasy-base-jaxrs-api >= 3.0.6-1
-BuildRequires:    resteasy-base-jackson-provider >= 3.0.6-1
-%else
-BuildRequires:    jboss-annotations-1.2-api
-BuildRequires:    jboss-jaxrs-2.0-api
-BuildRequires:    jboss-logging
-BuildRequires:    resteasy-atom-provider >= 3.0.17-1
-BuildRequires:    resteasy-client >= 3.0.17-1
-BuildRequires:    resteasy-jaxb-provider >= 3.0.17-1
-BuildRequires:    resteasy-core >= 3.0.17-1
-BuildRequires:    resteasy-jackson-provider >= 3.0.17-1
-%endif
-
-%if 0%{?with_python2}
-%if 0%{?rhel} && 0%{?rhel} <= 7
-# no pylint
-%else
-BuildRequires:    pylint
-%if 0%{?fedora} && 0%{?fedora} <= 27
-BuildRequires:    python-flake8 >= 2.5.4
-BuildRequires:    pyflakes >= 1.2.3
-%else
-BuildRequires:    python2-flake8 >= 2.5.4
-BuildRequires:    python2-pyflakes >= 1.2.3
-%endif
-%endif
-%endif  # with_python2
-
-%if 0%{?with_python3}
-BuildRequires:    python3-pylint
-BuildRequires:    python3-flake8 >= 2.5.4
-BuildRequires:    python3-pyflakes >= 1.2.3
-%endif  # with_python3
-
-%if 0%{?with_python2}
-BuildRequires:    python2
-BuildRequires:    python2-devel
-BuildRequires:    python2-cryptography
-%if 0%{?rhel} && 0%{?rhel} <= 7 || 0%{?fedora} && 0%{?fedora} <= 27
-BuildRequires:    python-nss
-BuildRequires:    python-requests >= 2.6.0
-BuildRequires:    python-six
-BuildRequires:    libselinux-python
-BuildRequires:    policycoreutils-python
-BuildRequires:    python-ldap
-%else
-BuildRequires:    python2-nss
-BuildRequires:    python2-requests >= 2.6.0
-BuildRequires:    python2-six
-BuildRequires:    python2-libselinux
-BuildRequires:    python2-policycoreutils
-BuildRequires:    python2-ldap
-%endif
-%if 0%{?rhel} && 0%{?rhel} <= 7
-# no policycoreutils-python-utils
-%else
-BuildRequires:    policycoreutils-python-utils
-%endif
-%endif  # with_python2
-
-%if 0%{?with_python3}
-BuildRequires:    python3
-BuildRequires:    python3-devel
-BuildRequires:    python3-cryptography
-BuildRequires:    python3-lxml
-%if 0%{?rhel} && 0%{?rhel} <= 7 || 0%{?fedora} && 0%{?fedora} <= 27
-# no python3-libselinux
-%else
-BuildRequires:    python3-libselinux
-%endif
-BuildRequires:    python3-nss
-BuildRequires:    python3-pyldap
-BuildRequires:    python3-requests >= 2.6.0
-BuildRequires:    python3-six
-%endif  # with_python3
-
-BuildRequires:    junit
-BuildRequires:    jpackage-utils >= 0:1.7.5-10
-%if 0%{?rhel} && 0%{?rhel} <= 7
-BuildRequires:    jss >= 4.4.0-11
-BuildRequires:    tomcatjss >= 7.2.1-4
-%else
-BuildRequires:    jss >= 4.5.0-0.2
-BuildRequires:    tomcatjss >= 7.3.0
-%endif
-BuildRequires:    systemd-units
-
-%if 0%{?rhel} && 0%{?rhel} <= 7
-BuildRequires:    tomcat >= 7.0.69
-%else
-%if 0%{?fedora} && 0%{?fedora} <= 27
-BuildRequires:    tomcat >= 8.0.49
-%else
-%if 0%{?fedora} && 0%{?fedora} <= 28
-BuildRequires:    tomcat >= 1:8.5.23
-%else
-BuildRequires:    tomcat >= 1:9.0.7
-%endif
-%endif
-%endif
-
-# additional build requirements needed to build native 'tpsclient'
-# REMINDER:  Revisit these once 'tpsclient' is rewritten as a Java app
-BuildRequires:    apr-devel
-BuildRequires:    apr-util-devel
-BuildRequires:    cyrus-sasl-devel
-BuildRequires:    httpd-devel >= 2.4.2
-BuildRequires:    pcre-devel
-BuildRequires:    systemd
-BuildRequires:    zlib
-BuildRequires:    zlib-devel
-
-# Required by pki-console
-BuildRequires:    idm-console-framework >= 1.1.17-4
-
-Requires:         idm-console-framework >= 1.1.17-4
-Requires:         java-1.8.0-openjdk
-Requires:         ldapjdk >= 4.19-5
-Requires:         pki-base-java >= %{version}
-Requires:         pki-console-theme >= %{version}
-Requires:         jpackage-utils >= 1.7.5-10
-
-%description
-The PKI Console is a Java application used to administer PKI server.
-
-For deployment purposes, a PKI Console requires ONE AND ONLY ONE of the
-following "Mutually-Exclusive" PKI Theme packages:
-
-  * dogtag-pki-console-theme (Dogtag Certificate System deployments)
-  * redhat-pki-console-theme (Red Hat Certificate System deployments)
-
-################################################################################
-%prep
-################################################################################
-
-%autosetup -n pki-%{version}%{?_phase} -p 1 -S git
-
-################################################################################
-%build
-################################################################################
-
-%{__mkdir_p} build
-cd build
-%cmake \
-    --no-warn-unused-cli \
-    -DVERSION=%{version}-%{release} \
-    -DVAR_INSTALL_DIR:PATH=/var \
-    -DJAVA_HOME=%{java_home} \
-    -DJAVA_LIB_INSTALL_DIR=%{_jnidir} \
-    -DSYSTEMD_LIB_INSTALL_DIR=%{_unitdir} \
-    -DAPP_SERVER=%{app_server} \
-    -DJAXRS_API_JAR=%{jaxrs_api_jar} \
-    -DRESTEASY_LIB=%{resteasy_lib} \
-    -DNSS_DEFAULT_DB_TYPE=%{nss_default_db_type} \
-    -DBUILD_PKI_CORE:BOOL=ON \
-    -DWITH_PYTHON2:BOOL=%{?with_python2:ON}%{!?with_python2:OFF} \
-    -DWITH_PYTHON3:BOOL=%{?with_python3:ON}%{!?with_python3:OFF} \
-%if 0%{?with_python3_default}
-    -DWITH_PYTHON3_DEFAULT:BOOL=ON \
-%endif
-    -DWITH_TEST:BOOL=OFF \
-    -DWITH_SERVER:BOOL=OFF \
-    -DWITH_JAVADOC:BOOL=OFF \
-    -DBUILD_PKI_CONSOLE:BOOL=ON \
-    ..
-
-################################################################################
-%install
-################################################################################
-
-cd build
-
-# Do not use _smp_mflags to preserve build order
-%{__make} \
-    VERBOSE=%{?_verbose} \
-    CMAKE_NO_VERBOSE=1 \
-    DESTDIR=%{buildroot} \
-    INSTALL="install -p" \
-    --no-print-directory \
-    all install
-
-################################################################################
-%files
-################################################################################
-
-%defattr(-,root,root,-)
-%doc base/console/LICENSE
-%{_bindir}/pkiconsole
-%{_javadir}/pki/pki-console.jar
-
-################################################################################
-%changelog
-* Tue Mar 6 2018 Dogtag PKI Team <pki-devel@redhat.com> 10.6.0-0
-- To list changes in <branch> since <tag>:
-  $ git log --pretty=oneline --abbrev-commit --no-decorate <tag>..<branch>
diff --git a/specs/pki-core.spec.in b/specs/pki-core.spec.in
index ed4ee474a80..8b2de52c30c 100644
--- a/specs/pki-core.spec.in
+++ b/specs/pki-core.spec.in
@@ -15,7 +15,7 @@ License:          GPLv2 and LGPLv2
 ExcludeArch:      aarch64 s390x
 %endif
 
-Version:          10.6.3
+Version:          10.6.4
 Release:          1%{?_timestamp}%{?_commit_id}%{?dist}
 # global           _phase -a1
 
@@ -286,9 +286,13 @@ BuildRequires:    python2-pyflakes >= 1.2.3
 %endif  # with_python2
 
 %if 0%{?with_python3}
+%if 0%{?rhel} && 0%{?rhel} <= 7
+# no pylint
+%else
 BuildRequires:    python3-pylint
 BuildRequires:    python3-flake8 >= 2.5.4
 BuildRequires:    python3-pyflakes >= 1.2.3
+%endif
 %endif  # with_python3
 
 %if 0%{?with_python2}
@@ -339,8 +343,8 @@ BuildRequires:    jpackage-utils >= 0:1.7.5-10
 BuildRequires:    jss >= 4.4.0-11
 BuildRequires:    tomcatjss >= 7.2.1-4
 %else
-BuildRequires:    jss >= 4.5.0-0.3
-BuildRequires:    tomcatjss >= 7.3.2
+BuildRequires:    jss >= 4.5.0-0.4
+BuildRequires:    tomcatjss >= 7.3.3
 %endif
 BuildRequires:    systemd-units
 
@@ -430,7 +434,7 @@ Requires:         jpackage-utils >= 0:1.7.5-10
 %if 0%{?rhel} && 0%{?rhel} <= 7
 Requires:         jss >= 4.4.0-11
 %else
-Requires:         jss >= 4.5.0-0.3
+Requires:         jss >= 4.5.0-0.4
 %endif
 Requires:         nss >= 3.36.1
 
@@ -569,7 +573,7 @@ Requires:         jpackage-utils >= 0:1.7.5-10
 %if 0%{?rhel} && 0%{?rhel} <= 7
 Requires:         jss >= 4.4.0-11
 %else
-Requires:         jss >= 4.5.0-0.3
+Requires:         jss >= 4.5.0-0.4
 %endif
 Requires:         ldapjdk >= 4.19-5
 Requires:         pki-base >= %{version}-%{release}
@@ -719,7 +723,7 @@ Requires(pre):    shadow-utils
 %if 0%{?rhel} && 0%{?rhel} <= 7
 Requires:         tomcatjss >= 7.2.1-4
 %else
-Requires:         tomcatjss >= 7.3.2
+Requires:         tomcatjss >= 7.3.3
 %endif
 
 %if 0%{?rhel} && 0%{?rhel} <= 7
diff --git a/specs/pki.spec.in b/specs/pki.spec.in
index f97597e45db..26841ef8991 100644
--- a/specs/pki.spec.in
+++ b/specs/pki.spec.in
@@ -15,7 +15,7 @@ License:          GPLv2 and LGPLv2
 ExcludeArch:      aarch64 s390x
 %endif
 
-Version:          10.6.3
+Version:          10.6.4
 Release:          1%{?_timestamp}%{?_commit_id}%{?dist}
 # global           _phase -a1
 
@@ -274,9 +274,13 @@ BuildRequires:    python2-pyflakes >= 1.2.3
 %endif  # with_python2
 
 %if 0%{?with_python3}
+%if 0%{?rhel} && 0%{?rhel} <= 7
+# no pylint
+%else
 BuildRequires:    python3-pylint
 BuildRequires:    python3-flake8 >= 2.5.4
 BuildRequires:    python3-pyflakes >= 1.2.3
+%endif
 %endif  # with_python3
 
 %if 0%{?with_python2}
@@ -327,8 +331,8 @@ BuildRequires:    jpackage-utils >= 0:1.7.5-10
 BuildRequires:    jss >= 4.4.0-11
 BuildRequires:    tomcatjss >= 7.2.1-4
 %else
-BuildRequires:    jss >= 4.5.0-0.3
-BuildRequires:    tomcatjss >= 7.3.2
+BuildRequires:    jss >= 4.5.0-0.4
+BuildRequires:    tomcatjss >= 7.3.3
 %endif
 BuildRequires:    systemd-units
 
@@ -418,7 +422,7 @@ Requires:         jpackage-utils >= 0:1.7.5-10
 %if 0%{?rhel} && 0%{?rhel} <= 7
 Requires:         jss >= 4.4.0-11
 %else
-Requires:         jss >= 4.5.0-0.3
+Requires:         jss >= 4.5.0-0.4
 %endif
 Requires:         nss >= 3.36.1
 
@@ -557,7 +561,7 @@ Requires:         jpackage-utils >= 0:1.7.5-10
 %if 0%{?rhel} && 0%{?rhel} <= 7
 Requires:         jss >= 4.4.0-11
 %else
-Requires:         jss >= 4.5.0-0.3
+Requires:         jss >= 4.5.0-0.4
 %endif
 Requires:         ldapjdk >= 4.19-5
 Requires:         pki-base >= %{version}-%{release}
@@ -707,7 +711,7 @@ Requires(pre):    shadow-utils
 %if 0%{?rhel} && 0%{?rhel} <= 7
 Requires:         tomcatjss >= 7.2.1-4
 %else
-Requires:         tomcatjss >= 7.3.2
+Requires:         tomcatjss >= 7.3.3
 %endif
 
 %if 0%{?rhel} && 0%{?rhel} <= 7