diff --git a/Dockerfile b/Dockerfile
index 847b1589..b6be311d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,7 +6,7 @@ RUN yum update -y \
 RUN yum install -y wget tar unzip dos2unix patch
     
 ARG GROUPER_CONTAINER_VERSION
-ENV GROUPER_VERSION=2.5.33 \
+ENV GROUPER_VERSION=2.5.34 \
      GROUPER_CONTAINER_VERSION=$GROUPER_CONTAINER_VERSION
 
 # Install Corretto Java JDK
@@ -32,7 +32,7 @@ RUN echo 'Installing Grouper'; \
     cd /opt/grouper/$GROUPER_VERSION/ \
     && $JAVA_HOME/bin/java -cp :grouperInstaller.jar edu.internet2.middleware.grouperInstaller.GrouperInstaller
 FROM centos:centos7 as cleanup
-ENV GROUPER_VERSION=2.5.33 \
+ENV GROUPER_VERSION=2.5.34 \
     TOMEE_VERSION=7.0.0
 RUN mkdir -p /opt/grouper/grouperWebapp/
 RUN mkdir -p /opt/tomee/
diff --git a/container_files/tier-support/test/grouperContainerUnitTest.sh b/container_files/tier-support/test/grouperContainerUnitTest.sh
index e5fc69ea..94263e77 100644
--- a/container_files/tier-support/test/grouperContainerUnitTest.sh
+++ b/container_files/tier-support/test/grouperContainerUnitTest.sh
@@ -5,13 +5,13 @@ if [ "$#" -ne 4 ]; then
   exit 1
 fi
 
-expectedSuccesses=538
+expectedSuccesses=554
 
 export containerName=$1
 export imageName=$2
 export containerVersion=$3
 export grouperVersion=$4
-export globalSleepSecondsAfterRun=5
+export globalSleepSecondsAfterRun=10
 export globalExitOnError=false
 
 export successCount=0
diff --git a/container_files/tier-support/test/grouperContainerUnitTestLibrary.sh b/container_files/tier-support/test/grouperContainerUnitTestLibrary.sh
index f3269692..29fca8e5 100644
--- a/container_files/tier-support/test/grouperContainerUnitTestLibrary.sh
+++ b/container_files/tier-support/test/grouperContainerUnitTestLibrary.sh
@@ -163,6 +163,18 @@ assertNotListeningOnPort() {
   assertEquals "not listening on port $1" "0" "$var"
 }
 
+containerCommandResultEquals() {
+
+  if [ "$#" -ne 2 ]; then
+    echo "You must enter exactly 2 arguments: the command to run and the expected result"
+    exit 1
+  fi
+  local command="docker exec $containerName $1"
+  local var="$(runCommand "$command")"
+  assertEquals "$1" "$2" "$var"
+
+}
+
 runCommand() {
   if [ "$#" -ne 1 ]; then
     echo "Pass the command to run"
diff --git a/container_files/tier-support/test/grouperContainerUnitTestQuickstart.sh b/container_files/tier-support/test/grouperContainerUnitTestQuickstart.sh
index 7bdbe426..16afbb02 100644
--- a/container_files/tier-support/test/grouperContainerUnitTestQuickstart.sh
+++ b/container_files/tier-support/test/grouperContainerUnitTestQuickstart.sh
@@ -121,5 +121,32 @@ testContainerQuickstart() {
   curl -L -k -u GrouperSystem:thisPassIsCopyrightedDontUse https://localhost/grouper-ws-scim/v2/Groups/ -o index.html
   assertLocalFileContains index.html 'etc:workflowEditors'
 
+  docker stop $containerName
+  docker start $containerName
+
+  sleep $globalSleepSecondsAfterRun
+
+  # one for hsqldb
+  assertNumberOfTomcatProcesses 2
+  assertNumberOfApacheProcesses 5
+  assertNumberOfShibProcesses 0
+
+  assertListeningOnPort 443
+  assertListeningOnPort 80
+  assertListeningOnPort 8009
+  assertListeningOnPort 9001
+
+  curl -L -k -u GrouperSystem:thisPassIsCopyrightedDontUse https://localhost -o index.html
+  assertLocalFileContains index.html document.location.href
+
+  curl -L -k -u GrouperSystem:thisPassIsCopyrightedDontUse https://localhost/grouper/grouperUi/app/UiV2Main.index?operation=UiV2Main.indexMain -o index.html
+  assertLocalFileContains index.html 'end index.jsp'
+
+  containerCommandResultEquals "ps -ef | grep root | grep cat | grep -v grep | wc -l" 6
+  containerCommandResultEquals "ps -ef | grep root | grep awk | grep supervisord | wc -l" 1
+  containerCommandResultEquals "ps -ef | grep root | grep awk | grep grouper | wc -l" 1
+  containerCommandResultEquals "ps -ef | grep root | grep awk | grep httpd | wc -l" 1
+  containerCommandResultEquals "ps -ef | grep root | grep awk | grep tomee | wc -l" 1
+
 }
 export -f testContainerQuickstart
diff --git a/container_files/tier-support/test/grouperContainerUnitTestUi.sh b/container_files/tier-support/test/grouperContainerUnitTestUi.sh
index 5d995515..85c2e6eb 100644
--- a/container_files/tier-support/test/grouperContainerUnitTestUi.sh
+++ b/container_files/tier-support/test/grouperContainerUnitTestUi.sh
@@ -19,6 +19,10 @@ testContainerUi() {
   docker run --detach --name $containerName --publish 443:443 $imageName ui
   sleep $globalSleepSecondsAfterRun
 
+
+  assertFileContains /opt/tomee/conf/server.xml 'address="0.0.0.0"'
+  assertFileContains /opt/tomee/conf/server.xml 'allowedRequestAttributesPattern=".*"'
+  
   assertFileExists /opt/grouper/grouperWebapp/WEB-INF/libWs/axis2-kernel-1.6.4.jar
   assertFileNotExists /opt/grouper/grouperWebapp/WEB-INF/lib/axis2-kernel-1.6.4.jar
   assertFileExists /opt/grouper/grouperWebapp/WEB-INF/libScim/stax-api-1.0-2.jar
diff --git a/container_files/tier-support/test/rebuildTestContainer.sh b/container_files/tier-support/test/rebuildTestContainer.sh
new file mode 100644
index 00000000..cc8ce32e
--- /dev/null
+++ b/container_files/tier-support/test/rebuildTestContainer.sh
@@ -0,0 +1,26 @@
+#/bin/bash
+
+if [ "$#" -ne 2 ]; then
+  echo "You must enter exactly 2 command line arguments: grouper base container version, grouper_container_git_base_dir"
+  echo "rebuildTestContainer.sh 2.5.33 /mnt/c/mchyzer/git/grouper_container"
+  exit 1
+fi
+
+export grouperBaseContainerVersion=$1
+export grouperContainerGitPath=$2
+export subimageName=my-grouper-$1
+
+export reldir=`dirname $0`
+
+# /mnt/c/mchyzer/git/grouper_container
+mkdir -p $reldir/slashRoot/usr/local/bin
+rsync -avzpl $grouperContainerGitPath/container_files/usr-local-bin/* $reldir/slashRoot/usr/local/bin
+
+rsync -avzpl $grouperContainerGitPath/container_files/tier-support/test/grouper*.sh $reldir
+
+mkdir -p $reldir/slashRoot/opt/tomee/conf
+rsync -avzpl $grouperContainerGitPath/container_files/tomee/conf/* $reldir/slashRoot/opt/tomee/conf/
+
+docker build -f $reldir/testContainer.Dockerfile -t $subimageName --build-arg GROUPER_VERSION=$grouperBaseContainerVersion $reldir
+
+echo "Run tests with: ./grouperContainerUnitTest.sh grouper-test $subimageName:latest $grouperBaseContainerVersion $grouperBaseContainerVersion"
\ No newline at end of file
diff --git a/container_files/tier-support/test/testContainer.Dockerfile b/container_files/tier-support/test/testContainer.Dockerfile
new file mode 100644
index 00000000..5f391e07
--- /dev/null
+++ b/container_files/tier-support/test/testContainer.Dockerfile
@@ -0,0 +1,11 @@
+# this matches the version you decided on from release notes
+ARG GROUPER_VERSION=2.5.XX
+ 
+#  --build-arg GROUPER_VERSION=${VARIABLE_NAME}
+FROM i2incommon/grouper:${GROUPER_VERSION}
+ 
+# this will overlay all the files from /opt/grouperContainer/slashRoot on to /
+COPY slashRoot /
+ 
+RUN chown -R tomcat:tomcat /opt/grouper \
+ && chown -R tomcat:tomcat /opt/tomee
\ No newline at end of file
diff --git a/container_files/tomee/conf/server.xml.turnOnAjp.patch b/container_files/tomee/conf/server.xml.turnOnAjp.patch
index d0c32c3d..0c9d5fdd 100644
--- a/container_files/tomee/conf/server.xml.turnOnAjp.patch
+++ b/container_files/tomee/conf/server.xml.turnOnAjp.patch
@@ -10,7 +10,7 @@
 -               port="8009"
 -               redirectPort="8443" />
 -    -->
-+    <Connector secretRequired="false" secure="true"  scheme="https"  URIEncoding="UTF-8"  tomcatAuthentication="false"  port="8009" protocol="AJP/1.3" redirectPort="8443" />
++    <Connector secretRequired="false" secure="true"  scheme="https"  URIEncoding="UTF-8"  tomcatAuthentication="false"  port="8009" protocol="AJP/1.3" redirectPort="8443" address="0.0.0.0" allowedRequestAttributesPattern=".*" />
 +
  
      <!-- An Engine represents the entry point (within Catalina) that processes
diff --git a/container_files/usr-local-bin/changeGid.sh b/container_files/usr-local-bin/changeGid.sh
index 69b22caf..3cc49a09 100755
--- a/container_files/usr-local-bin/changeGid.sh
+++ b/container_files/usr-local-bin/changeGid.sh
@@ -1,11 +1,11 @@
 #!/bin/bash
 
 if [[ $EUID -ne 0 ]]; then
-   echo "This script must be run as root" 
+   echo "grouperContainer; ERROR: (changeGid.sh) This script must be run as root" 
    exit 1
 fi
 if [ "$#" -ne 2 ]; then
-  echo "You must enter exactly 2 command line arguments: groupname, and gid to change to"
+  echo "grouperContainer; ERROR: (changeGid.sh) You must enter exactly 2 command line arguments: groupname, and gid to change to"
   exit 1
 fi
 groupname=$1
@@ -13,4 +13,6 @@ newGid=$2
 getentOutput="$(getent group "$groupname")"
 oldGid="$( echo "$getentOutput" |cut -d\: -f3 )"
 groupmod -g "$newGid" "$groupname"
-find / -xdev -type d -group "$oldGid" -exec chgrp -h "$groupname" {} \;
\ No newline at end of file
+echo "grouperContainer; INFO: (changeGid.sh) groupmod -g $newGid $groupname , result: $?"
+find / -xdev -type d -group "$oldGid" -exec chgrp -h "$groupname" {} \;
+echo "grouperContainer; INFO: (changeGid.sh) find / -xdev -type d -group $oldGid -exec chgrp -h $groupname {} \; , result: $?"
diff --git a/container_files/usr-local-bin/changeUid.sh b/container_files/usr-local-bin/changeUid.sh
index a2bcb7c5..39f5e3a4 100755
--- a/container_files/usr-local-bin/changeUid.sh
+++ b/container_files/usr-local-bin/changeUid.sh
@@ -1,15 +1,17 @@
 #!/bin/bash
 
 if [[ $EUID -ne 0 ]]; then
-   echo "This script must be run as root" 
+   echo "grouperContainer; ERROR: (changeUid.sh) This script must be run as root" 
    exit 1
 fi
 if [ "$#" -ne 2 ]; then
-  echo "You must enter exactly 2 command line arguments: username, and uid to change to"
+  echo "grouperContainer; ERROR: (changeUid.sh) You must enter exactly 2 command line arguments: username, and uid to change to"
   exit 1
 fi
 username=$1
 newUid=$2
 oldUid="$(id -u "$username")"
 usermod -u "$newUid" "$username"
+echo "grouperContainer; INFO: (changeUid.sh) usermod -u $newUid $username , result: $?"
 find / -xdev -type d -user "$oldUid" -exec chown -h "$username" {} \;
+echo "grouperContainer; INFO: (changeUid.sh) find / -xdev -type d -user $oldUid -exec chown -h $username {} \; , result: $?"
diff --git a/container_files/usr-local-bin/entrypoint.sh b/container_files/usr-local-bin/entrypoint.sh
index 5f354349..dcb5344c 100755
--- a/container_files/usr-local-bin/entrypoint.sh
+++ b/container_files/usr-local-bin/entrypoint.sh
@@ -5,7 +5,7 @@ prep_conf
 
 if [ "$#" -eq 0 ];
   then
-    echo no component set to run
+    echo "grouperContainer; INFO: (entrypoint.sh) No component set to run"
     prep_finish
     setupFiles
     runCommand
@@ -31,7 +31,7 @@ else
       GROUPER_ENTRYPOINT_COMMAND=gsh
   fi
 
-  echo executing "$GROUPER_ENTRYPOINT_COMMAND $@"
+  echo "grouperContainer; INFO: (entrypoint.sh) Executing $GROUPER_ENTRYPOINT_COMMAND $@"
   exec "$GROUPER_ENTRYPOINT_COMMAND" "$@"                                                                                                          
 fi
 
diff --git a/container_files/usr-local-bin/library.sh b/container_files/usr-local-bin/library.sh
index b24e7555..2a97ef1d 100755
--- a/container_files/usr-local-bin/library.sh
+++ b/container_files/usr-local-bin/library.sh
@@ -1,5 +1,6 @@
 #!/bin/sh
 
+echo "grouperContainer; INFO: (library.sh) Start loading library.sh"
 . /usr/local/bin/libraryPrep.sh
 . /usr/local/bin/libraryPrepOnly.sh
 . /usr/local/bin/libraryRunCommand.sh
@@ -15,4 +16,5 @@
 
 # implementations of custom hooks
 . /usr/local/bin/grouperScriptHooks.sh
+echo "grouperContainer; INFO: (library.sh) End loading library.sh"
 
diff --git a/container_files/usr-local-bin/libraryPrep.sh b/container_files/usr-local-bin/libraryPrep.sh
index f77f25aa..e4ec5600 100644
--- a/container_files/usr-local-bin/libraryPrep.sh
+++ b/container_files/usr-local-bin/libraryPrep.sh
@@ -87,19 +87,22 @@ prep_ws() {
 }
 
 prep_conf() {
+
+    echo "grouperContainer; INFO: (libraryPrep.sh-prep_conf) Start setting up initial pipes"
+    setupPipe_logging
+    setupPipe_supervisordLog
+    setupPipe_grouperLog
+    echo "grouperContainer; INFO: (libraryPrep.sh-prep_conf) End setting up initial pipes"
     
     # if we are stopping and starting, we just read the env vars and we done
     if [ -f /opt/grouper/grouperEnv.sh ]
       then
-        echo "Loading env vars from /opt/grouper/grouperEnv.sh"
+        echo "grouperContainer; INFO: (libraryPrep.sh-prep_conf) Loading env vars from /opt/grouper/grouperEnv.sh"
         . /opt/grouper/grouperEnv.sh
         return
     fi
     
     prep_initDeprecatedEnvVars
-    setupPipe_logging
-    setupPipe_supervisordLog
-    setupPipe_grouperLog
     grouperScriptHooks_prepConfPost
 
 }
@@ -191,7 +194,7 @@ prep_finish() {
 
     if [ "$GROUPER_SETUP_FILES_COMPLETE" = "true" ]
       then
-        echo "GROUPER_SETUP_FILES_COMPLETE=true, skipping startup prep"
+        echo "grouperContainer; INFO: (libraryPrep.sh-prep_finish) GROUPER_SETUP_FILES_COMPLETE=true, skipping startup prep"
         prep_unsetAllAndFromFiles
         
         return
@@ -212,6 +215,7 @@ prep_finish() {
     grouperScriptHooks_finishPrepPost
         
     prep_unsetAllAndFromFiles
+    echo "grouperContainer; INFO: (libraryPrep.sh-prep_finish) End prep"
 }
 
 prep_unsetAllAndFromFiles() {
diff --git a/container_files/usr-local-bin/libraryRunCommand.sh b/container_files/usr-local-bin/libraryRunCommand.sh
index c75568a0..be815c9f 100644
--- a/container_files/usr-local-bin/libraryRunCommand.sh
+++ b/container_files/usr-local-bin/libraryRunCommand.sh
@@ -2,18 +2,29 @@
 
 runCommand() {
 
+  echo "grouperContainer; INFO: (libraryRunCommand.sh-runCommand) Start setting up remaining pipes"
+  setupPipe_hsqldbLog
+  setupPipe_httpdLog
+  setupPipe_shibdLog
+  setupPipe_tomcatLog
+  setupPipe_tomcatAccessLog
+  echo "grouperContainer; INFO: (libraryRunCommand.sh-runCommand) End setting up remainder pipes"
+
   runCommand_unsetAll
   
   if [ "$GROUPER_RUN_TOMCAT_NOT_SUPERVISOR" = "true" ]
     then
+      echo "grouperContainer; INFO: (libraryRunCommand.sh-runCommand) Starting tomcat not supervisor"
       /opt/tomee/bin/catalina.sh run
     else
+      echo "grouperContainer; INFO: (libraryRunCommand.sh-runCommand) Starting supervisor"
       exec /usr/bin/supervisord -c /opt/tier-support/supervisord.conf
   fi
 
 }
 
 runCommand_unsetAll() {
+  setupPipe_unsetAll
   unset -f runCommand
   unset -f runCommand_unsetAll
 }
diff --git a/container_files/usr-local-bin/librarySetupFiles.sh b/container_files/usr-local-bin/librarySetupFiles.sh
index 99adda40..ae5586fe 100644
--- a/container_files/usr-local-bin/librarySetupFiles.sh
+++ b/container_files/usr-local-bin/librarySetupFiles.sh
@@ -28,13 +28,15 @@ setupFiles_rsyncSlashRoot() {
 setupFiles_localLogging() {
     if [ "$GROUPER_LOG_TO_HOST" = "true" ]
       then
-        cp -v /opt/grouper/grouperWebapp/WEB-INF/classes/log4j.grouperContainerHost.properties /opt/grouper/grouperWebapp/WEB-INF/classes/log4j.properties
+        cp /opt/grouper/grouperWebapp/WEB-INF/classes/log4j.grouperContainerHost.properties /opt/grouper/grouperWebapp/WEB-INF/classes/log4j.properties
+        echo "grouperContainer; INFO: (librarySetupFiles.sh-setupFiles_localLogging) cp /opt/grouper/grouperWebapp/WEB-INF/classes/log4j.grouperContainerHost.properties /opt/grouper/grouperWebapp/WEB-INF/classes/log4j.properties, result: $?"
     fi
 
 }
 
 setupFiles_loggingPrefix() {
     sed -i "s|__GROUPER_LOG_PREFIX__|$GROUPER_LOG_PREFIX|g" /opt/grouper/grouperWebapp/WEB-INF/classes/log4j.properties
+    echo "grouperContainer; INFO: (librarySetupFiles.sh-setupFiles_loggingPrefix) Changing log prefix to $GROUPER_LOG_PREFIX in log4j.properties, result: $?"
 }
 
 setupFiles_chownDirs() {
@@ -42,12 +44,16 @@ setupFiles_chownDirs() {
     if [ "$GROUPER_CHOWN_DIRS" = "true" ]
       then
         chown -R tomcat:tomcat /opt/grouper/grouperWebapp
+        echo "grouperContainer; INFO: (librarySetupFiles.sh-setupFiles_chownDirs) chown -R tomcat:tomcat /opt/grouper/grouperWebapp, result: $?"
         chown -R tomcat:tomcat /opt/tomee
+        echo "grouperContainer; INFO: (librarySetupFiles.sh-setupFiles_chownDirs) chown -R tomcat:tomcat /opt/tomee, result: $?"
     fi
 }
 
 setupFiles_storeEnvVars() {
 
+  echo "grouperContainer; INFO: (librarySetupFiles.sh-setupFiles_storeEnvVars) Start store env vars in /opt/grouper/grouperEnv.sh"
+
   echo "#!/bin/sh" > /opt/grouper/grouperEnv.sh
   echo "" >> /opt/grouper/grouperEnv.sh
 
@@ -58,7 +64,7 @@ setupFiles_storeEnvVars() {
 
   if [ ! -f /home/tomcat/.bashrc ]
     then
-      echo "Why doesnt /home/tomcat/.bashrc exist????"
+      echo "grouperContainer; ERROR: (librarySetupFiles.sh-setupFiles_storeEnvVars) Why doesnt /home/tomcat/.bashrc exist????"
       exit 1
   fi  
   if ! grep -q grouperEnv /home/tomcat/.bashrc
@@ -73,7 +79,7 @@ setupFiles_storeEnvVars() {
     # we need these global  
     if [ ! -f /etc/bashrc ]
       then
-        echo "Why doesnt /etc/bashrc exist????"
+        echo "grouperContainer; ERROR: (librarySetupFiles.sh-setupFiles_storeEnvVars) Why doesnt /etc/bashrc exist????"
         exit 1
     fi  
     if ! grep -q GROUPER_GSH_CHECK_USER /etc/bashrc
@@ -86,13 +92,14 @@ setupFiles_storeEnvVars() {
         echo "" >> /etc/bashrc  
     fi    
   fi 
+  echo "grouperContainer; INFO: (librarySetupFiles.sh-setupFiles_storeEnvVars) End store env vars in /opt/grouper/grouperEnv.sh"
 }
 
 setupFiles() {
 
   if [ "$GROUPER_SETUP_FILES_COMPLETE" = "true" ]
     then
-      echo "GROUPER_SETUP_FILES_COMPLETE=true, skipping setting up files"
+      echo "grouperContainer; INFO: (librarySetupFiles.sh-setupFiles) GROUPER_SETUP_FILES_COMPLETE=true, skipping setting up files"
       setupFiles_unsetAllAndFromFiles
       return
   fi
@@ -141,7 +148,6 @@ setupFiles_unsetAllAndFromFiles() {
   setupFilesForComponent_unsetAll
   setupFilesForProcess_unsetAll
   setupFilesTomcat_unsetAll
-  setupPipe_unsetAll
   grouperScriptHooks_unsetAll
 
 }
diff --git a/container_files/usr-local-bin/librarySetupFilesApache.sh b/container_files/usr-local-bin/librarySetupFilesApache.sh
index 676ea0b5..e434856f 100644
--- a/container_files/usr-local-bin/librarySetupFilesApache.sh
+++ b/container_files/usr-local-bin/librarySetupFilesApache.sh
@@ -5,14 +5,17 @@ setupFilesApache_indexes() {
       then
         # take out the directory indexes from the docroot
         cp /etc/httpd/conf/httpd.conf /etc/httpd/conf/httpd.conf.pre_noindexes
+        echo "grouperContainer; INFO: (librarySetupFilesApache.sh-setupFilesApache_indexes) cp /etc/httpd/conf/httpd.conf /etc/httpd/conf/httpd.conf.pre_noindexes , result=$?"
         patch /etc/httpd/conf/httpd.conf /etc/httpd/conf.d/httpd.conf.noindexes.patch
+        echo "grouperContainer; INFO: (librarySetupFilesApache.sh-setupFilesApache_indexes) Patch httpd.conf to turn off indexes 'patch /etc/httpd/conf/httpd.conf /etc/httpd/conf.d/httpd.conf.noindexes.patch' result=$?"
     fi
 }
 
 setupFilesApache_selfSignedCert() {
     if [ "$GROUPER_RUN_APACHE" = "true" ] && [ "$GROUPER_SELF_SIGNED_CERT" = "true" ] && [ "$GROUPER_USE_SSL" = "true" ]
        then
-         cp -v /opt/tier-support/ssl-enabled.conf /etc/httpd/conf.d/
+         cp /opt/tier-support/ssl-enabled.conf /etc/httpd/conf.d/
+         echo "grouperContainer; INFO: (librarySetupFilesApache.sh-setupFilesApache_selfSignedCert) cp /opt/tier-support/ssl-enabled.conf /etc/httpd/conf.d/ , result: $?"
     fi
 }
 
@@ -21,11 +24,13 @@ setupFilesApache_ssl() {
        then
        if [ -f /etc/httpd/conf.d/ssl.conf ]
          then
-           mv -v /etc/httpd/conf.d/ssl.conf /etc/httpd/conf.d/ssl.conf.dontuse
+           mv /etc/httpd/conf.d/ssl.conf /etc/httpd/conf.d/ssl.conf.dontuse
+           echo "grouperContainer; INFO: (librarySetupFilesApache.sh-setupFilesApache_ssl) mv /etc/httpd/conf.d/ssl.conf /etc/httpd/conf.d/ssl.conf.dontuse , result: $?"
        fi
        if [ -f /etc/httpd/conf.d/ssl-enabled.conf ]
          then
            mv -v /etc/httpd/conf.d/ssl-enabled.conf /etc/httpd/conf.d/ssl-enabled.conf.dontuse
+           echo "grouperContainer; INFO: (librarySetupFilesApache.sh-setupFilesApache_ssl) mv -v /etc/httpd/conf.d/ssl-enabled.conf /etc/httpd/conf.d/ssl-enabled.conf.dontuse , result: $?"
        fi
     fi
 }
@@ -35,6 +40,7 @@ setupFilesApache_ssl() {
 setupFilesApache_serverName() {
   if [ "$GROUPER_RUN_APACHE" = "true" ] && [ ! -z "$GROUPER_APACHE_SERVER_NAME" ] && [ "$GROUPER_APACHE_SERVER_NAME" != "" ] && [ -f /etc/httpd/conf.d/grouper-www.conf ]
     then
+      echo "grouperContainer; INFO: (librarySetupFilesApache.sh-setupFilesApache_serverName) Appending ServerName to grouper-www.conf"
       echo >> /etc/httpd/conf.d/grouper-www.conf
       echo "ServerName $GROUPER_APACHE_SERVER_NAME" >> /etc/httpd/conf.d/grouper-www.conf
       echo "UseCanonicalName On" >> /etc/httpd/conf.d/grouper-www.conf
@@ -44,17 +50,10 @@ setupFilesApache_serverName() {
 }
 
 
-setupFilesApache_logging() {
-  if [ "$GROUPER_RUN_APACHE" = "true" ]
-    then
-      setupPipe_httpdLog
-  fi
-
-}
-
 setupFilesApache_supervisor() {
   if [ "$GROUPER_RUN_APACHE" = "true" ]
     then
+      echo "grouperContainer; INFO: (librarySetupFilesApache.sh-setupFilesApache_supervisor) Appending supervisord-httpd.conf to supervisord.conf"
       cat /opt/tier-support/supervisord-httpd.conf >> /opt/tier-support/supervisord.conf
   fi
 
@@ -67,17 +66,18 @@ setupFilesApache_ports() {
   if [ "$GROUPER_RUN_APACHE" = "true" ] && [ -f /etc/httpd/conf.d/ssl-enabled.conf ]
     then
       sed -i "s|__GROUPER_APACHE_SSL_PORT__|$GROUPER_APACHE_SSL_PORT|g" /etc/httpd/conf.d/ssl-enabled.conf
+      echo "grouperContainer; INFO: (librarySetupFilesApache.sh-setupFilesApache_ports) Replace apache ssl port in ssl-enabled.conf', result: $?"
   fi
   
   if [ "$GROUPER_RUN_APACHE" = "true" ] && [ "$GROUPER_APACHE_NONSSL_PORT" != "80" ]
     then
       sed -i "s|Listen 80|Listen $GROUPER_APACHE_NONSSL_PORT|g" /etc/httpd/conf/httpd.conf
+      echo "grouperContainer; INFO: (librarySetupFilesApache.sh-setupFilesApache_ports) Replace apache non-ssl port in httpd.conf', result: $?"
   fi
 
 }
 
 setupFilesApache() {
-  setupFilesApache_logging
   setupFilesApache_supervisor
   setupFilesApache_selfSignedCert
   setupFilesApache_ports
@@ -89,7 +89,6 @@ setupFilesApache() {
 setupFilesApache_unsetAll() {
   unset -f setupFilesApache
   unset -f setupFilesApache_indexes
-  unset -f setupFilesApache_logging
   unset -f setupFilesApache_ports
   unset -f setupFilesApache_selfSignedCert
   unset -f setupFilesApache_ssl
@@ -101,7 +100,6 @@ setupFilesApache_unsetAll() {
 setupFilesApache_exportAll() {
   export -f setupFilesApache
   export -f setupFilesApache_indexes
-  export -f setupFilesApache_logging
   export -f setupFilesApache_ports
   export -f setupFilesApache_selfSignedCert
   export -f setupFilesApache_ssl
diff --git a/container_files/usr-local-bin/librarySetupFilesForComponent.sh b/container_files/usr-local-bin/librarySetupFilesForComponent.sh
index e7fd2b48..7c811ab2 100644
--- a/container_files/usr-local-bin/librarySetupFilesForComponent.sh
+++ b/container_files/usr-local-bin/librarySetupFilesForComponent.sh
@@ -6,6 +6,7 @@ setupFilesForComponent_ws() {
   if [ "$GROUPER_WS" = "true" ]
      then
        cp -r /opt/grouper/grouperWebapp/WEB-INF/libWs/* /opt/grouper/grouperWebapp/WEB-INF/lib/
+       echo "grouperContainer; INFO: (librarySetupFilesForComponent.sh-setupFilesForComponent_ws) cp -r /opt/grouper/grouperWebapp/WEB-INF/libWs/* /opt/grouper/grouperWebapp/WEB-INF/lib/ , result: $?"
   fi
 
 }
@@ -15,6 +16,7 @@ setupFilesForComponent_scim() {
   if [ "$GROUPER_SCIM" = "true" ]
      then
        cp -r /opt/grouper/grouperWebapp/WEB-INF/libScim/* /opt/grouper/grouperWebapp/WEB-INF/lib/
+       echo "grouperContainer; INFO: (librarySetupFilesForComponent.sh-setupFilesForComponent_scim) cp -r /opt/grouper/grouperWebapp/WEB-INF/libScim/* /opt/grouper/grouperWebapp/WEB-INF/lib/ , result: $?"
   fi
 
 }
@@ -24,6 +26,7 @@ setupFilesForComponent_ui() {
   if [ "$GROUPER_UI" = "true" ] || [ "$GROUPER_DAEMON" = "true" ]
      then
        cp -r /opt/grouper/grouperWebapp/WEB-INF/libUiAndDaemon/* /opt/grouper/grouperWebapp/WEB-INF/lib/
+       echo "grouperContainer; INFO: (librarySetupFilesForComponent.sh-setupFilesForComponent_ui) cp -r /opt/grouper/grouperWebapp/WEB-INF/libUiAndDaemon/* /opt/grouper/grouperWebapp/WEB-INF/lib/ , result: $?"
   fi
 
 }
@@ -36,11 +39,13 @@ setupFilesForComponent_quickstart() {
           then
             echo '' >> /opt/grouper/grouperWebapp/WEB-INF/classes/grouper.hibernate.base.properties
             echo 'grouperPasswordConfigOverride_UI_GrouperSystem_pass.elConfig = ${elUtils.processEnvVarOrFile('"'"'GROUPERSYSTEM_QUICKSTART_PASS'"'"')}' >> /opt/grouper/grouperWebapp/WEB-INF/classes/grouper.hibernate.properties
+            echo "grouperContainer; INFO: (librarySetupFilesForComponent.sh-setupFilesForComponent_quickstart) edit grouper.hibernate.base.properties with UI GrouperSystem password for quick start, result: $?"
         fi
         if [ "$GROUPER_WS_GROUPER_AUTH" = 'true' ]
           then         
             echo '' >> /opt/grouper/grouperWebapp/WEB-INF/classes/grouper.hibernate.base.properties
             echo 'grouperPasswordConfigOverride_WS_GrouperSystem_pass.elConfig = ${elUtils.processEnvVarOrFile('"'"'GROUPERSYSTEM_QUICKSTART_PASS'"'"')}' >> /opt/grouper/grouperWebapp/WEB-INF/classes/grouper.hibernate.properties
+            echo "grouperContainer; INFO: (librarySetupFilesForComponent.sh-setupFilesForComponent_quickstart) edit grouper.hibernate.base.properties with WS GrouperSystem password for quick start, result: $?"
         fi
     fi
 
diff --git a/container_files/usr-local-bin/librarySetupFilesForProcess.sh b/container_files/usr-local-bin/librarySetupFilesForProcess.sh
index acd896f8..b1f26669 100644
--- a/container_files/usr-local-bin/librarySetupFilesForProcess.sh
+++ b/container_files/usr-local-bin/librarySetupFilesForProcess.sh
@@ -5,7 +5,7 @@ setupFilesForProcess_hsqldb() {
 
   if [ "$GROUPER_RUN_HSQLDB" = "true" ]
     then
-      setupPipe_hsqldbLog
+      echo "grouperContainer; INFO: (librarySetupFilesForProcess.sh-setupFilesForProcess_hsqldb) Appending supervisord-hsqldb.conf to supervisord.conf"
       cat /opt/tier-support/supervisord-hsqldb.conf >> /opt/tier-support/supervisord.conf
   fi
 
@@ -14,8 +14,10 @@ setupFilesForProcess_hsqldb() {
 setupFilesForProcess_hsqldbVersions() {
 
     # tomee hsql must match the grouper one, and the version cannot be 2.3.2 since it is query bugs (unit tests fail)
-    rm -v /opt/tomee/lib/hsqldb-*.jar
-    cp -v /opt/grouper/grouperWebapp/WEB-INF/lib/hsqldb-*.jar /opt/tomee/lib/
+    rm /opt/tomee/lib/hsqldb-*.jar
+    echo "grouperContainer; INFO: (librarySetupFilesForProcess.sh-setupFilesForProcess_hsqldbVersions) rm /opt/tomee/lib/hsqldb-*.jar , result: $?"
+    cp /opt/grouper/grouperWebapp/WEB-INF/lib/hsqldb-*.jar /opt/tomee/lib/
+    echo "grouperContainer; INFO: (librarySetupFilesForProcess.sh-setupFilesForProcess_hsqldbVersions) cp /opt/grouper/grouperWebapp/WEB-INF/lib/hsqldb-*.jar /opt/tomee/lib/ , result: $?"
 
 }
 
@@ -23,6 +25,7 @@ setupFilesForProcess_supervisor() {
 
   if [ "$GROUPER_RUN_TOMCAT_NOT_SUPERVISOR" != "true" ]; then
     # clear out existing supervisord config
+    echo "grouperContainer; INFO: (librarySetupFilesForProcess.sh-setupFilesForProcess_supervisor) Clear out supervisor.conf"
     cat /opt/tier-support/supervisord-base.conf > /opt/tier-support/supervisord.conf
   fi
 }
@@ -44,9 +47,11 @@ setupFilesForProcess_supervisorFinal() {
       then
         # let these lines live
         sed -i "s|__GROUPER_RUN_PROCESSES_AS_USERS__||g" /opt/tier-support/supervisord.conf
+        echo "grouperContainer; INFO: (librarySetupFilesForProcess.sh-setupFilesForProcess_supervisorFinal) Running processes as users in supervisord.conf, result: $?"
       else
         # comment out these lines
         sed -i "s|__GROUPER_RUN_PROCESSES_AS_USERS__|;|g" /opt/tier-support/supervisord.conf
+        echo "grouperContainer; INFO: (librarySetupFilesForProcess.sh-setupFilesForProcess_supervisorFinal) Commenting out running processes as users in supervisord.conf, result: $?"
     fi
   fi
 }
@@ -56,19 +61,20 @@ setupFilesForProcess_shib() {
   if [ "$GROUPER_RUN_TOMCAT_NOT_SUPERVISOR" != "true" ]; then
     if [ -f /etc/httpd/conf.d/shib.conf ]
       then
-        mv -v /etc/httpd/conf.d/shib.conf /etc/httpd/conf.d/shib.conf.dontuse
+        mv /etc/httpd/conf.d/shib.conf /etc/httpd/conf.d/shib.conf.dontuse
+        echo "grouperContainer; INFO: (librarySetupFilesForProcess.sh-setupFilesForProcess_shib) mv /etc/httpd/conf.d/shib.conf /etc/httpd/conf.d/shib.conf.dontuse , result: $?"
+        
     fi
     
     if [ "$GROUPER_RUN_SHIB_SP" = "true" ]
       then
-        if [ "$GROUPER_SHIB_LOG_USE_PIPE" = "true" ]
-          then
-            setupPipe_shibdLog
-        fi
         export LD_LIBRARY_PATH=/opt/shibboleth/lib64:$LD_LIBRARY_PATH
+        echo "grouperContainer; INFO: (librarySetupFilesForProcess.sh-setupFilesForProcess_shib) Appending supervisord-shibsp.conf to supervisord.conf"
         cat /opt/tier-support/supervisord-shibsp.conf >> /opt/tier-support/supervisord.conf
-        cp -v /opt/tier-support/httpd-shib.conf /etc/httpd/conf.d/
-        mv -v /etc/httpd/conf.d/shib.conf.dontuse /etc/httpd/conf.d/shib.conf
+        cp /opt/tier-support/httpd-shib.conf /etc/httpd/conf.d/
+        echo "grouperContainer; INFO: (librarySetupFilesForProcess.sh-setupFilesForProcess_shib) cp /opt/tier-support/httpd-shib.conf /etc/httpd/conf.d/ , result: $?"
+        mv /etc/httpd/conf.d/shib.conf.dontuse /etc/httpd/conf.d/shib.conf
+        echo "grouperContainer; INFO: (librarySetupFilesForProcess.sh-setupFilesForProcess_shib) mv /etc/httpd/conf.d/shib.conf.dontuse /etc/httpd/conf.d/shib.conf , result: $?"
     fi
   fi
 
diff --git a/container_files/usr-local-bin/librarySetupFilesTomcat.sh b/container_files/usr-local-bin/librarySetupFilesTomcat.sh
index b584e807..73a2b921 100644
--- a/container_files/usr-local-bin/librarySetupFilesTomcat.sh
+++ b/container_files/usr-local-bin/librarySetupFilesTomcat.sh
@@ -1,7 +1,6 @@
 #!/bin/bash
 
 setupFilesTomcat() {
-  setupFilesTomcat_logging
   setupFilesTomcat_loggingSlf4j
   setupFilesTomcat_turnOnAjp
   setupFilesTomcat_supervisor
@@ -15,21 +14,25 @@ setupFilesTomcat() {
 
 setupFilesTomcat_turnOnAjp() {
 
+  cp /opt/tomee/conf/server.xml /opt/tomee/conf/server.xml.currentOriginalInContainer
+  echo "grouperContainer; INFO: (librarySetupFilesTomcat.sh-setupFilesTomcat_turnOnAjp) cp /opt/tomee/conf/server.xml /opt/tomee/conf/server.xml.currentOriginalInContainer , result: $?"
   patch /opt/tomee/conf/server.xml /opt/tomee/conf/server.xml.turnOnAjp.patch
+  echo "grouperContainer; INFO: (librarySetupFilesTomcat.sh-setupFilesTomcat_turnOnAjp) Patch server.xml to turn on ajp, result: $?"
+  
 }
 
 setupFilesTomcat_accessLogs() {
   
   if [ "$GROUPER_TOMCAT_LOG_ACCESS" = "true" ]; then
   
-    setupPipe_tomcatAccessLog
-    
     # this patch happens after the last patch
     patch /opt/tomee/conf/server.xml /opt/tomee/conf/server.xml.loggingpipe.patch
+    echo "grouperContainer; INFO: (librarySetupFilesTomcat.sh-setupFilesTomcat_accessLogs) Patch server.xml to log access, result: $?"
     
   else  
 
     patch /opt/tomee/conf/server.xml /opt/tomee/conf/server.xml.nologging.patch
+    echo "grouperContainer; INFO: (librarySetupFilesTomcat.sh-setupFilesTomcat_accessLogs) Patch server.xml to not log access, result: $?"
     
   fi
 }
@@ -38,14 +41,17 @@ setupFilesTomcat_ports() {
 
       if [ "$GROUPER_TOMCAT_HTTP_PORT" != "8080" ]; then 
         sed -i "s|8080|$GROUPER_TOMCAT_HTTP_PORT|g" /opt/tomee/conf/server.xml
+        echo "grouperContainer; INFO: (librarySetupFilesTomcat.sh-setupFilesTomcat_ports) update server.xml to change http port, result: $?"
       fi
       
       if [ "$GROUPER_TOMCAT_AJP_PORT" != "8009" ]; then 
         sed -i "s|8009|$GROUPER_TOMCAT_AJP_PORT|g" /opt/tomee/conf/server.xml
+        echo "grouperContainer; INFO: (librarySetupFilesTomcat.sh-setupFilesTomcat_ports) update server.xml to change ajp port, result: $?"
       fi
   
       if [ "$GROUPER_TOMCAT_SHUTDOWN_PORT" != "8005" ]; then 
         sed -i "s|8005|$GROUPER_TOMCAT_SHUTDOWN_PORT|g" /opt/tomee/conf/server.xml
+        echo "grouperContainer; INFO: (librarySetupFilesTomcat.sh-setupFilesTomcat_ports) update server.xml to change shutdown port, result: $?"
       fi
 }
 
@@ -55,14 +61,17 @@ setupFilesTomcat_context() {
     then
       # ws only and scim only dont have cookies
       sed -i "s|__GROUPER_CONTEXT_COOKIES__|$GROUPER_CONTEXT_COOKIES|g" /opt/tomee/conf/Catalina/localhost/grouper.xml
+      echo "grouperContainer; INFO: (librarySetupFilesTomcat.sh-setupFilesTomcat_context) Replace context cookies in grouper.xml, result: $?"
       
       # setup context
       sed -i "s|__GROUPER_TOMCAT_CONTEXT__|$GROUPER_TOMCAT_CONTEXT|g" /opt/tomee/conf/Catalina/localhost/grouper.xml
+      echo "grouperContainer; INFO: (librarySetupFilesTomcat.sh-setupFilesTomcat_context) Replace tomcat context in grouper.xml, result: $?"
       
       # rename file if needed since that can matter with tomcat
       if [ "$GROUPER_TOMCAT_CONTEXT" != "grouper" ]
         then  
-          mv /opt/tomee/conf/Catalina/localhost/grouper.xml "/opt/tomee/conf/Catalina/localhost/$GROUPER_TOMCAT_CONTEXT.xml"
+          mv -v /opt/tomee/conf/Catalina/localhost/grouper.xml "/opt/tomee/conf/Catalina/localhost/$GROUPER_TOMCAT_CONTEXT.xml"
+          echo "grouperContainer; INFO: (librarySetupFilesTomcat.sh-setupFilesTomcat_context) mv -v /opt/tomee/conf/Catalina/localhost/grouper.xml /opt/tomee/conf/Catalina/localhost/$GROUPER_TOMCAT_CONTEXT.xml , result: $?"
       fi
     
   fi
@@ -71,18 +80,30 @@ setupFilesTomcat_context() {
   if [ -f /etc/httpd/conf.d/grouper-www.conf ] && [ "$GROUPER_RUN_TOMCAT_NOT_SUPERVISOR" != "true" ]
     then
       sed -i "s|__GROUPER_APACHE_AJP_TIMEOUT_SECONDS__|$GROUPER_APACHE_AJP_TIMEOUT_SECONDS|g" /etc/httpd/conf.d/grouper-www.conf
+      results="$?"
       sed -i "s|__GROUPER_TOMCAT_CONTEXT__|$GROUPER_TOMCAT_CONTEXT|g" /etc/httpd/conf.d/grouper-www.conf
+      results="$results $?"
       sed -i "s|__GROUPER_URL_CONTEXT__|$GROUPER_URL_CONTEXT|g" /etc/httpd/conf.d/grouper-www.conf
+      results="$results $?"
       sed -i "s|__GROUPERWS_URL_CONTEXT__|$GROUPERWS_URL_CONTEXT|g" /etc/httpd/conf.d/grouper-www.conf
+      results="$results $?"
       sed -i "s|__GROUPERSCIM_URL_CONTEXT__|$GROUPERSCIM_URL_CONTEXT|g" /etc/httpd/conf.d/grouper-www.conf
+      results="$results $?"
       sed -i "s|__GROUPER_PROXY_PASS__|$GROUPER_PROXY_PASS|g" /etc/httpd/conf.d/grouper-www.conf
-      sed -i "s|__GROUPER_PROXY_PASS__|$GROUPER_PROXY_PASS|g" /etc/httpd/conf.d/ssl-enabled.conf
+      results="$results $?"
+      if [ -f /etc/httpd/conf.d/ssl-enabled.conf ]; then
+        sed -i "s|__GROUPER_PROXY_PASS__|$GROUPER_PROXY_PASS|g" /etc/httpd/conf.d/ssl-enabled.conf
+        results="$results $?"
+      fi
       sed -i "s|__GROUPERSCIM_PROXY_PASS__|$GROUPERSCIM_PROXY_PASS|g" /etc/httpd/conf.d/grouper-www.conf
+      results="$results $?"
       sed -i "s|__GROUPERWS_PROXY_PASS__|$GROUPERWS_PROXY_PASS|g" /etc/httpd/conf.d/grouper-www.conf
+      results="$results $?"
       if [ "$GROUPER_TOMCAT_AJP_PORT" != "8009" ]; then 
         sed -i "s|:8009/|:$GROUPER_TOMCAT_AJP_PORT/|g" /etc/httpd/conf.d/grouper-www.conf
+        results="$results $?"
       fi
-      
+      echo "grouperContainer; INFO: (librarySetupFilesTomcat.sh-setupFilesTomcat_context) Set contexts in grouper-www.conf and other files, results: $results"
   fi
 
 }
@@ -92,29 +113,27 @@ setupFilesTomcat_authn() {
     if [ "$GROUPER_WS_TOMCAT_AUTHN" = "true" ]
       then
         cp /opt/grouper/grouperWebapp/WEB-INF/web.wsTomcatAuthn.xml /opt/grouper/grouperWebapp/WEB-INF/web.xml
+        echo "grouperContainer; INFO: (librarySetupFilesTomcat.sh-setupFilesTomcat_authn) /opt/grouper/grouperWebapp/WEB-INF/web.wsTomcatAuthn.xml /opt/grouper/grouperWebapp/WEB-INF/web.xml , result: $?"
         patch /opt/tomee/conf/server.xml /opt/tomee/conf/server.xml.tomcatAuthn.patch
+        echo "grouperContainer; INFO: (librarySetupFilesTomcat.sh-setupFilesTomcat_authn) Patch server.xml for tomcat authn, result: $?"
     fi
 
 }
 
-setupFilesTomcat_logging() {
-
-  if [ "$GROUPER_RUN_TOMEE" = "true" ] && [ "$GROUPER_LOG_TO_HOST" != "true" ]
-    then
-      setupPipe_tomcatLog
-  fi
-
-}
-
 setupFilesTomcat_loggingSlf4j() {
 
-  rm -v /opt/tomee/lib/slf4j-api*.jar
-  rm -v /opt/tomee/lib/slf4j-jdk*.jar
-  cp -v /opt/grouper/grouperWebapp/WEB-INF/lib/slf4j-api-*.jar /opt/tomee/lib
+  rm /opt/tomee/lib/slf4j-api*.jar
+  echo "grouperContainer; INFO: (librarySetupFilesTomcat.sh-setupFilesTomcat_loggingSlf4j) rm /opt/tomee/lib/slf4j-api*.jar , result: $?"
+  rm /opt/tomee/lib/slf4j-jdk*.jar
+  echo "grouperContainer; INFO: (librarySetupFilesTomcat.sh-setupFilesTomcat_loggingSlf4j) rm /opt/tomee/lib/slf4j-jdk*.jar , result: $?"
+  cp /opt/grouper/grouperWebapp/WEB-INF/lib/slf4j-api-*.jar /opt/tomee/lib
+  echo "grouperContainer; INFO: (librarySetupFilesTomcat.sh-setupFilesTomcat_loggingSlf4j) cp /opt/grouper/grouperWebapp/WEB-INF/lib/slf4j-api-*.jar /opt/tomee/lib , result: $?"
   # tomee uses the jdk one
-  cp -v /opt/grouper/grouperWebapp/WEB-INF/lib/slf4j-jdk*.jar /opt/tomee/lib
+  cp /opt/grouper/grouperWebapp/WEB-INF/lib/slf4j-jdk*.jar /opt/tomee/lib
+  echo "grouperContainer; INFO: (librarySetupFilesTomcat.sh-setupFilesTomcat_loggingSlf4j) cp /opt/grouper/grouperWebapp/WEB-INF/lib/slf4j-jdk*.jar /opt/tomee/lib , result: $?"
   # grouper uses the log4j one
-  rm -v /opt/grouper/grouperWebapp/WEB-INF/lib/slf4j-jdk*.jar
+  rm /opt/grouper/grouperWebapp/WEB-INF/lib/slf4j-jdk*.jar
+  echo "grouperContainer; INFO: (librarySetupFilesTomcat.sh-setupFilesTomcat_loggingSlf4j) rm /opt/grouper/grouperWebapp/WEB-INF/lib/slf4j-jdk*.jar , result: $?"
 
 }
 
@@ -123,6 +142,7 @@ setupFilesTomcat_supervisor() {
   if [ "$GROUPER_RUN_TOMEE" = "true" ] && [ "$GROUPER_RUN_TOMCAT_NOT_SUPERVISOR" != "true" ]
     then
       cat /opt/tier-support/supervisord-tomee.conf >> /opt/tier-support/supervisord.conf
+      echo "grouperContainer; INFO: (librarySetupFilesTomcat.sh-setupFilesTomcat_supervisor) Append supervisord-tomee.conf to supervisord.conf"
   fi
 
 }
@@ -133,7 +153,6 @@ setupFilesTomcat_unsetAll() {
   unset -f setupFilesTomcat
   unset -f setupFilesTomcat_authn
   unset -f setupFilesTomcat_context
-  unset -f setupFilesTomcat_logging
   unset -f setupFilesTomcat_ports
   unset -f setupFilesTomcat_supervisor
   unset -f setupFilesTomcat_unsetAll
@@ -148,7 +167,6 @@ setupFilesTomcat_exportAll() {
   export -f setupFilesTomcat
   export -f setupFilesTomcat_authn
   export -f setupFilesTomcat_context
-  export -f setupFilesTomcat_logging
   export -f setupFilesTomcat_ports
   export -f setupFilesTomcat_supervisor
   export -f setupFilesTomcat_unsetAll
diff --git a/container_files/usr-local-bin/librarySetupPipe.sh b/container_files/usr-local-bin/librarySetupPipe.sh
index 8a5c51ed..80aff77b 100644
--- a/container_files/usr-local-bin/librarySetupPipe.sh
+++ b/container_files/usr-local-bin/librarySetupPipe.sh
@@ -1,6 +1,7 @@
 #!/bin/sh
 
 setupPipe() {
+    echo "grouperContainer; INFO: (librarySetupPipe.sh-setupPipe) Setup pipe: $1"
     if [ -e $1 ]; then
         rm $1
     fi
@@ -20,28 +21,45 @@ setupPipe_grouperLog() {
 }
 
 setupPipe_httpdLog() {
-    setupPipe /tmp/loghttpd
-    (cat <> /tmp/loghttpd  | awk -v ENV="$ENV" -v UT="$USERTOKEN" '{printf "httpd;console;%s;%s;%s\n", ENV, UT, $0; fflush()}' &>/tmp/logpipe) &
+  if [ "$GROUPER_RUN_APACHE" = "true" ]
+    then
+      setupPipe /tmp/loghttpd
+      (cat <> /tmp/loghttpd  | awk -v ENV="$ENV" -v UT="$USERTOKEN" '{printf "httpd;console;%s;%s;%s\n", ENV, UT, $0; fflush()}' &>/tmp/logpipe) &
+  fi
 }
 
 setupPipe_shibdLog() {
-    setupPipe /tmp/logshibd
-    (cat <> /tmp/logshibd | awk -v ENV="$ENV" -v UT="$USERTOKEN" '{printf "shibd;console;%s;%s;%s", ENV, UT, $0; fflush()}' &>/tmp/logpipe) &
+    if [ "$GROUPER_RUN_SHIB_SP" = "true" ]
+      then
+        if [ "$GROUPER_SHIB_LOG_USE_PIPE" = "true" ]
+          then
+            setupPipe /tmp/logshibd
+            (cat <> /tmp/logshibd | awk -v ENV="$ENV" -v UT="$USERTOKEN" '{printf "shibd;console;%s;%s;%s", ENV, UT, $0; fflush()}' &>/tmp/logpipe) &
+        fi
+    fi
 }
 
 setupPipe_tomcatLog() {
-    setupPipe /tmp/logtomcat
-    (cat <> /tmp/logtomcat | awk -v ENV="$ENV" -v UT="$USERTOKEN" '{printf "tomee;console;%s;%s;%s\n", ENV, UT, $0; fflush()}' &>/tmp/logpipe) &
+  if [ "$GROUPER_RUN_TOMEE" = "true" ] && [ "$GROUPER_LOG_TO_HOST" != "true" ]
+    then
+      setupPipe /tmp/logtomcat
+      (cat <> /tmp/logtomcat | awk -v ENV="$ENV" -v UT="$USERTOKEN" '{printf "tomee;console;%s;%s;%s\n", ENV, UT, $0; fflush()}' &>/tmp/logpipe) &
+  fi
 }
 
 setupPipe_tomcatAccessLog() {
+  if [ "$GROUPER_TOMCAT_LOG_ACCESS" = "true" ]; then
+  
     setupPipe /tmp/tomcat_access_log
     (cat <> /tmp/tomcat_access_log | awk -v ENV="$ENV" -v UT="$USERTOKEN" '{printf "tomcat-access;console;%s;%s;%s\n", ENV, UT, $0; fflush()}' 1>/tmp/logpipe) &
+  fi
 }
 
 setupPipe_hsqldbLog() {
+  if [ "$GROUPER_RUN_HSQLDB" = "true" ]; then
     setupPipe /tmp/loghsqldb
     (cat <> /tmp/loghsqldb | awk -v ENV="$ENV" -v UT="$USERTOKEN" '{printf "hsqldb;console;%s;%s;%s\n", ENV, UT, $0; fflush()}' &>/tmp/logpipe) &
+  fi
 }
 
 setupPipe_supervisordLog() {