diff --git a/build/nightly-mini-tester.sh b/build/nightly-mini-tester.sh
index a9ae28d29..3eae93c6f 100755
--- a/build/nightly-mini-tester.sh
+++ b/build/nightly-mini-tester.sh
@@ -1,7 +1,5 @@
 #!/bin/bash
 
-NO_NONROOT_SUDO=yes
-export NO_NONROOT_SUDO
 prefix=/usr/local
 builddir=
 for arg in "$@"; do
diff --git a/cpackEngineDEB.cmake b/cpackEngineDEB.cmake
index aade757bf..549e0d53a 100644
--- a/cpackEngineDEB.cmake
+++ b/cpackEngineDEB.cmake
@@ -65,11 +65,11 @@ if (EXISTS "/etc/debian_version")
     set(DEBIAN_VERSION_NUMBER "${CMAKE_MATCH_1}")
 endif ()
 if ("${DEBIAN_VERSION_NUMBER}" EQUAL "8")
-    SET(CPACK_DEBIAN_PLATFORM_PACKAGE_DEPENDS "expect, perl, openssl, file, sudo, libdbi-perl, libreadline-dev, rsync, net-tools, libboost-all-dev, mariadb-columnstore-libs, mariadb-columnstore-server, libsnappy1")
+    SET(CPACK_DEBIAN_PLATFORM_PACKAGE_DEPENDS "expect, perl, openssl, file, libdbi-perl, libreadline-dev, rsync, net-tools, libboost-all-dev, mariadb-columnstore-libs, mariadb-columnstore-server, libsnappy1")
 elseif ("${DEBIAN_VERSION_NUMBER}" EQUAL "9")
-    SET(CPACK_DEBIAN_PLATFORM_PACKAGE_DEPENDS "expect, perl, openssl, file, sudo, libdbi-perl, libreadline-dev, rsync, net-tools, libboost-all-dev, mariadb-columnstore-libs, mariadb-columnstore-server, libsnappy1v5, libreadline5")
+    SET(CPACK_DEBIAN_PLATFORM_PACKAGE_DEPENDS "expect, perl, openssl, file, libdbi-perl, libreadline-dev, rsync, net-tools, libboost-all-dev, mariadb-columnstore-libs, mariadb-columnstore-server, libsnappy1v5, libreadline5")
 else()
-    SET(CPACK_DEBIAN_PLATFORM_PACKAGE_DEPENDS "expect, perl, openssl, file, sudo, libdbi-perl, libboost-all-dev, libreadline-dev, rsync, libsnappy1v5, net-tools")
+    SET(CPACK_DEBIAN_PLATFORM_PACKAGE_DEPENDS "expect, perl, openssl, file, libdbi-perl, libboost-all-dev, libreadline-dev, rsync, libsnappy1v5, net-tools")
 endif ()
 
 SET(CPACK_DEBIAN_STORAGE-ENGINE_PACKAGE_DEPENDS "mariadb-columnstore-libs")
diff --git a/dbcon/execplan/calpontsystemcatalog.cpp b/dbcon/execplan/calpontsystemcatalog.cpp
index 15ccd73aa..7b75c15a9 100644
--- a/dbcon/execplan/calpontsystemcatalog.cpp
+++ b/dbcon/execplan/calpontsystemcatalog.cpp
@@ -66,6 +66,8 @@ using namespace logging;
 #include "rowgroup.h"
 using namespace rowgroup;
 
+#include "installdir.h"
+
 #include <boost/thread/thread.hpp>
 #include <boost/thread/mutex.hpp>
 #include <boost/version.hpp>
@@ -92,7 +94,8 @@ throw runtime_error("CALPONT_INTERNAL_ERROR"); \
 #if CSC_DEBUG
 namespace
 {
-std::ofstream csclog("/tmp/csc.log", std::ios::app);
+	string tmpDir = startup::StartUp::tmpDir() + "/csc.log";
+	std::ofstream csclog(tmpDir, std::ios::app);
 }
 #define DEBUG csclog
 #else
diff --git a/dbcon/execplan/sessionmanager.h b/dbcon/execplan/sessionmanager.h
index 97f0aa01b..f1f9ad71e 100644
--- a/dbcon/execplan/sessionmanager.h
+++ b/dbcon/execplan/sessionmanager.h
@@ -55,7 +55,7 @@ namespace execplan
  * 		default value is 1000.
  * SessionManager/SharedMemoryTmpFile: the file to store the shared memory segment
  * 		data in between invocations if DESTROYSHMSEG is defined below.  The
- * 		default is /tmp/CalpontShm.
+ * 		default is /tmp/ColumnstoreShm.
  * SessionManager/TxnIDFile: the file to store the last transaction ID issued
  */
 
diff --git a/dbcon/execplan/sessionmonitor.cpp b/dbcon/execplan/sessionmonitor.cpp
index c3a89c4ce..0a27b5925 100644
--- a/dbcon/execplan/sessionmonitor.cpp
+++ b/dbcon/execplan/sessionmonitor.cpp
@@ -54,6 +54,9 @@ using namespace messageqcpp;
 
 using namespace BRM;
 
+#include "installdir.h"
+
+
 namespace execplan
 {
 
@@ -102,8 +105,12 @@ SessionMonitor::SessionMonitor()
     if (stmp != "")
         fSegmentFilename = strdup(stmp.c_str());
     else
-        fSegmentFilename = strdup("/tmp/CalpontSessionMonitorShm");
-
+    {
+		string tmpdir = startup::StartUp::installDir() + "CalpontSessionMonitorShm";
+		
+        fSegmentFilename = strdup(tmpdir);
+	}
+	
     try
     {
         madeSems = getSems();
diff --git a/dbcon/execplan/sessionmonitor.h b/dbcon/execplan/sessionmonitor.h
index af7a9fb07..cf31b63b3 100644
--- a/dbcon/execplan/sessionmonitor.h
+++ b/dbcon/execplan/sessionmonitor.h
@@ -32,10 +32,6 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include <boost/interprocess/shared_memory_object.hpp>
-#include <boost/interprocess/mapped_region.hpp>
-#include <boost/interprocess/sync/interprocess_semaphore.hpp>
-
 #include "calpontsystemcatalog.h"
 #include "sessionmanager.h"
 #include "shmkeys.h"
@@ -58,7 +54,6 @@ namespace execplan
  * SessionMonitor/SharedMemoryTmpFile: the file to store the shared memory segment
  *		data in.  This needs to be a different file than
  *		file used for the SessionManager/SharedMemoryTmpFile.
- *		The default is /tmp/CalpontMonShm.
  */
 
 /*
diff --git a/dbcon/joblist/largedatalist.h b/dbcon/joblist/largedatalist.h
index 924b0b200..7aedead4b 100644
--- a/dbcon/joblist/largedatalist.h
+++ b/dbcon/joblist/largedatalist.h
@@ -204,7 +204,6 @@ template<typename container_t, typename element_t>
 LargeDataList<container_t, element_t>::LargeDataList(uint32_t nc, uint32_t elementSaveSize1st, uint32_t elementSaveSize2nd, const ResourceManager* rm):
     base(nc), path(rm.getScTempDiskPath()), fTraceOn(false), fReUse(false), fSaveForReuse(false), fRestoreInfo(NULL)
 {
-// 	config::Config *config = config::Config::makeConfig();
 
     loadedSet = 0;
     setCount = 1;
@@ -214,14 +213,6 @@ LargeDataList<container_t, element_t>::LargeDataList(uint32_t nc, uint32_t eleme
     multipleProducers = false;
     fLoadedSetCount   = 0;
     setDiskElemSize ( elementSaveSize1st, elementSaveSize2nd );
-// 	try {
-// 		path = config->getConfig("SystemConfig", "TempDiskPath");
-// 	}
-// 	catch (...) {
-// 	}
-// 	if (path.length() == 0)
-// 		path = defaultTempDiskPath;
-    //pthread_cond_init(&consumePhase, NULL);
 }
 
 template<typename container_t, typename element_t>
diff --git a/dbcon/joblist/resourcemanager.h b/dbcon/joblist/resourcemanager.h
index 5d7a7e873..4a92a35b2 100644
--- a/dbcon/joblist/resourcemanager.h
+++ b/dbcon/joblist/resourcemanager.h
@@ -34,6 +34,7 @@
 #include "configcpp.h"
 #include "calpontselectexecutionplan.h"
 #include "resourcedistributor.h"
+#include "installdir.h"
 
 #include "atomicops.h"
 
@@ -82,7 +83,7 @@ const uint32_t defaultProcessorThreadsPerScan = 16;
 const uint32_t defaultJoinerChunkSize = 16 * 1024 * 1024;
 
 //bucketreuse
-const std::string defaultTempDiskPath = "/var/tmp";
+const std::string defaultTempDiskPath = "/tmp";
 const std::string defaultWorkingDir = ".";   //"/tmp";
 
 //largedatalist
@@ -282,7 +283,7 @@ public:
 
     std::string getScTempDiskPath() const
     {
-        return  getStringVal(fSystemConfigStr, "TempDiskPath", defaultTempDiskPath  );
+        return  startup::StartUp::tmpDir();
     }
     uint64_t  	getScTempSaveSize() const
     {
@@ -290,7 +291,7 @@ public:
     }
     std::string getScWorkingDir() const
     {
-        return  getStringVal(fSystemConfigStr, "WorkingDir", defaultWorkingDir );
+        return  startup::StartUp::tmpDir();
     }
 
     uint32_t  	getTwMaxSize() const
diff --git a/dbcon/mysql/ha_calpont_execplan.cpp b/dbcon/mysql/ha_calpont_execplan.cpp
index b98653af7..46d5ff7cd 100644
--- a/dbcon/mysql/ha_calpont_execplan.cpp
+++ b/dbcon/mysql/ha_calpont_execplan.cpp
@@ -6189,7 +6189,9 @@ int getSelectPlan(gp_walk_info& gwi, SELECT_LEX& select_lex, SCSEP& csep, bool i
     if (filters)
     {
         csep->filters(filters);
-        filters->drawTree("/tmp/filter1.dot");
+        std::string aTmpDir(startup::StartUp::tmpDir());
+        aTmpDir = aTmpDir + "/filter1.dot";
+        filters->drawTree(aTmpDir);
     }
 
     gwi.clauseType = SELECT;
@@ -8614,7 +8616,9 @@ int getGroupPlan(gp_walk_info& gwi, SELECT_LEX& select_lex, SCSEP& csep, cal_gro
     {
         csep->filters(filters);
 #ifdef DEBUG_WALK_COND
-        filters->drawTree("/tmp/filter1.dot");
+        std::string aTmpDir(startup::StartUp::tmpDir());
+        aTmpDir = aTmpDir + "/filter1.dot";
+        filters->drawTree(aTmpDir);
 #endif
     }
 
diff --git a/dbcon/mysql/ha_calpont_impl.cpp b/dbcon/mysql/ha_calpont_impl.cpp
index ad83f48db..2b854e3a6 100644
--- a/dbcon/mysql/ha_calpont_impl.cpp
+++ b/dbcon/mysql/ha_calpont_impl.cpp
@@ -2720,16 +2720,16 @@ int ha_calpont_impl_rnd_init(TABLE* table)
 #ifdef DEBUG_SETENV
     string home(getenv("HOME"));
 
-    if (!getenv("CALPONT_HOME"))
+    if (!getenv("COLUMNSTORE_HOME"))
     {
         string calpontHome(home + "/Calpont/etc/");
-        setenv("CALPONT_HOME", calpontHome.c_str(), 1);
+        setenv("COLUMNSTORE_HOME", calpontHome.c_str(), 1);
     }
 
-    if (!getenv("CALPONT_CONFIG_FILE"))
+    if (!getenv("COLUMNSTORE_CONFIG_FILE"))
     {
-        string calpontConfigFile(home + "/Calpont/etc/Columnstore.xml");
-        setenv("CALPONT_CONFIG_FILE", calpontConfigFile.c_str(), 1);
+        string calpontConfigFile(home + "/mariadb/columnstore/etc/Columnstore.xml");
+        setenv("COLUMNSTORE_CONFIG_FILE", calpontConfigFile.c_str(), 1);
     }
 
     if (!getenv("CALPONT_CSC_IDENT"))
@@ -3056,7 +3056,9 @@ int ha_calpont_impl_rnd_init(TABLE* table)
 
 #ifdef PLAN_HEX_FILE
             // plan serialization
-            ifstream ifs("/tmp/li1-plan.hex");
+            string tmpDir = aTmpDir + "/li1-plan.hex";
+
+            ifstream ifs(tmpDir.c_str());
             ByteStream bs1;
             ifs >> bs1;
             ifs.close();
@@ -3982,6 +3984,8 @@ void ha_calpont_impl_start_bulk_insert(ha_rows rows, TABLE* table)
             //set up for cpimport
             std::vector<char*> Cmds;
             std::string aCmdLine(startup::StartUp::installDir());
+            std::string aTmpDir(startup::StartUp::tmpDir());
+
             //If local module type is not PM and Local PM query is set, error out
             char escapechar[2] = "";
 
@@ -4390,6 +4394,8 @@ int ha_calpont_impl_end_bulk_insert(bool abort, TABLE* table)
 {
     THD* thd = current_thd;
 
+    std::string aTmpDir(startup::StartUp::tmpDir());
+
     if (!thd->infinidb_vtable.cal_conn_info)
         thd->infinidb_vtable.cal_conn_info = (void*)(new cal_connection_info());
 
@@ -4516,7 +4522,7 @@ int ha_calpont_impl_end_bulk_insert(bool abort, TABLE* table)
                             rc = 1;
                             ifstream dmlFile;
                             ostringstream oss;
-                            oss << "/tmp/" << ci->tableOid << ".txt";
+                            oss << aTmpDir << ci->tableOid << ".txt";
                             dmlFile.open(oss.str().c_str());
 
                             if (dmlFile.is_open())
@@ -4533,7 +4539,7 @@ int ha_calpont_impl_end_bulk_insert(bool abort, TABLE* table)
                             rc = 1;
                             ifstream dmlFile;
                             ostringstream oss;
-                            oss << "/tmp/" << ci->tableOid << ".txt";
+                            oss << aTmpDir << ci->tableOid << ".txt";
                             dmlFile.open(oss.str().c_str());
 
                             if (dmlFile.is_open())
@@ -4567,7 +4573,7 @@ int ha_calpont_impl_end_bulk_insert(bool abort, TABLE* table)
                 //get extra warning count if any
                 ifstream dmlFile;
                 ostringstream oss;
-                oss << "/tmp/" << ci->tableOid << ".txt";
+                oss << aTmpDir << ci->tableOid << ".txt";
                 dmlFile.open(oss.str().c_str());
                 int totalWarnCount = 0;
                 int colWarns = 0;
@@ -5115,7 +5121,7 @@ int ha_calpont_impl_group_by_init(ha_calpont_group_by_handler* group_hand, TABLE
             ci->warningMsg = msg;
         }
 
-        // If the previous query has error and 
+        // If the previous query has error and
         // this is not a subquery run by the server(MCOL-1601)
         // re-establish the connection
         if (ci->queryState != 0)
@@ -5215,7 +5221,7 @@ int ha_calpont_impl_group_by_init(ha_calpont_group_by_handler* group_hand, TABLE
             return 0;
 
         string query;
-        // Set the query text only once if the server executes 
+        // Set the query text only once if the server executes
         // subqueries separately.
         if(ci->queryState)
             query.assign("<subquery of the previous>");
@@ -5235,7 +5241,9 @@ int ha_calpont_impl_group_by_init(ha_calpont_group_by_handler* group_hand, TABLE
 
 #ifdef PLAN_HEX_FILE
         // plan serialization
-        ifstream ifs("/tmp/li1-plan.hex");
+        string tmpDir = aTmpDir + "/li1-plan.hex";
+
+        ifstream ifs(tmpDir);
         ByteStream bs1;
         ifs >> bs1;
         ifs.close();
diff --git a/dbcon/mysql/install_calpont_mysql.sh b/dbcon/mysql/install_calpont_mysql.sh
index 8f8f4be6e..08a08a494 100755
--- a/dbcon/mysql/install_calpont_mysql.sh
+++ b/dbcon/mysql/install_calpont_mysql.sh
@@ -17,6 +17,8 @@ for arg in "$@"; do
 	elif [ `expr -- "$arg" : '--installdir='` -eq 13 ]; then
 		installdir="`echo $arg | awk -F= '{print $2}'`"
 		prefix=`dirname $installdir`
+	elif [ `expr -- "$arg" : '--tmpdir='` -eq 9 ]; then
+		tmpdir="`echo $arg | awk -F= '{print $2}'`"
 	else
 		echo "ignoring unknown argument: $arg" 1>&2
 	fi
@@ -24,7 +26,7 @@ done
 
 df=$installdir/mysql/my.cnf
 
-$installdir/mysql/bin/mysql --defaults-extra-file=$df --force --user=root mysql 2>/tmp/mysql_install.log <<EOD
+$installdir/mysql/bin/mysql --defaults-extra-file=$df --force --user=root mysql 2> ${tmpdir}/mysql_install.log <<EOD
 INSTALL PLUGIN columnstore SONAME 'libcalmysql.so';
 INSTALL PLUGIN infinidb SONAME 'libcalmysql.so';
 INSTALL PLUGIN columnstore_tables SONAME 'is_columnstore_tables.so';
diff --git a/dbcon/mysql/mysql-Calpont b/dbcon/mysql/mysql-Calpont
deleted file mode 100755
index e32fb4a08..000000000
--- a/dbcon/mysql/mysql-Calpont
+++ /dev/null
@@ -1,480 +0,0 @@
-#!/bin/sh
-# Copyright Abandoned 1996 TCX DataKonsult AB & Monty Program KB & Detron HB
-# This file is public domain and comes with NO WARRANTY of any kind
-
-# MySQL daemon start/stop script.
-
-# Usually this is put in /etc/init.d (at least on machines SYSV R4 based
-# systems) and linked to /etc/rc3.d/S99mysql and /etc/rc0.d/K01mysql.
-# When this is done the mysql server will be started when the machine is
-# started and shut down when the systems goes down.
-
-# Comments to support chkconfig on RedHat Linux
-# chkconfig: 2345 64 36
-# description: A very fast and reliable SQL database engine.
-
-# Comments to support LSB init script conventions
-### BEGIN INIT INFO
-# Provides: mysql
-# Required-Start: $local_fs $network $remote_fs
-# Should-Start: ypbind nscd ldap ntpd xntpd
-# Required-Stop: $local_fs $network $remote_fs
-# Default-Start:  2 3 4 5
-# Default-Stop: 0 1 6
-# Short-Description: start and stop MySQL
-# Description: MySQL is a very fast and reliable SQL database engine.
-### END INIT INFO
-
-# If you install MySQL on some other places than /usr/local/Calpont/mysql, then you
-# have to do one of the following things for this script to work:
-#
-# - Run this script from within the MySQL installation directory
-# - Create a /etc/my.cnf file with the following information:
-#   [mysqld]
-#   basedir=<path-to-mysql-installation-directory>
-# - Add the above to any other configuration file (for example ~/.my.ini)
-#   and copy my_print_defaults to /usr/bin
-# - Add the path to the mysql-installation-directory to the basedir variable
-#   below.
-#
-# If you want to affect other MySQL variables, you should make your changes
-# in the /etc/my.cnf, ~/.my.cnf or other MySQL configuration files.
-
-# If you change base dir, you must also change datadir. These may get
-# overwritten by settings in the MySQL configuration files.
-
-basedir=/usr/local/Calpont/mysql
-datadir=/usr/local/Calpont/mysql/db
-
-# Default value, in seconds, afterwhich the script should timeout waiting
-# for server start. 
-# Value here is overriden by value in my.cnf. 
-# 0 means don't wait at all
-# Negative numbers mean to wait indefinitely
-service_startup_timeout=30
-
-# Lock directory for RedHat / SuSE.
-lockdir='/var/lock/subsys'
-lock_file_path="$lockdir/mysql-Columnstore"
-
-# The following variables are only set for letting mysql.server find things.
-
-# Set some defaults
-mysqld_pid_file_path=
-if test -z "$basedir"
-then
-  basedir=/usr/local/Calpont/mysql
-  bindir=/usr/local/bin
-  if test -z "$datadir"
-  then
-    datadir=/var/lib/mysql
-  fi
-  sbindir=/usr/local/sbin
-  libexecdir=/usr/local/sbin
-else
-  bindir="$basedir/bin"
-  if test -z "$datadir"
-  then
-    datadir="$basedir/data"
-  fi
-  sbindir="$basedir/sbin"
-  if test -f "$basedir/sbin/mysqld"
-  then
-    libexecdir="$basedir/sbin"
-  else
-    libexecdir="$basedir/libexec"
-  fi
-fi
-
-# datadir_set is used to determine if datadir was set (and so should be
-# *not* set inside of the --basedir= handler.)
-datadir_set=
-
-#
-# Use LSB init script functions for printing messages, if possible
-#
-lsb_functions="/lib/lsb/init-functions"
-if test -f $lsb_functions ; then
-  . $lsb_functions
-else
-  # Include non-LSB RedHat init functions to make systemctl redirect work
-  init_functions="/etc/init.d/functions"
-  if test -f $init_functions; then
-    . $init_functions
-  fi
-  log_success_msg()
-  {
-    echo " SUCCESS! $@"
-  }
-  log_failure_msg()
-  {
-    echo " ERROR! $@"
-  }
-fi
-
-PATH="/sbin:/usr/sbin:/bin:/usr/bin:$basedir/bin"
-export PATH
-
-mode=$1    # start or stop
-
-[ $# -ge 1 ] && shift
-
-case `echo "testing\c"`,`echo -n testing` in
-    *c*,-n*) echo_n=   echo_c=     ;;
-    *c*,*)   echo_n=-n echo_c=     ;;
-    *)       echo_n=   echo_c='\c' ;;
-esac
-
-parse_server_arguments() {
-  for arg do
-    case "$arg" in
-      --basedir=*)  basedir=`echo "$arg" | sed -e 's/^[^=]*=//'`
-                    bindir="$basedir/bin"
-		    if test -z "$datadir_set"; then
-		      datadir="$basedir/data"
-		    fi
-		    sbindir="$basedir/sbin"
-                    if test -f "$basedir/sbin/mysqld"
-                    then
-                      libexecdir="$basedir/sbin"
-                    else
-                      libexecdir="$basedir/libexec"
-                    fi
-		    #libexecdir="$basedir/libexec"
-        ;;
-      --datadir=*)  datadir=`echo "$arg" | sed -e 's/^[^=]*=//'`
-		    datadir_set=1
-	;;
-      --log-basename=*|--hostname=*|--loose-log-basename=*)
-        mysqld_pid_file_path=`echo "$arg.pid" | sed -e 's/^[^=]*=//'`
-	;;
-      --pid-file=*) mysqld_pid_file_path=`echo "$arg" | sed -e 's/^[^=]*=//'` ;;
-      --service-startup-timeout=*) service_startup_timeout=`echo "$arg" | sed -e 's/^[^=]*=//'` ;;
-    esac
-  done
-}
-
-# Get arguments from the my.cnf file,
-# the only group, which is read from now on is [mysqld]
-if test -x ./bin/my_print_defaults
-then
-  print_defaults="./bin/my_print_defaults"
-elif test -x $bindir/my_print_defaults
-then
-  print_defaults="$bindir/my_print_defaults"
-elif test -x $bindir/mysql_print_defaults
-then
-  print_defaults="$bindir/mysql_print_defaults"
-else
-  # Try to find basedir in /etc/my.cnf
-  conf=/etc/my.cnf
-  print_defaults=
-  if test -r $conf
-  then
-    subpat='^[^=]*basedir[^=]*=\(.*\)$'
-    dirs=`sed -e "/$subpat/!d" -e 's//\1/' $conf`
-    for d in $dirs
-    do
-      d=`echo $d | sed -e 's/[ 	]//g'`
-      if test -x "$d/bin/my_print_defaults"
-      then
-        print_defaults="$d/bin/my_print_defaults"
-        break
-      fi
-      if test -x "$d/bin/mysql_print_defaults"
-      then
-        print_defaults="$d/bin/mysql_print_defaults"
-        break
-      fi
-    done
-  fi
-
-  # Hope it's in the PATH ... but I doubt it
-  test -z "$print_defaults" && print_defaults="my_print_defaults"
-fi
-
-#
-# Read defaults file from 'basedir'.   If there is no defaults file there
-# check if it's in the old (depricated) place (datadir) and read it from there
-#
-
-extra_args=""
-if test -r "$basedir/my.cnf"
-then
-  extra_args="-e $basedir/my.cnf"
-else
-  if test -r "$datadir/my.cnf"
-  then
-    extra_args="-e $datadir/my.cnf"
-  fi
-fi
-
-parse_server_arguments `$print_defaults $extra_args --mysqld mysql.server`
-parse_server_arguments "$@"
-
-# wait for the pid file to disappear
-wait_for_gone () {
-  pid="$1"           # process ID of the program operating on the pid-file
-  pid_file_path="$2" # path to the PID file.
-
-  i=0
-  crash_protection="by checking again"
-
-  while test $i -ne $service_startup_timeout ; do
-
-    if kill -0 "$pid" 2>/dev/null; then
-      :  # the server still runs
-    else
-      if test ! -s "$pid_file_path"; then
-        # no server process and no pid-file? great, we're done!
-        log_success_msg
-        return 0
-      fi
-
-      # pid-file exists, the server process doesn't.
-      # it must've crashed, and mysqld_safe will restart it
-      if test -n "$crash_protection"; then
-        crash_protection=""
-        sleep 5
-        continue  # Check again.
-      fi
-
-      kill_by_pid
-      # Cannot help it
-      log_failure_msg "The server quit without updating PID file ($pid_file_path)."
-      return 1  # not waiting any more.
-    fi
-
-    echo $echo_n ".$echo_c"
-    i=`expr $i + 1`
-    sleep 1
-
-  done
-
-  log_failure_msg
-  return 1
-}
-
-wait_for_ready () {
-
-  i=0
-  while test $i -ne $service_startup_timeout ; do
-
-    if $bindir/mysqladmin ping --socket=/usr/local/Calpont/mysql/lib/mysql/mysql.sock >/dev/null 2>&1; then
-      log_success_msg
-      return 0
-    elif kill -0 $! 2>/dev/null ; then
-      :  # mysqld_safe is still running
-    else
-      # mysqld_safe is no longer running, abort the wait loop
-      break
-    fi
-
-    echo $echo_n ".$echo_c"
-    i=`expr $i + 1`
-    sleep 1
-
-  done
-
-  log_failure_msg
-  return 1
-}
-#
-# Set pid file if not given
-#
-if test -z "$mysqld_pid_file_path"
-then
-  mysqld_pid_file_path=$datadir/`hostname`.pid
-else
-  case "$mysqld_pid_file_path" in
-    /* ) ;;
-    * )  mysqld_pid_file_path="$datadir/$mysqld_pid_file_path" ;;
-  esac
-fi
-
-# source other config files
-[ -f /etc/default/mysql ] && . /etc/default/mysql
-[ -f /etc/sysconfig/mysql ] && . /etc/sysconfig/mysql
-[ -f /etc/conf.d/mysql ] && . /etc/conf.d/mysql
-
-kill_by_pid() {
-  # let's see if we can kill the 2 mysql procs by hand
-  # get the our mysql from ps
-  eval $(ps -ef | grep "$COLUMNSTORE_INSTALL_DIR/mysql//sbin/mysqld" | grep -v grep | head -1 | awk '{printf "pid=%d\n", $2}')
-
-  if [ -n "$pid" ]; then
-	ppid=$(ps -o ppid= -p $pid)
-        $SUDO kill -9 $ppid
-        kill -9 $ppid
-        sleep 1
-        $SUDO kill -9 $pid
-        kill -9 $pid
-        echo $echo_n "Force shutting down (no/bad pid file)" 
-        log_success_msg
-        exit 0
-  fi
-  return
-}
-
-case "$mode" in
-  'start')
-    # Start daemon
-
-    # Safeguard (relative paths, core dumps..)
-    cd $basedir
-
-    echo $echo_n "Starting MySQL"
-    if test -x $bindir/mysqld_safe
-    then
-      # Give extra arguments to mysqld with the my.cnf file. This script
-      # may be overwritten at next upgrade.
-      $bindir/mysqld_safe --datadir="$datadir" --pid-file="$mysqld_pid_file_path" "--ledir=$libexecdir" "$@" >/dev/null 2>&1 &
-      wait_for_ready; return_value=$?
-
-      # Make lock for RedHat / SuSE
-      if test -w "$lockdir"
-      then
-        touch "$lock_file_path"
-      fi
-
-      exit $return_value
-    else
-      log_failure_msg "Couldn't find MySQL server ($bindir/mysqld_safe)"
-    fi
-    ;;
-
-  'stop')
-    # Stop daemon. We use a signal here to avoid having to know the
-    # root password.
-
-    if test -s "$mysqld_pid_file_path"
-    then
-      mysqld_pid=`cat "$mysqld_pid_file_path"`
-
-      if (kill -0 $mysqld_pid 2>/dev/null)
-      then
-        echo $echo_n "Shutting down MySQL"
-        kill $mysqld_pid
-        # mysqld should remove the pid file when it exits, so wait for it.
-        wait_for_gone $mysqld_pid "$mysqld_pid_file_path"; return_value=$?
-      else
-        log_failure_msg "MySQL server process #$mysqld_pid is not running!"
-        rm "$mysqld_pid_file_path"
-      fi
-
-      # Delete lock for RedHat / SuSE
-      if test -f "$lock_file_path"
-      then
-        rm -f "$lock_file_path"
-      fi
-      exit $return_value
-    else
-      kill_by_pid
-      log_failure_msg "MySQL server PID file could not be found!"
-    fi
-    ;;
-
-  'restart')
-    # Stop the service and regardless of whether it was
-    # running or not, start it again.
-    if $0 stop  "$@"; then
-      if ! $0 start "$@"; then
-        log_failure_msg "Failed to restart server."
-        exit 1
-      fi
-    else
-      log_failure_msg "Failed to stop running server, so refusing to try to start."
-      exit 1
-    fi
-    ;;
-
-  'reload'|'force-reload')
-    if test -s "$mysqld_pid_file_path" ; then
-      read mysqld_pid <  "$mysqld_pid_file_path"
-      kill -HUP $mysqld_pid && log_success_msg "Reloading service MySQL"
-      touch "$mysqld_pid_file_path"
-    else
-      log_failure_msg "MySQL PID file could not be found!"
-      exit 1
-    fi
-    ;;
-  'status')
-    # First, check to see if pid file exists
-    if test -s "$mysqld_pid_file_path" ; then 
-      read mysqld_pid < "$mysqld_pid_file_path"
-      if kill -0 $mysqld_pid 2>/dev/null ; then 
-        log_success_msg "MySQL running ($mysqld_pid)"
-        exit 0
-      else
-        log_failure_msg "MySQL is not running, but PID file exists"
-        exit 1
-      fi
-    else
-      # Try to find appropriate mysqld process
-      mysqld_pid=`pidof $libexecdir/mysqld`
-
-      # test if multiple pids exist
-      pid_count=`echo $mysqld_pid | wc -w`
-      if test $pid_count -gt 1 ; then
-        log_failure_msg "Multiple MySQL running but PID file could not be found ($mysqld_pid)"
-        exit 5
-      elif test -z $mysqld_pid ; then 
-        if test -f "$lock_file_path" ; then 
-          log_failure_msg "MySQL is not running, but lock file ($lock_file_path) exists"
-          exit 2
-        fi 
-        log_failure_msg "MySQL is not running"
-        exit 3
-      else
-        log_failure_msg "MySQL is running but PID file could not be found"
-        exit 4
-      fi
-    fi
-    ;;
-  'configtest')
-    # Safeguard (relative paths, core dumps..)
-    cd $basedir
-    echo $echo_n "Testing MySQL configuration syntax"
-    daemon=$bindir/mysqld
-    if test -x $libexecdir/mysqld
-    then
-      daemon=$libexecdir/mysqld
-    elif test -x $sbindir/mysqld
-    then
-      daemon=$sbindir/mysqld
-    elif test -x `which mysqld`
-    then
-      daemon=`which mysqld`
-    else
-      log_failure_msg "Unable to locate the mysqld binary!"
-      exit 1
-    fi
-    help_out=`$daemon --help 2>&1`; r=$?
-    if test "$r" != 0 ; then
-      log_failure_msg "$help_out"
-      log_failure_msg "There are syntax errors in the server configuration. Please fix them!"
-    else
-      log_success_msg "Syntax OK"
-    fi
-    exit $r
-    ;;
-  'bootstrap')
-      if test "$_use_systemctl" == 1 ; then
-        log_failure_msg "Please use galera_new_cluster to start the mariadb service with --wsrep-new-cluster"
-        exit 1
-      fi
-      # Bootstrap the cluster, start the first node
-      # that initiate the cluster
-      echo $echo_n "Bootstrapping the cluster.. "
-      $0 start $other_args --wsrep-new-cluster
-      exit $?
-      ;;
-  *)
-      # usage
-      basename=`basename "$0"`
-      echo "Usage: $basename  {start|stop|restart|reload|force-reload|status|configtest|bootstrap}  [ MySQL server options ]"
-      exit 1
-    ;;
-esac
-
-exit 0
diff --git a/dbcon/mysql/mysql-Columnstore b/dbcon/mysql/mysql-Columnstore
index 02a0de162..370b277d0 100755
--- a/dbcon/mysql/mysql-Columnstore
+++ b/dbcon/mysql/mysql-Columnstore
@@ -43,12 +43,33 @@
 # If you change base dir, you must also change datadir. These may get
 # overwritten by settings in the MySQL configuration files.
 
-if [ -z "$COLUMNSTORE_INSTALL_DIR" ]; then
-    test -f /etc/default/columnstore && . /etc/default/columnstore
+prefix=/usr/local
+
+USER=`whoami 2>/dev/null`
+
+if [ $USER != "root" ]; then
+	prefix=$HOME
+fi
+
+if [ $USER != "root" ]; then
+	if [ -f $prefix/.bash_profile ]; then		
+		profileFile=$prefix/.bash_profile
+	elif [ -f $prefix/.profile ]; then		
+		profileFile=$prefix/.profile
+	else
+		profileFile=$prefix/.bashrc
+	fi
+		
+	. $profileFile
+fi
+
+# Source function library.
+if [ -f /etc/init.d/functions ]; then
+	. /etc/init.d/functions
 fi
 
 if [ -z "$COLUMNSTORE_INSTALL_DIR" ]; then
-    COLUMNSTORE_INSTALL_DIR=/usr/local/mariadb/columnstore
+	COLUMNSTORE_INSTALL_DIR=/usr/local/mariadb/columnstore
 fi
 
 export COLUMNSTORE_INSTALL_DIR=$COLUMNSTORE_INSTALL_DIR
@@ -62,9 +83,11 @@ datadir=$basedir/db
 # 0 means don't wait at all
 # Negative numbers mean to wait indefinitely
 service_startup_timeout=90
+user=`whoami 2>/dev/null`
+
+# Lock directory
+lockdir=`$COLUMNSTORE_INSTALL_DIR/bin/getConfig Installation LockFileDirectory`
 
-# Lock directory for RedHat / SuSE.
-lockdir='/var/lock/subsys'
 lock_file_path="$lockdir/mysql-Columnstore"
 
 # The following variables are only set for letting mysql.server find things.
@@ -316,10 +339,8 @@ kill_by_pid() {
 
   if [ -n "$pid" ]; then
 	ppid=$(ps -o ppid= -p $pid)
-        $SUDO kill -9 $ppid
         kill -9 $ppid
         sleep 1
-        $SUDO kill -9 $pid
         kill -9 $pid
         echo $echo_n "Force shutting down (no/bad pid file)" 
         log_success_msg
diff --git a/dbcon/mysql/sm.cpp b/dbcon/mysql/sm.cpp
index 9cbfc73e6..5df01dda6 100644
--- a/dbcon/mysql/sm.cpp
+++ b/dbcon/mysql/sm.cpp
@@ -54,6 +54,8 @@ using namespace querystats;
 
 #include "sm.h"
 
+#include "installdir.h"
+
 namespace
 {
 using namespace sm;
@@ -254,7 +256,10 @@ void sighandler(int sig_num)
     FILE* p;
     char buf[1024];
 
-    if ((p = fopen("/tmp/f1.dat", "a")) != NULL)
+	string tmpDir = startup::StartUp::tmpDir() + "/f1.dat";
+	const char *cstr = tmpDir.c_str();
+	
+    if ((p = fopen(cstr, "a")) != NULL)
     {
         snprintf(buf, 1024, "sighandler() hit with %d\n", sig_num);
         fwrite(buf, 1, strlen(buf), p);
diff --git a/ddlproc/ddlproc.cpp b/ddlproc/ddlproc.cpp
index bc70b01d5..6f827f8fd 100644
--- a/ddlproc/ddlproc.cpp
+++ b/ddlproc/ddlproc.cpp
@@ -62,6 +62,8 @@ using namespace execplan;
 #include "utils_utf8.h"
 
 #include "crashtrace.h"
+#include "installdir.h"
+
 
 namespace fs = boost::filesystem;
 
@@ -71,15 +73,12 @@ DistributedEngineComm* Dec;
 
 void setupCwd()
 {
-    string workdir = config::Config::makeConfig()->getConfig("SystemConfig", "WorkingDir");
+    string workdir = startup::StartUp::tmpDir();
 
     if (workdir.length() == 0)
         workdir = ".";
 
     (void)chdir(workdir.c_str());
-
-    if (access(".", W_OK) != 0)
-        (void)chdir("/tmp");
 }
 
 void added_a_pm(int)
diff --git a/dmlproc/dmlproc.cpp b/dmlproc/dmlproc.cpp
index 8369a2003..deb936422 100644
--- a/dmlproc/dmlproc.cpp
+++ b/dmlproc/dmlproc.cpp
@@ -83,6 +83,7 @@ using namespace joblist;
 #include "utils_utf8.h"
 
 #include "crashtrace.h"
+#include "installdir.h"
 
 namespace fs = boost::filesystem;
 
@@ -493,7 +494,7 @@ void rollbackAll(DBRM* dbrm)
 
 void setupCwd()
 {
-    string workdir = Config::makeConfig()->getConfig("SystemConfig", "WorkingDir");
+    string workdir = startup::StartUp::tmpDir();
 
     if (workdir.length() == 0)
         workdir = ".";
@@ -605,26 +606,11 @@ int main(int argc, char* argv[])
     if (temp > 0)
         serverQueueSize = temp;
 
-
-    bool rootUser = true;
-#ifndef _MSC_VER
-    //check if root-user
-    int user;
-    user = getuid();
-
-    if (user != 0)
-        rootUser = false;
-
-#endif
-
     //read and cleanup port before trying to use
     try
     {
         string port = cf->getConfig(DMLProc, "Port");
-        string cmd = "fuser -k " + port + "/tcp >/dev/null 2>&1";
-
-        if ( !rootUser)
-            cmd = "sudo fuser -k " + port + "/tcp >/dev/null 2>&1";
+	string cmd = "fuser -k " + port + "/tcp >/dev/null 2>&1";
 
         (void)::system(cmd.c_str());
     }
diff --git a/exemgr/main.cpp b/exemgr/main.cpp
index 528990ec8..a403360ac 100644
--- a/exemgr/main.cpp
+++ b/exemgr/main.cpp
@@ -105,6 +105,9 @@ using namespace querytele;
 #include "dbrm.h"
 #endif
 
+
+#include "installdir.h"
+
 namespace
 {
 
diff --git a/oam/cloud/IDBCloudGetIP.sh b/oam/cloud/IDBCloudGetIP.sh
deleted file mode 100644
index bca6d41f0..000000000
--- a/oam/cloud/IDBCloudGetIP.sh
+++ /dev/null
@@ -1,44 +0,0 @@
-#! /bin/sh
-# IDBCloudGetIP.sh
-# Get IP Address from a Cloud environment
-#
-# 1. Amazon EC2
-
-prefix=/usr/local
-
-#get instance name from called
-instanceName="$1"
-
-ec2=`$prefix/mariadb/columnstore/bin/getConfig Installation EC2_HOME`
-
-if [ $ec2 == "unassigned" ]; then
-	echo "stopped"
-	exit 1
-fi
-
-java=`$prefix/mariadb/columnstore/bin/getConfig Installation JAVA_HOME`
-path=`$prefix/mariadb/columnstore/bin/getConfig Installation EC2_PATH`
-
-export PATH=$path
-export EC2_HOME=$ec2
-export JAVA_HOME=$java
-
-# get x509 Certification and Private Key
-x509Cert=`$prefix/mariadb/columnstore/bin/getConfig Installation AmazonX509Certificate`
-x509PriKey=`$prefix/mariadb/columnstore/bin/getConfig Installation AmazonX509PrivateKey`
-
-#get instance info
-ec2-describe-instances -C $x509Cert -K $x509PriKey $instanceName > /tmp/instanceInfo 2> /dev/null
-
-#check if running
-cat /tmp/instanceInfo | grep running > /tmp/instanceStatus
-if [ `cat /tmp/instanceStatus | wc -c` -eq 0 ]; then
-   	echo "stopped"
-	exit 1
-fi
-
-#get priviate IP Address
-IpAddr=`cat /tmp/instanceInfo | awk '{gsub(/^[ \t]+|[ \t]+$/,"");print $15}'`
-
-echo $IpAddr
-exit 0
diff --git a/oam/cloud/IDBInstanceCmds.sh b/oam/cloud/IDBInstanceCmds.sh
deleted file mode 100644
index 1d7351594..000000000
--- a/oam/cloud/IDBInstanceCmds.sh
+++ /dev/null
@@ -1,574 +0,0 @@
-#! /bin/sh
-# IDBInstanceCmds.sh
-# get-local-instance-ID, get-zone, getPrivateIP from a Cloud environment
-#
-# 1. Amazon EC2
-
-prefix=/usr/local
-
-#check command
-if [ "$1" = "" ]; then
-	echo "Enter Command Name: {launchInstance|getInstance|getZone|getPrivateIP|getKey|getAMI|getType|terminateInstance|startInstance|assignElasticIP|deassignElasticIP|getProfile|stopInstance|getGroup|getSubnet}
-}"
-	exit 1
-fi
-
-if [ "$1" = "getPrivateIP" ]; then
-	if [ "$2" = "" ]; then
-		echo "Enter Instance Name"
-		exit 1
-	fi
-	instanceName="$2"
-fi
-
-if [ "$1" = "launchInstance" ]; then
-	if [ "$2" = "" ]; then
-		IPaddress="unassigned"
-	else
-		IPaddress="$2"
-	fi
-	if [ "$3" = "" ]; then
-		instanceType="unassigned"
-	else
-		instanceType="$3"
-	fi
-	if [ "$4" = "" ]; then
-		group="unassigned"
-	else
-		group="$4"
-	fi
-fi
-
-if [ "$1" = "terminateInstance" ]; then
-	if [ "$2" = "" ]; then
-		echo "Enter Instance Name"
-		exit 1
-	fi
-	instanceName="$2"
-fi
-
-if [ "$1" = "stopInstance" ]; then
-	if [ "$2" = "" ]; then
-		echo "Enter Instance Name"
-		exit 1
-	fi
-	instanceName="$2"
-fi
-
-if [ "$1" = "startInstance" ]; then
-	if [ "$2" = "" ]; then
-		echo "Enter Instance Name"
-		exit 1
-	fi
-	instanceName="$2"
-fi
-
-if [ "$1" = "assignElasticIP" ]; then
-	if [ "$2" = "" ]; then
-		echo "Enter Instance Name"
-		exit 1
-	else
-		instanceName="$2"
-	fi
-	if [ "$3" = "" ]; then
-		echo "Enter Elastic IP Address"
-		exit 1
-	else
-		IPAddress="$3"
-	fi
-fi
-
-if [ "$1" = "deassignElasticIP" ]; then
-	if [ "$2" = "" ]; then
-		echo "Enter Elastic IP Address"
-		exit 1
-	else
-		IPAddress="$2"
-	fi
-fi
-
-
-test -f /usr/local/mariadb/columnstore/post/functions && . /usr/local/mariadb/columnstore/post/functions
-
-ec2=`$prefix/mariadb/columnstore/bin/getConfig Installation EC2_HOME`
-
-if [ $ec2 == "unassigned" ]; then
-	if [ "$1" = "getPrivateIP" ]; then
-		echo "stopped"
-		exit 1
-	else
-       echo "unknown"
-        exit 1
-	fi
-fi
-
-java=`$prefix/mariadb/columnstore/bin/getConfig Installation JAVA_HOME`
-path=`$prefix/mariadb/columnstore/bin/getConfig Installation EC2_PATH`
-
-export PATH=$path
-export EC2_HOME=$ec2
-export JAVA_HOME=$java
-
-# get Keys and region
-AmazonAccessKeyFile=`$prefix/mariadb/columnstore/bin/getConfig Installation AmazonAccessKey`
-if [ $AmazonAccessKeyFile == "unassigned" ]; then
-	echo "FAILED: missing Config Setting AmazonAccessKey : $AmazonAccessKeyfile"
-	exit 1
-fi
-
-AmazonSecretKeyFile=`$prefix/mariadb/columnstore/bin/getConfig Installation AmazonSecretKey`
-if [ $AmazonSecretKeyFile == "unassigned" ]; then
-	echo "FAILED: missing Config Setting AmazonSecretKeyFile : $AmazonSecretKeyFile"
-	exit 1
-fi
-
-AmazonAccessKey=`cat $AmazonAccessKeyFile`
-AmazonSecretKey=`cat $AmazonSecretKeyFile`
-
-Region=`$prefix/mariadb/columnstore/bin/getConfig Installation AmazonRegion`
-subnet=`$prefix/mariadb/columnstore/bin/getConfig Installation AmazonSubNetID`
-
-if test ! -f $AmazonAccessKeyfile ; then
-	echo "FAILED: missing AmazonAccessKeyfile : $AmazonAccessKeyfile"
-	exit 1
-fi
-
-if test ! -f $AmazonSecretKeyfile ; then
-	echo "FAILED: missing AmazonSecretKeyfile : $AmazonSecretKeyfile"
-	exit 1
-fi
-
-#default instance to null
-instance=""
-
-describeInstanceFile="/tmp/describeInstance.txt"
-touch $describeInstanceFile
-
-describeInstance() {
-	ec2-describe-instances -O $AmazonAccessKey -W $AmazonSecretKey --region $Region > $describeInstanceFile 2>&1
-}
-
-#call at start up
-describeInstance
-
-getInstance() {
-	if [ "$instance" != "" ]; then
-		echo $instance
-		return
-	fi
-	
-	# first get local IP Address
-	localIP=`ifconfig eth0 | grep "inet addr:" | awk '{print substr($2,6,20)}'`
-
-	#get local Instance ID
-	instance=`cat $describeInstanceFile | grep -m 1 -w $localIP |  awk '{gsub(/^[ \t]+|[ \t]+$/,"");print $2}'`
-	if [ "$instance" == "" ]; then
-		describeInstance
-	fi
-	instance=`cat $describeInstanceFile | grep -m 1 -w $localIP |  awk '{gsub(/^[ \t]+|[ \t]+$/,"");print $2}'`
-
-	echo $instance
-	return
-}
-
-getInstancePrivate() {
-	if [ "$instance" != "" ]; then
-		echo $instance
-		return
-	fi
-	
-	# first get local IP Address
-	localIP=`ifconfig eth0 | grep "inet addr:" | awk '{print substr($2,6,20)}'`
-
-	#get local Instance ID
-	instance=`cat $describeInstanceFile | grep -m 1 -w $localIP |  awk '{gsub(/^[ \t]+|[ \t]+$/,"");print $2}'`
-	if [ "$instance" == "" ]; then
-		describeInstance
-	fi
-	instance=`cat $describeInstanceFile | grep -m 1 -w $localIP |  awk '{gsub(/^[ \t]+|[ \t]+$/,"");print $2}'`
-
-	return
-}
-
-
-getZone() {
-	#get from Columnstore.xml if it's there, if not, get from instance then store
-	zone=`$prefix/mariadb/columnstore/bin/getConfig Installation AmazonZone`
-
-	if [ "$zone" = "unassigned" ] || [ "$zone" = "" ]; then
-		#get local Instance ID
-		getInstancePrivate >/dev/null 2>&1
-		#get zone
-		if [ "$subnet" == "unassigned" ]; then
-			zone=`cat $describeInstanceFile | grep -m 1 $instance |  awk '{gsub(/^[ \t]+|[ \t]+$/,"");print $11}'`
-			if [ "$zone" == "" ]; then
-				describeInstance
-			fi
-			zone=`cat $describeInstanceFile | grep -m 1 $instance |  awk '{gsub(/^[ \t]+|[ \t]+$/,"");print $11}'`
-
-		else
-			zone=`cat $describeInstanceFile | grep -m 1 $instance |  awk '{gsub(/^[ \t]+|[ \t]+$/,"");print $11}'`
-			if [ "$zone" == "" ]; then
-				describeInstance
-			fi
-			zone=`cat $describeInstanceFile | grep -m 1 $instance |  awk '{gsub(/^[ \t]+|[ \t]+$/,"");print $11}'`
-		fi
-		$prefix/mariadb/columnstore/bin/setConfig Installation AmazonZone $zone
-	fi
-
-	echo $zone
-	return
-}
-
-getPrivateIP() {
-	#get instance info
-	grep -B1 -A4 -m 1 $instanceName $describeInstanceFile > /tmp/instanceInfo_$instanceName 2>&1
-	if [ `cat /tmp/instanceInfo_$instanceName | wc -c` -eq 0 ]; then
-		describeInstance
-	fi
-	grep -B1 -A4 -m 1 $instanceName $describeInstanceFile > /tmp/instanceInfo_$instanceName 2>&1
-
-	#check if running or terminated
-	cat /tmp/instanceInfo_$instanceName | grep running > /tmp/instanceStatus_$instanceName
-	if [ `cat /tmp/instanceStatus_$instanceName | wc -c` -eq 0 ]; then
-		# not running
-		cat /tmp/instanceInfo_$instanceName | grep pending > /tmp/instanceStatus_$instanceName
-		if [ `cat /tmp/instanceStatus_$instanceName | wc -c` -ne 0 ]; then
-			describeInstance
-			echo "stopped"
-			exit 1
-		else
-			cat /tmp/instanceInfo_$instanceName | grep terminated > /tmp/instanceStatus_$instanceName
-			if [ `cat /tmp/instanceStatus_$instanceName | wc -c` -ne 0 ]; then
-				echo "terminated"
-				exit 1
-			else
-				cat /tmp/instanceInfo_$instanceName | grep shutting-down > /tmp/instanceStatus_$instanceName
-				if [ `cat /tmp/instanceStatus_$instanceName | wc -c` -ne 0 ]; then
-					echo "terminated"
-					exit 1
-				else
-					echo "stopped"
-					exit 1
-				fi
-			fi
-		fi
-	fi
-	
-	#running, get priviate IP Address
-	if [ "$subnet" == "unassigned" ]; then
-		IpAddr=`head -n 2 /tmp/instanceInfo_$instanceName | awk '{gsub(/^[ \t]+|[ \t]+$/,"");print $15}'`
-	else
-		IpAddr=`head -n 2 /tmp/instanceInfo_$instanceName | awk '{gsub(/^[ \t]+|[ \t]+$/,"");print $14}'`
-	fi
-
-	echo $IpAddr
-	exit 0
-}
-
-getType() {
-	#get local Instance ID
-	getInstancePrivate >/dev/null 2>&1
-	#get Type
-	if [ "$subnet" == "unassigned" ]; then
-		instanceType=`cat $describeInstanceFile | grep -m 1 $instance |  awk '{gsub(/^[ \t]+|[ \t]+$/,"");print $9}'`
-		if [ "$instanceType" == "" ]; then
-			describeInstance
-		fi
-		instanceType=`cat $describeInstanceFile | grep -m 1 $instance |  awk '{gsub(/^[ \t]+|[ \t]+$/,"");print $9}'`
-
-	else
-		instanceType=`cat $describeInstanceFile | grep -m 1 $instance |  awk '{gsub(/^[ \t]+|[ \t]+$/,"");print $9}'`
-		if [ "$instanceType" == "" ]; then
-			describeInstance
-		fi
-		instanceType=`cat $describeInstanceFile | grep -m 1 $instance |  awk '{gsub(/^[ \t]+|[ \t]+$/,"");print $9}'`
-
-	fi
-
-	echo $instanceType
-	return
-}
-
-getKey() {
-	#get local Instance ID
-	getInstancePrivate >/dev/null 2>&1
-	#get Key
-	if [ "$subnet" == "unassigned" ]; then
-		key=`cat $describeInstanceFile | grep -m 1 $instance |  awk '{gsub(/^[ \t]+|[ \t]+$/,"");print $7}'`
-		if [ "$key" == "" ]; then
-			describeInstance
-		fi
-		key=`cat $describeInstanceFile | grep -m 1 $instance |  awk '{gsub(/^[ \t]+|[ \t]+$/,"");print $7}'`
-
-	else
-		key=`cat $describeInstanceFile | grep -m 1 $instance |  awk '{gsub(/^[ \t]+|[ \t]+$/,"");print $7}'`
-		if [ "$key" == "" ]; then
-			describeInstance
-		fi
-		key=`cat $describeInstanceFile | grep -m 1 $instance |  awk '{gsub(/^[ \t]+|[ \t]+$/,"");print $7}'`
-
-	fi
-
-	echo $key
-	return
-}
-
-getAMI() {
-	#get local Instance ID
-	getInstancePrivate >/dev/null 2>&1
-	#get AMI
-	ami=`cat $describeInstanceFile | grep -m 1 $instance |  awk '{gsub(/^[ \t]+|[ \t]+$/,"");print $3}'`
-	if [ "$ami" == "" ]; then
-		describeInstance
-	fi
-	ami=`cat $describeInstanceFile | grep -m 1 $instance |  awk '{gsub(/^[ \t]+|[ \t]+$/,"");print $3}'`
-
-	echo $ami
-	return
-}
-
-getGroup() {
-	#get local Instance ID
-	getInstancePrivate >/dev/null 2>&1
-	#get group 
-	if [ "$subnet" == "unassigned" ]; then
-		group=`grep -B1 -A4 -m 1 $instance $describeInstanceFile |  grep -m 1 RESERVATION | awk '{gsub(/^[ \t]+|[ \t]+$/,"");print $4}'`
-		if [ "$group" == "" ]; then
-			describeInstance
-		fi
-		group=`grep -B1 -A4 -m 1 $instance $describeInstanceFile |  grep -m 1 RESERVATION | awk '{gsub(/^[ \t]+|[ \t]+$/,"");print $4}'`
-		if [ "$group" == "" ]; then
-			group=`grep -B1 -A4 -m 1 $instance $describeInstanceFile |  grep -m 1 INSTANCE | awk '{gsub(/^[ \t]+|[ \t]+$/,"");print $22}'`
-		fi
-	else
-		group=`grep -B1 -A6 -m 1 $instance $describeInstanceFile |  grep -m 1 GROUP | awk '{gsub(/^[ \t]+|[ \t]+$/,"");print $2}'`
-		if [ "$group" == "" ]; then
-			describeInstance
-		fi
-		group=`grep -B1 -A6 -m 1 $instance $describeInstanceFile |  grep -m 1 GROUP | awk '{gsub(/^[ \t]+|[ \t]+$/,"");print $2}'`
-		if [ "$group" == "" ]; then
-			group=`grep -B1 -A4 -m 1 $instance $describeInstanceFile |  grep -m 1 INSTANCE | awk '{gsub(/^[ \t]+|[ \t]+$/,"");print $21}'`
-		fi
-	fi
-
-	echo $group
-	return
-}
-
-getProfile() {
-	#get local Instance ID
-	getInstancePrivate >/dev/null 2>&1
-	#get Type
-	if [ "$subnet" == "unassigned" ]; then
-		instanceProfile=`cat $describeInstanceFile | grep -m 1 $instance |  awk '{gsub(/^[ \t]+|[ \t]+$/,"");print $23}'`
-		if [ "$instanceProfile" == "" ]; then
-			describeInstance
-		fi
-		instanceProfile=`cat $describeInstanceFile | grep -m 1 $instance |  awk '{gsub(/^[ \t]+|[ \t]+$/,"");print $23}'`
-
-	else
-		instanceProfile=`cat $describeInstanceFile | grep -m 1 $instance |  awk '{gsub(/^[ \t]+|[ \t]+$/,"");print $22}'`
-		if [ "$instanceProfile" == "" ]; then
-			describeInstance
-		fi
-		instanceProfile=`cat $describeInstanceFile | grep -m 1 $instance |  awk '{gsub(/^[ \t]+|[ \t]+$/,"");print $22}'`
-
-	fi
-
-	echo $instanceProfile
-	return
-}
-
-launchInstance() {
-	#get publickey
-	getKey >/dev/null 2>&1
-	if [ "$group" = "unassigned" ]; then
-		#get group
-		getGroup >/dev/null 2>&1
-	fi
-	#get AMI
-	getAMI >/dev/null 2>&1
-	#get Zone
-	getZone >/dev/null 2>&1
-	if [ "$instanceType" = "unassigned" ]; then
-		#get type
-		getType >/dev/null 2>&1
-	fi
-	#get AMI Profile
-	getProfile >/dev/null 2>&1
-
-	if [ "$subnet" == "unassigned" ]; then
-		#NOT VPC
-		if [ "$instanceProfile" = "" ] || [ "$instanceProfile" = "default" ]; then
-			newInstance=`ec2-run-instances -O $AmazonAccessKey -W $AmazonSecretKey -k $key -g $group -t $instanceType -z $zone --region $Region $ami | grep  -m 1 INSTANCE | awk '{gsub(/^[ \t]+|[ \t]+$/,"");print $2}'`
-		else
-			newInstance=`ec2-run-instances -O $AmazonAccessKey -W $AmazonSecretKey -k $key -g $group -t $instanceType -z $zone -p $instanceProfile --region $Region $ami | grep  -m 1 INSTANCE | awk '{gsub(/^[ \t]+|[ \t]+$/,"");print $2}'`
-		fi
-	else	# VPC
-		if [ "$instanceProfile" = "" ] || [ "$instanceProfile" = "default" ]; then
-			if [ "$group" != "default" ]; then
-				if [ "$IPaddress" = "autoassign" ]; then
-					newInstance=`ec2-run-instances -O $AmazonAccessKey -W $AmazonSecretKey -k $key -g $group -t $instanceType -z $zone  --region $Region -s $subnet $ami | grep  -m 1 INSTANCE | awk '{gsub(/^[ \t]+|[ \t]+$/,"");print $2}'`
-				else
-					newInstance=`ec2-run-instances -O $AmazonAccessKey -W $AmazonSecretKey -k $key -g $group -t $instanceType -z $zone  --region $Region -s $subnet --private-ip-address $IPaddress $ami | grep  -m 1 INSTANCE | awk '{gsub(/^[ \t]+|[ \t]+$/,"");print $2}'`
-				fi
-			else
-				if [ "$IPaddress" = "autoassign" ]; then
-					newInstance=`ec2-run-instances -O $AmazonAccessKey -W $AmazonSecretKey -k $key -t $instanceType -z $zone --region $Region -s $subnet $ami | grep  -m 1 INSTANCE | awk '{gsub(/^[ \t]+|[ \t]+$/,"");print $2}'`
-				else
-					newInstance=`ec2-run-instances --O $AmazonAccessKey -W $AmazonSecretKey -k $key -t $instanceType -z $zone --region $Region -s $subnet --private-ip-address $IPaddress $ami | grep  -m 1 INSTANCE | awk '{gsub(/^[ \t]+|[ \t]+$/,"");print $2}'`
-				fi
-			fi
-		else
-			if [ "$group" != "default" ]; then
-				if [ "$IPaddress" = "autoassign" ]; then
-					newInstance=`ec2-run-instances -O $AmazonAccessKey -W $AmazonSecretKey -k $key -g $group -t $instanceType -z $zone -p $instanceProfile --region $Region -s $subnet $ami | grep  -m 1 INSTANCE | awk '{gsub(/^[ \t]+|[ \t]+$/,"");print $2}'`
-				else
-					newInstance=`ec2-run-instances -O $AmazonAccessKey -W $AmazonSecretKey -k $key -g $group -t $instanceType -z $zone -p $instanceProfile --region $Region -s $subnet --private-ip-address $IPaddress $ami | grep  -m 1 INSTANCE | awk '{gsub(/^[ \t]+|[ \t]+$/,"");print $2}'`
-				fi
-			else
-				if [ "$IPaddress" = "autoassign" ]; then
-					newInstance=`ec2-run-instances -O $AmazonAccessKey -W $AmazonSecretKey -k $key -t $instanceType -z $zone -p $instanceProfile --region $Region -s $subnet $ami | grep  -m 1 INSTANCE | awk '{gsub(/^[ \t]+|[ \t]+$/,"");print $2}'`
-				else
-					newInstance=`ec2-run-instances -O $AmazonAccessKey -W $AmazonSecretKey -k $key -t $instanceType -z $zone -p $instanceProfile --region $Region -s $subnet --private-ip-address $IPaddress $ami | grep  -m 1 INSTANCE | awk '{gsub(/^[ \t]+|[ \t]+$/,"");print $2}'`
-				fi
-			fi
-		fi
-	fi
-	echo $newInstance
-	return
-}
-
-terminateInstance() {
-	#terminate Instance
-	ec2-terminate-instances -O $AmazonAccessKey -W $AmazonSecretKey --region $Region $instanceName > /tmp/termInstanceInfo_$instanceName 2>&1
-	return
-}
-
-stopInstance() {
-	#terminate Instance
-	ec2-stop-instances -O $AmazonAccessKey -W $AmazonSecretKey --region $Region $instanceName > /tmp/stopInstanceInfo_$instanceName 2>&1
-	return
-}
-
-startInstance() {
-	#terminate Instance
-	ec2-start-instances -O $AmazonAccessKey -W $AmazonSecretKey --region $Region $instanceName > /tmp/startInstanceInfo_$instanceName 2>&1
-
-	cat /tmp/startInstanceInfo_$instanceName | grep INSTANCE > /tmp/startInstanceStatus_$instanceName
-	if [ `cat /tmp/startInstanceStatus_$instanceName | wc -c` -eq 0 ]; then
-		echo "Failed, check /tmp/startInstanceInfo_$instanceName"
-		exit 1
-	fi
-	echo "Success"
-	exit 0
-}
-
-assignElasticIP() {
-	#terminate Instance
-
-        if [ "$subnet" == "unassigned" ]; then
-		ec2-associate-address -O $AmazonAccessKey -W $AmazonSecretKey -i $instanceName $IPAddress > /tmp/assignElasticIPInfo_$IPAddress 2>&1
-	else
-		EIP=`ec2-describe-addresses -O $AmazonAccessKey -W $AmazonSecretKey --region $Region $IPAddress | awk '{gsub(/^[ \t]+|[ \t]+$/,"");print $4}'`
-                ec2-associate-address -O $AmazonAccessKey -W $AmazonSecretKey --region $Region -i $instanceName -a $EIP > /tmp/assignElasticIPInfo_$IPAddress 2>&1
-	fi
-
-	cat /tmp/assignElasticIPInfo_$IPAddress | grep ADDRESS > /tmp/assignElasticIPStatus_$IPAddress
-	if [ `cat /tmp/assignElasticIPStatus_$IPAddress | wc -c` -eq 0 ]; then
-		echo "Failed, check /tmp/assignElasticIPInfo_$IPAddress"
-		exit 1
-	fi
-
-	echo "Success"
-	exit 0
-}
-
-deassignElasticIP() {
-	#terminate Instance
-	ec2-disassociate-address -O $AmazonAccessKey -W $AmazonSecretKey $IPAddress > /tmp/deassignElasticIPInfo_$IPAddress 2>&1
-
-	cat /tmp/deassignElasticIPInfo_$IPAddress | grep ADDRESS > /tmp/deassignElasticIPStatus_$IPAddress
-	if [ `cat /tmp/deassignElasticIPStatus_$IPAddress | wc -c` -eq 0 ]; then
-		echo "Failed, check /tmp/deassignElasticIPStatus_$IPAddress"
-		exit 1
-	fi
-
-	echo "Success"
-	exit 0
-}
-
-getSubnet() {
-        #get local Instance ID
-        getInstancePrivate >/dev/null 2>&1
-        #get Subnet
-        subnet=`cat $describeInstanceFile | grep -m 1 $instance |  awk '{gsub(/^[ \t]+|[ \t]+$/,"");print $16}'`
-        if [ "$subnet" == "" ]; then
-                describeInstance
-        fi
-        subnet=`cat $describeInstanceFile | grep -m 1 $instance |  awk '{gsub(/^[ \t]+|[ \t]+$/,"");print $16}'`
-
-	if [[ $subnet == *"subnet"* ]]
-	then
-        	echo $subnet
-	else
-		echo "failed"
-	fi
-
-        return
-}
-
-
-case "$1" in
-  getInstance)
-  	getInstance
-	;;
-  getZone)
-  	getZone
-	;;
-  getPrivateIP)
-  	getPrivateIP
-	;;
-  getKey)
-  	getKey
-	;;
-  getAMI)
-  	getAMI
-	;;
-  getType)
-  	getType
-	;;
-  launchInstance)
-  	launchInstance
-	;;
-  terminateInstance)
-  	terminateInstance
-	;;
-  stopInstance)
-  	stopInstance
-	;;
-  startInstance)
-  	startInstance
-	;;
-  assignElasticIP)
-  	assignElasticIP
-	;;
-  deassignElasticIP)
-  	deassignElasticIP
-	;;
-  getProfile)
-  	getProfile
-	;;
-  getGroup)
-  	getGroup
-	;;
-  getSubnet)
-  	getSubnet
-	;;
-  *)
-	echo $"Usage: $0 {launchInstance|getInstance|getZone|getPrivateIP|getType|getKey|getAMI|terminateInstance|startInstance|assignElasticIP|deassignElasticIP|getProfile|stopInstance|getGroup|getSubnet}"
-	exit 1
-esac
-
-exit $?
diff --git a/oam/cloud/IDBVolumeCmds.sh b/oam/cloud/IDBVolumeCmds.sh
deleted file mode 100644
index 3d64007b1..000000000
--- a/oam/cloud/IDBVolumeCmds.sh
+++ /dev/null
@@ -1,337 +0,0 @@
-#! /bin/sh
-# IDBVolumeCmds.sh
-# describe, detach and attach Volume Storage from a Cloud environment
-#
-# 1. Amazon EC2
-
-prefix=/usr/local
-
-#check command
-if [ "$1" = "" ]; then
-	echo "Enter Command Name: {create|describe|detach|attach|delete|createTag}"
-	exit 1
-fi
-
-if [ "$1" = "create" ]; then
-	if [ "$2" = "" ]; then
-		echo "Enter size of the volume, in GiB (1-1024)"
-		exit 1
-	fi
-	volumeSize="$2"
-
-	#get module-type
-	if [ "$3" = "" ]; then
-		echo "Enter Module Type"
-		exit 1
-	fi
-	moduleType="$3"
-fi
-
-if [ "$1" = "describe" ]; then
-	if [ "$2" = "" ]; then
-		echo "Enter Volume Name"
-		exit 1
-	fi
-	volumeName="$2"
-fi
-
-if [ "$1" = "detach" ]; then
-	if [ "$2" = "" ]; then
-		echo "Enter Volume Name"
-		exit 1
-	fi
-	volumeName="$2"
-fi
-
-if [ "$1" = "attach" ]; then
-	if [ "$2" = "" ]; then
-		echo "Enter Volume Name"
-		exit 1
-	fi
-	volumeName="$2"
-
-	#get instance-name and device-name
-	if [ "$3" = "" ]; then
-		echo "Enter Instance Name"
-		exit 1
-	fi
-	instanceName="$3"
-
-	if [ "$4" = "" ]; then
-		echo "Enter Device Name"
-		exit 1
-	fi
-	deviceName="$4"
-fi
-
-if [ "$1" = "delete" ]; then
-	if [ "$2" = "" ]; then
-		echo "Enter Volume Name"
-		exit 1
-	fi
-	volumeName="$2"
-fi
-
-if [ "$1" = "createTag" ]; then
-	if [ "$2" = "" ]; then
-		echo "Enter Resource Name"
-		exit 1
-	fi
-	resourceName="$2"
-
-	if [ "$3" = "" ]; then
-		echo "Enter Tag Name"
-		exit 1
-	fi
-	tagName="$3"
-
-	if [ "$4" = "" ]; then
-		echo "Enter Tag Value"
-		exit 1
-	fi
-	tagValue="$4"
-fi
-
-
-test -f /usr/local/mariadb/columnstore/post/functions && . /usr/local/mariadb/columnstore/post/functions
-
-ec2=`$prefix/mariadb/columnstore/bin/getConfig Installation EC2_HOME`
-
-if [ $ec2 == "unassigned" ]; then
-       STATUS="unknown"
-        RETVAL=1
-fi
-
-java=`$prefix/mariadb/columnstore/bin/getConfig Installation JAVA_HOME`
-path=`$prefix/mariadb/columnstore/bin/getConfig Installation EC2_PATH`
-
-export PATH=$path
-export EC2_HOME=$ec2
-export JAVA_HOME=$java
-
-# get Keys and region
-AmazonAccessKeyFile=`$prefix/mariadb/columnstore/bin/getConfig Installation AmazonAccessKey`
-if [ $AmazonAccessKeyFile == "unassigned" ]; then
-	echo "FAILED: missing Config Setting AmazonAccessKey : $AmazonAccessKeyfile"
-	exit 1
-fi
-
-AmazonSecretKeyFile=`$prefix/mariadb/columnstore/bin/getConfig Installation AmazonSecretKey`
-if [ $AmazonSecretKeyFile == "unassigned" ]; then
-	echo "FAILED: missing Config Setting AmazonSecretKeyFile : $AmazonSecretKeyFile"
-	exit 1
-fi
-
-AmazonAccessKey=`cat $AmazonAccessKeyFile`
-AmazonSecretKey=`cat $AmazonSecretKeyFile`
-
-if test ! -f $AmazonAccessKeyfile ; then
-	echo "FAILED: missing AmazonAccessKeyfile : $AmazonAccessKeyfile"
-	exit 1
-fi
-
-if test ! -f $AmazonSecretKeyfile ; then
-	echo "FAILED: missing AmazonSecretKeyfile : $AmazonSecretKeyfile"
-	exit 1
-fi
-
-Region=`$prefix/mariadb/columnstore/bin/getConfig Installation AmazonRegion`
-
-
-checkInfostatus() {
-	#check if attached
-	cat /tmp/volumeInfo_$volumeName | grep attached > /tmp/volumeStatus_$volumeName
-	if [ `cat /tmp/volumeStatus_$volumeName | wc -c` -ne 0 ]; then
-		STATUS="attached"
-		RETVAL=0
-		return
-	fi
-	#check if available
-	cat /tmp/volumeInfo_$volumeName | grep available > /tmp/volumeStatus_$volumeName
-	if [ `cat /tmp/volumeStatus_$volumeName | wc -c` -ne 0 ]; then
-		STATUS="available"
-		RETVAL=0
-		return
-	fi
-	#check if detaching
-	cat /tmp/volumeInfo_$volumeName | grep detaching > /tmp/volumeStatus_$volumeName
-	if [ `cat /tmp/volumeStatus_$volumeName | wc -c` -ne 0 ]; then
-		STATUS="detaching"
-		RETVAL=0
-		return
-	fi
-	#check if attaching
-	cat /tmp/volumeInfo_$volumeName | grep attaching > /tmp/volumeStatus_$volumeName
-	if [ `cat /tmp/volumeStatus_$volumeName | wc -c` -ne 0 ]; then
-		STATUS="attaching"
-		RETVAL=0
-		return
-	fi
-	#check if doesn't exist
-	cat /tmp/volumeInfo_$volumeName | grep "does not exist" > /tmp/volumeStatus_$volumeName
-	if [ `cat /tmp/volumeStatus_$volumeName | wc -c` -ne 0 ]; then
-		STATUS="does-not-exist"
-		RETVAL=1
-		return
-	fi
-	#check if reports already attached from attach command
-	cat /tmp/volumeInfo_$volumeName | grep "already attached" > /tmp/volumeStatus_$volumeName
-	if [ `cat /tmp/volumeStatus_$volumeName | wc -c` -ne 0 ]; then
-		STATUS="already-attached"
-		RETVAL=1
-		return
-	fi
-	#any other, unknown error
-	STATUS="unknown"
-	RETVAL=1
-	return
-}
-
-createvolume() {
-	# get zone
-	zone=`$prefix/mariadb/columnstore/bin/IDBInstanceCmds.sh getZone`
-
-	if [ $moduleType == "um" ]; then
-		# get type
-		volumeType=`$prefix/mariadb/columnstore/bin/getConfig Installation UMVolumeType`
-		if [ $volumeType == "io1" ]; then
-			# get IOPS
-			volumeIOPS=`$prefix/mariadb/columnstore/bin/getConfig Installation UMVolumeIOPS`
-		fi
-	else	# pm
-		# get type
-		volumeType=`$prefix/mariadb/columnstore/bin/getConfig Installation PMVolumeType`
-		if [ $volumeType == "io1" ]; then
-			# get IOPS
-			volumeIOPS=`$prefix/mariadb/columnstore/bin/getConfig Installation PMVolumeIOPS`
-		fi
-	fi
-
-	#create volume
-	if [ $volumeType == "io1" ]; then
-		volume=`ec2-create-volume -O $AmazonAccessKey -W $AmazonSecretKey --region $Region -z $zone -s $volumeSize -t $volumeType -iops $volumeIOPS  | awk '{gsub(/^[ \t]+|[ \t]+$/,"");print $2}'`
-	else
-		volume=`ec2-create-volume -O $AmazonAccessKey -W $AmazonSecretKey --region $Region -z $zone -s $volumeSize -t $volumeType | awk '{gsub(/^[ \t]+|[ \t]+$/,"");print $2}'`
-	fi
-
-	echo $volume
-	return
-}
-
-describevolume() {
-	#describe volume
-	ec2-describe-volumes -O $AmazonAccessKey -W $AmazonSecretKey --region $Region $volumeName > /tmp/volumeInfo_$volumeName 2>&1
-
-	checkInfostatus
-	echo $STATUS
-	return
-}
-
-detachvolume() {
-	#detach volume
-	ec2-detach-volume -O $AmazonAccessKey -W $AmazonSecretKey --region $Region $volumeName > /tmp/volumeInfo_$volumeName 2>&1
-
-	checkInfostatus
-	if [ $STATUS == "detaching" ]; then
-		retries=1
-		while [ $retries -ne 60 ]; do
-			#retry until it's attached
-			ec2-detach-volume -O $AmazonAccessKey -W $AmazonSecretKey --region $Region $volumeName > /tmp/volumeInfo_$volumeName 2>&1
-		
-			checkInfostatus
-			if [ $STATUS == "available" ]; then
-				echo "available"
-				exit 0
-			fi
-			((retries++))
-			sleep 1
-		done
-		test -f /usr/local/mariadb/columnstore/post/functions && . /usr/local/mariadb/columnstore/post/functions
-		cplogger -w 100 "detachvolume failed: $STATUS"
-		echo "failed"
-		exit 1
-	fi
-
-	if [ $STATUS == "available" ]; then
-		echo "available"
-		exit 0
-	fi
-
-	test -f /usr/local/mariadb/columnstore/post/functions && . /usr/local/mariadb/columnstore/post/functions
-	cplogger -w 100 "detachvolume failed status: $STATUS"
-	echo $STATUS
-	exit 1
-}
-
-attachvolume() {
-
-	#detach volume
-	ec2-attach-volume -O $AmazonAccessKey -W $AmazonSecretKey --region $Region $volumeName -i $instanceName -d $deviceName > /tmp/volumeInfo_$volumeName 2>&1
-
-	checkInfostatus
-	if [ $STATUS == "attaching" -o $STATUS == "already-attached" ]; then
-		retries=1
-		while [ $retries -ne 60 ]; do
-			#check status until it's attached
-			describevolume
-			if [ $STATUS == "attached" ]; then
-				echo "attached"
-				exit 0
-			fi
-			((retries++))
-			sleep 1
-		done
-		test -f /usr/local/mariadb/columnstore/post/functions && . /usr/local/mariadb/columnstore/post/functions
-		cplogger -w 100 "attachvolume failed: $STATUS"
-		echo "failed"
-		exit 1
-	fi
-
-	if [ $STATUS == "attached" ]; then
-		echo "attached"
-		exit 0
-	fi
-
-	test -f /usr/local/mariadb/columnstore/post/functions && . /usr/local/mariadb/columnstore/post/functions
-	cplogger -w 100 "attachvolume failed: $STATUS"
-	echo $STATUS
-	exit 1
-}
-
-deletevolume() {
-	#delete volume
-	ec2-delete-volume -O $AmazonAccessKey -W $AmazonSecretKey --region $Region $volumeName > /tmp/deletevolume_$volumeName 2>&1
-	return
-}
-
-createTag() {
-	#create tag
-	ec2-create-tags -O $AmazonAccessKey -W $AmazonSecretKey --region $Region $resourceName --tag $tagName=$tagValue > /tmp/createTag_$volumeName 2>&1
-	return
-}
-
-case "$1" in
-  create)
-  	createvolume
-	;;
-  describe)
-  	describevolume
-	;;
-  detach)
-  	detachvolume
-	;;
-  attach)
-  	attachvolume
-	;;
-  delete)
-  	deletevolume
-	;;
-  createTag)
-  	createTag
-	;;
-  *)
-	echo $"Usage: $0 {create|describe|detach|attach|delete|}"
-	exit 1
-esac
-
-exit $?
diff --git a/oam/cloud/MCSInstanceCmds.sh b/oam/cloud/MCSInstanceCmds.sh
index fb7909863..a720537e7 100755
--- a/oam/cloud/MCSInstanceCmds.sh
+++ b/oam/cloud/MCSInstanceCmds.sh
@@ -10,6 +10,8 @@ fi
 
 export COLUMNSTORE_INSTALL_DIR=$COLUMNSTORE_INSTALL_DIR
 
+#get temp directory
+tmpdir=`$COLUMNSTORE_INSTALL_DIR/bin/getConfig SystemConfig SystemTempFileDir`
 
 #check command
 if [ "$1" = "" ]; then
@@ -310,7 +312,7 @@ terminateInstance() {
         getRegion >/dev/null 2>&1
 
 	#terminate Instance
-	$AWSCLI terminate-instances --instance-ids $instanceName --region $Region > /tmp/termInstanceInfo_$instanceName 2>&1
+	$AWSCLI terminate-instances --instance-ids $instanceName --region $Region > ${tmpdir}/termInstanceInfo_$instanceName 2>&1
 	return
 }
 
@@ -319,7 +321,7 @@ stopInstance() {
         getRegion >/dev/null 2>&1
 
 	#terminate Instance
-	$AWSCLI stop-instances --instance-ids $instanceName --region $Region > /tmp/stopInstanceInfo_$instanceName 2>&1
+	$AWSCLI stop-instances --instance-ids $instanceName --region $Region > ${tmpdir}/stopInstanceInfo_$instanceName 2>&1
 	return
 }
 
@@ -328,11 +330,11 @@ startInstance() {
         getRegion >/dev/null 2>&1
 
 	#terminate Instance
-	$AWSCLI start-instances --instance-ids $instanceName --region $Region > /tmp/startInstanceInfo_$instanceName 2>&1
+	$AWSCLI start-instances --instance-ids $instanceName --region $Region > ${tmpdir}/startInstanceInfo_$instanceName 2>&1
 
-	cat /tmp/startInstanceInfo_$instanceName | grep InstanceId > /tmp/startInstanceStatus_$instanceName
-	if [ `cat /tmp/startInstanceStatus_$instanceName | wc -c` -eq 0 ]; then
-		echo "Failed, check /tmp/startInstanceInfo_$instanceName"
+	cat ${tmpdir}/startInstanceInfo_$instanceName | grep InstanceId > ${tmpdir}/startInstanceStatus_$instanceName
+	if [ `cat ${tmpdir}/startInstanceStatus_$instanceName | wc -c` -eq 0 ]; then
+		echo "Failed, check ${tmpdir}/startInstanceInfo_$instanceName"
 		exit 1
 	fi
 	echo "Success"
@@ -345,11 +347,11 @@ assignElasticIP() {
 
 	EIP=`$AWSCLI describe-addresses --region $Region --public-ips  $IPAddress --query 'Addresses[*].AllocationId' --output text`
         
-	$AWSCLI associate-address --region $Region  --instance-id $instanceName --allocation-id $EIP > /tmp/assignElasticIPInfo_$IPAddress 2>&1
+	$AWSCLI associate-address --region $Region  --instance-id $instanceName --allocation-id $EIP > ${tmpdir}/assignElasticIPInfo_$IPAddress 2>&1
 
-	cat /tmp/assignElasticIPInfo_$IPAddress | grep error > /tmp/assignElasticIPStatus_$IPAddress
-	if [ `cat /tmp/assignElasticIPStatus_$IPAddress | wc -c` -ne 0 ]; then
-		echo "Failed, check /tmp/assignElasticIPInfo_$IPAddress"
+	cat ${tmpdir}/assignElasticIPInfo_$IPAddress | grep error > ${tmpdir}/assignElasticIPStatus_$IPAddress
+	if [ `cat ${tmpdir}/assignElasticIPStatus_$IPAddress | wc -c` -ne 0 ]; then
+		echo "Failed, check ${tmpdir}/assignElasticIPInfo_$IPAddress"
 		exit 1
 	fi
 
@@ -363,10 +365,10 @@ deassignElasticIP() {
 
 	EIP=`$AWSCLI describe-addresses --region $Region --public-ips  $IPAddress --query 'Addresses[*].AssociationId' --output text`
 
-	$AWSCLI disassociate-address --region $Region --association-id $EIP > /tmp/deassignElasticIPInfo_$IPAddress 2>&1
-	cat /tmp/deassignElasticIPInfo_$IPAddress | grep error > /tmp/deassignElasticIPStatus_$IPAddress
-	if [ `cat /tmp/deassignElasticIPStatus_$IPAddress | wc -c` -ne 0 ]; then
-		echo "Failed, check /tmp/deassignElasticIPStatus_$IPAddress"
+	$AWSCLI disassociate-address --region $Region --association-id $EIP > ${tmpdir}/deassignElasticIPInfo_$IPAddress 2>&1
+	cat ${tmpdir}/deassignElasticIPInfo_$IPAddress | grep error > ${tmpdir}/deassignElasticIPStatus_$IPAddress
+	if [ `cat ${tmpdir}/deassignElasticIPStatus_$IPAddress | wc -c` -ne 0 ]; then
+		echo "Failed, check ${tmpdir}/deassignElasticIPStatus_$IPAddress"
 		exit 1
 	fi
 
diff --git a/oam/cloud/MCSVolumeCmds.sh b/oam/cloud/MCSVolumeCmds.sh
index c7a231261..9311000c1 100755
--- a/oam/cloud/MCSVolumeCmds.sh
+++ b/oam/cloud/MCSVolumeCmds.sh
@@ -10,6 +10,9 @@ fi
 
 export COLUMNSTORE_INSTALL_DIR=$COLUMNSTORE_INSTALL_DIR
 
+#get temp directory
+tmpdir=`$COLUMNSTORE_INSTALL_DIR/bin/getConfig SystemConfig SystemTempFileDir`
+
 #check command
 if [ "$1" = "" ]; then
 	echo "Enter Command Name: {create|describe|detach|attach|delete|createTag}"
@@ -108,43 +111,43 @@ Region=`$COLUMNSTORE_INSTALL_DIR/bin/MCSInstanceCmds.sh getRegion`
 
 checkInfostatus() {
 	#check if attached
-	cat /tmp/volumeInfo_$volumeName | grep attached > /tmp/volumeStatus_$volumeName
-	if [ `cat /tmp/volumeStatus_$volumeName | wc -c` -ne 0 ]; then
+	cat ${tmpdir}/volumeInfo_$volumeName | grep attached > ${tmpdir}/volumeStatus_$volumeName
+	if [ `cat ${tmpdir}/volumeStatus_$volumeName | wc -c` -ne 0 ]; then
 		STATUS="attached"
 		RETVAL=0
 		return
 	fi
 	#check if available
-	cat /tmp/volumeInfo_$volumeName | grep available > /tmp/volumeStatus_$volumeName
-	if [ `cat /tmp/volumeStatus_$volumeName | wc -c` -ne 0 ]; then
+	cat ${tmpdir}/volumeInfo_$volumeName | grep available > ${tmpdir}/volumeStatus_$volumeName
+	if [ `cat ${tmpdir}/volumeStatus_$volumeName | wc -c` -ne 0 ]; then
 		STATUS="available"
 		RETVAL=0
 		return
 	fi
 	#check if detaching
-	cat /tmp/volumeInfo_$volumeName | grep detaching > /tmp/volumeStatus_$volumeName
-	if [ `cat /tmp/volumeStatus_$volumeName | wc -c` -ne 0 ]; then
+	cat ${tmpdir}/volumeInfo_$volumeName | grep detaching > ${tmpdir}/volumeStatus_$volumeName
+	if [ `cat ${tmpdir}/volumeStatus_$volumeName | wc -c` -ne 0 ]; then
 		STATUS="detaching"
 		RETVAL=0
 		return
 	fi
 	#check if attaching
-	cat /tmp/volumeInfo_$volumeName | grep attaching > /tmp/volumeStatus_$volumeName
-	if [ `cat /tmp/volumeStatus_$volumeName | wc -c` -ne 0 ]; then
+	cat ${tmpdir}/volumeInfo_$volumeName | grep attaching > ${tmpdir}/volumeStatus_$volumeName
+	if [ `cat ${tmpdir}/volumeStatus_$volumeName | wc -c` -ne 0 ]; then
 		STATUS="attaching"
 		RETVAL=0
 		return
 	fi
 	#check if doesn't exist
-	cat /tmp/volumeInfo_$volumeName | grep "does not exist" > /tmp/volumeStatus_$volumeName
-	if [ `cat /tmp/volumeStatus_$volumeName | wc -c` -ne 0 ]; then
+	cat ${tmpdir}/volumeInfo_$volumeName | grep "does not exist" > ${tmpdir}/volumeStatus_$volumeName
+	if [ `cat ${tmpdir}/volumeStatus_$volumeName | wc -c` -ne 0 ]; then
 		STATUS="does-not-exist"
 		RETVAL=1
 		return
 	fi
 	#check if reports already attached from attach command
-	cat /tmp/volumeInfo_$volumeName | grep "already attached" > /tmp/volumeStatus_$volumeName
-	if [ `cat /tmp/volumeStatus_$volumeName | wc -c` -ne 0 ]; then
+	cat ${tmpdir}/volumeInfo_$volumeName | grep "already attached" > ${tmpdir}/volumeStatus_$volumeName
+	if [ `cat ${tmpdir}/volumeStatus_$volumeName | wc -c` -ne 0 ]; then
 		STATUS="already-attached"
 		RETVAL=1
 		return
@@ -188,7 +191,7 @@ createvolume() {
 
 describevolume() {
 	#describe volume
-	$AWSCLI describe-volumes --volume-ids  $volumeName --region $Region  > /tmp/volumeInfo_$volumeName 2>&1
+	$AWSCLI describe-volumes --volume-ids  $volumeName --region $Region  > ${tmpdir}/volumeInfo_$volumeName 2>&1
 
 	checkInfostatus
 	echo $STATUS
@@ -197,14 +200,14 @@ describevolume() {
 
 detachvolume() {
 	#detach volume
-	$AWSCLI detach-volume --volume-id  $volumeName --region $Region  > /tmp/volumeInfo_$volumeName 2>&1
+	$AWSCLI detach-volume --volume-id  $volumeName --region $Region  > ${tmpdir}/volumeInfo_$volumeName 2>&1
 
 	checkInfostatus
 	if [ $STATUS == "detaching" ]; then
 		retries=1
 		while [ $retries -ne 10 ]; do
 			#retry until it's attached
-			$AWSCLI detach-volume --volume-id  $volumeName --region $Region > /tmp/volumeInfo_$volumeName 2>&1
+			$AWSCLI detach-volume --volume-id  $volumeName --region $Region > ${tmpdir}/volumeInfo_$volumeName 2>&1
 		
 			checkInfostatus
 			if [ $STATUS == "available" ]; then
@@ -234,7 +237,7 @@ detachvolume() {
 attachvolume() {
 
 	#detach volume
-	$AWSCLI attach-volume --volume-id  $volumeName --instance-id $instanceName --device $deviceName --region $Region  > /tmp/volumeInfo_$volumeName 2>&1
+	$AWSCLI attach-volume --volume-id  $volumeName --instance-id $instanceName --device $deviceName --region $Region  > ${tmpdir}/volumeInfo_$volumeName 2>&1
 
 	checkInfostatus
 	if [ $STATUS == "attaching" -o $STATUS == "already-attached" ]; then
@@ -268,13 +271,13 @@ attachvolume() {
 
 deletevolume() {
 	#delete volume
-	$AWSCLI delete-volume --volume-id  $volumeName --region $Region  > /tmp/deletevolume_$volumeName 2>&1
+	$AWSCLI delete-volume --volume-id  $volumeName --region $Region  > ${tmpdir}/deletevolume_$volumeName 2>&1
 	return
 }
 
 createTag() {
 	#create tag
-	$AWSCLI create-tags --resources  $resourceName --tags Key=$tagName,Value=$tagValue --region $Region > /tmp/createTag_$volumeName 2>&1
+	$AWSCLI create-tags --resources  $resourceName --tags Key=$tagName,Value=$tagValue --region $Region > ${tmpdir}/createTag_$resourceName 2>&1
 	return
 }
 
diff --git a/oam/etc/CMakeLists.txt b/oam/etc/CMakeLists.txt
index 6e334e7b6..0470ac0ae 100644
--- a/oam/etc/CMakeLists.txt
+++ b/oam/etc/CMakeLists.txt
@@ -3,6 +3,4 @@ install(FILES  AlarmConfig.xml
                Columnstore.xml 
                ProcessConfig.xml 
                ConsoleCmds.xml 
-               Columnstore.xml.singleserver 
-               ProcessConfig.xml.singleserver 
                DESTINATION ${ENGINE_ETCDIR} COMPONENT platform)
diff --git a/oam/etc/Calpont.xml b/oam/etc/Calpont.xml
deleted file mode 100755
index a63fe8127..000000000
--- a/oam/etc/Calpont.xml
+++ /dev/null
@@ -1,544 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- $Id: Columnstore.xml 3713 2013-08-16 20:04:47Z wweeks $ -->
-<!--
-	WARNING: Do not make changes to this file unless directed to do so by
-	Calpont service engineers. Incorrect settings can render your system
-	unusable and will require a service call to correct.
--->
-<Calpont Version="V1.0.0">
-	<ExeMgr1>
-		<IPAddr>0.0.0.0</IPAddr>
-		<Port>8601</Port>
-		<Module>unassigned</Module>
-	</ExeMgr1>
-	<JobProc>
-		<IPAddr>0.0.0.0</IPAddr>
-		<Port>8602</Port>
-	</JobProc>
-	<ProcMgr>
-		<IPAddr>0.0.0.0</IPAddr>
-		<Port>8603</Port>
-	</ProcMgr>
-	<ProcStatusControl>
-		<IPAddr>0.0.0.0</IPAddr>
-		<Port>8604</Port>
-	</ProcStatusControl>
-	<ProcStatusControlStandby>
-		<IPAddr>0.0.0.0</IPAddr>
-		<Port>8605</Port>
-	</ProcStatusControlStandby>
-	<!-- Disabled
-	<ProcHeartbeatControl>
-		<IPAddr>0.0.0.0</IPAddr>
-		<Port>8605</Port>
-	</ProcHeartbeatControl>
-	-->
-	<!-- ProcessMonitor Port: 8800 - 8820 is reserved to support External Modules-->
-	<localhost_ProcessMonitor>
-		<IPAddr>127.0.0.1</IPAddr>
-		<Port>8800</Port>
-	</localhost_ProcessMonitor>
-	<dm1_ProcessMonitor>
-		<IPAddr>0.0.0.0</IPAddr>
-		<Port>8800</Port>
-	</dm1_ProcessMonitor>
-	<um1_ProcessMonitor>
-		<IPAddr>0.0.0.0</IPAddr>
-		<Port>8800</Port>
-	</um1_ProcessMonitor>
-	<pm1_ProcessMonitor>
-		<IPAddr>0.0.0.0</IPAddr>
-		<Port>8800</Port>
-	</pm1_ProcessMonitor>
-	<dm1_ServerMonitor>
-		<IPAddr>0.0.0.0</IPAddr>
-		<Port>8622</Port>
-	</dm1_ServerMonitor>
-	<um1_ServerMonitor>
-		<IPAddr>0.0.0.0</IPAddr>
-		<Port>8622</Port>
-	</um1_ServerMonitor>
-	<pm1_ServerMonitor>
-		<IPAddr>0.0.0.0</IPAddr>
-		<Port>8622</Port>
-	</pm1_ServerMonitor>
-	<pm1_WriteEngineServer>
-		<IPAddr>0.0.0.0</IPAddr>
-		<Port>8630</Port>
-	</pm1_WriteEngineServer>
-	<DDLProc>
-		<IPAddr>0.0.0.0</IPAddr>
-		<Port>8612</Port>
-	</DDLProc>
-	<DMLProc>
-		<IPAddr>0.0.0.0</IPAddr>
-		<Port>8614</Port>
-	</DMLProc>
-	<BatchInsert>
-		<RowsPerBatch>10000</RowsPerBatch>
-	</BatchInsert>
-	<PrimitiveServers>
-		<Count>1</Count>
-		<ConnectionsPerPrimProc>8</ConnectionsPerPrimProc>
-		<ProcessorThreshold>128</ProcessorThreshold>
-		<ProcessorQueueSize>10K</ProcessorQueueSize> <!-- minimum of extent size 8192 -->
-		<DebugLevel>0</DebugLevel>
-		<LBID_Shift>13</LBID_Shift>
-		<ColScanBufferSizeBlocks>512</ColScanBufferSizeBlocks>
-		<ColScanReadAheadBlocks>512</ColScanReadAheadBlocks> <!-- s/b factor of extent size 8192 -->
-		<!-- <BPPCount>16</BPPCount> --> <!-- Default num cores * 2.  A cap on the number of simultaneous primitives per jobstep -->
-		<PrefetchThreshold>1</PrefetchThreshold>
-		<PTTrace>0</PTTrace>
-		<RotatingDestination>y</RotatingDestination> <!-- Iterate thru UM ports; set to 'n' if UM/PM on same server -->
-		<!-- <HighPriorityPercentage>60</HighPriorityPercentage> -->
-		<!-- <MediumPriorityPercentage>30</MediumPriorityPercentage> -->
-		<!-- <LowPriorityPercentage>10</LowPriorityPercentage> -->
-		<DirectIO>y</DirectIO>
-	</PrimitiveServers>
-	<PMS1>
-		<IPAddr>0.0.0.0</IPAddr>
-		<Port>8620</Port>
-	</PMS1>
-	<PMS2>
-		<IPAddr>0.0.0.0</IPAddr>
-		<Port>8620</Port>
-	</PMS2>
-	<PMS3>
-		<IPAddr>0.0.0.0</IPAddr>
-		<Port>8620</Port>
-	</PMS3>
-	<PMS4>
-		<IPAddr>0.0.0.0</IPAddr>
-		<Port>8620</Port>
-	</PMS4>
-	<PMS5>
-		<IPAddr>0.0.0.0</IPAddr>
-		<Port>8620</Port>
-	</PMS5>
-	<PMS6>
-		<IPAddr>0.0.0.0</IPAddr>
-		<Port>8620</Port>
-	</PMS6>
-	<PMS7>
-		<IPAddr>0.0.0.0</IPAddr>
-		<Port>8620</Port>
-	</PMS7>
-	<PMS8>
-		<IPAddr>0.0.0.0</IPAddr>
-		<Port>8620</Port>
-	</PMS8>
-	<PMS9>
-		<IPAddr>0.0.0.0</IPAddr>
-		<Port>8620</Port>
-	</PMS9>
-	<PMS10>
-		<IPAddr>0.0.0.0</IPAddr>
-		<Port>8620</Port>
-	</PMS10>
-	<PMS11>
-		<IPAddr>0.0.0.0</IPAddr>
-		<Port>8620</Port>
-	</PMS11>
-	<PMS12>
-		<IPAddr>0.0.0.0</IPAddr>
-		<Port>8620</Port>
-	</PMS12>
-	<PMS13>
-		<IPAddr>0.0.0.0</IPAddr>
-		<Port>8620</Port>
-	</PMS13>
-	<PMS14>
-		<IPAddr>0.0.0.0</IPAddr>
-		<Port>8620</Port>
-	</PMS14>
-	<PMS15>
-		<IPAddr>0.0.0.0</IPAddr>
-		<Port>8620</Port>
-	</PMS15>
-	<PMS16>
-		<IPAddr>0.0.0.0</IPAddr>
-		<Port>8620</Port>
-	</PMS16>
-	<PMS17>
-		<IPAddr>0.0.0.0</IPAddr>
-		<Port>8620</Port>
-	</PMS17>
-	<PMS18>
-		<IPAddr>0.0.0.0</IPAddr>
-		<Port>8620</Port>
-	</PMS18>
-	<PMS19>
-		<IPAddr>0.0.0.0</IPAddr>
-		<Port>8620</Port>
-	</PMS19>
-	<PMS20>
-		<IPAddr>0.0.0.0</IPAddr>
-		<Port>8620</Port>
-	</PMS20>
-	<PMS21>
-		<IPAddr>0.0.0.0</IPAddr>
-		<Port>8620</Port>
-	</PMS21>
-	<PMS22>
-		<IPAddr>0.0.0.0</IPAddr>
-		<Port>8620</Port>
-	</PMS22>
-	<PMS23>
-		<IPAddr>0.0.0.0</IPAddr>
-		<Port>8620</Port>
-	</PMS23>
-	<PMS24>
-		<IPAddr>0.0.0.0</IPAddr>
-		<Port>8620</Port>
-	</PMS24>
-	<PMS25>
-		<IPAddr>0.0.0.0</IPAddr>
-		<Port>8620</Port>
-	</PMS25>
-	<PMS26>
-		<IPAddr>0.0.0.0</IPAddr>
-		<Port>8620</Port>
-	</PMS26>
-	<PMS27>
-		<IPAddr>0.0.0.0</IPAddr>
-		<Port>8620</Port>
-	</PMS27>
-	<PMS28>
-		<IPAddr>0.0.0.0</IPAddr>
-		<Port>8620</Port>
-	</PMS28>
-	<PMS29>
-		<IPAddr>0.0.0.0</IPAddr>
-		<Port>8620</Port>
-	</PMS29>
-	<PMS30>
-		<IPAddr>0.0.0.0</IPAddr>
-		<Port>8620</Port>
-	</PMS30>
-	<PMS31>
-		<IPAddr>0.0.0.0</IPAddr>
-		<Port>8620</Port>
-	</PMS31>
-	<PMS32>
-		<IPAddr>0.0.0.0</IPAddr>
-		<Port>8620</Port>
-	</PMS32>
-	<SystemConfig>
-		<SystemLang>C</SystemLang>
-		<SystemName>columnstore-1</SystemName>
-		<ParentOAMModuleName>pm1</ParentOAMModuleName>
-		<StandbyOAMModuleName>unassigned</StandbyOAMModuleName>
-		<PrimaryUMModuleName>unassigned</PrimaryUMModuleName>
-		<ModuleHeartbeatPeriod>1</ModuleHeartbeatPeriod>
-		<ModuleHeartbeatCount>3</ModuleHeartbeatCount>
-		<ModuleProcMonWaitCount>6</ModuleProcMonWaitCount>	// 2.5 minutes
-		<!-- Disabled
-		<ProcessHeartbeatPeriod>-1</ProcessHeartbeatPeriod>
-		-->
-		<!-- Warning: Do not change this value once database is built -->
-		<DBRootCount>1</DBRootCount>
-		<DBRoot1>$INSTALLDIR/data1</DBRoot1>
-		<DBRMRoot>$INSTALLDIR/data1/systemFiles/dbrm/BRM_saves</DBRMRoot>
-		<TableLockSaveFile>$INSTALLDIR/data1/systemFiles/dbrm/tablelocks</TableLockSaveFile>
-		<DBRMTimeOut>20</DBRMTimeOut> <!-- in seconds -->
-		<DBRMSnapshotInterval>100000</DBRMSnapshotInterval>
-		<ExternalCriticalThreshold>90</ExternalCriticalThreshold>
-		<ExternalMajorThreshold>80</ExternalMajorThreshold>
-		<ExternalMinorThreshold>70</ExternalMinorThreshold>
-		<TempDiskPath>/tmp</TempDiskPath>
-		<WorkingDir>/tmp</WorkingDir>
-		<TransactionArchivePeriod>10</TransactionArchivePeriod>
-		<NMSIPAddress>0.0.0.0</NMSIPAddress>
-		<TempSaveSize>128M</TempSaveSize> <!-- default SWSDL max element save size -->
-		<WaitPeriod>10</WaitPeriod> <!-- in seconds -->
-		<TempFileDir>/tmp/columnstore_tmp_files</TempFileDir>
-		<CalpontHome>$INSTALLDIR</CalpontHome>
-		<ProcessRestartCount>10</ProcessRestartCount>
-		<ProcessRestartPeriod>120</ProcessRestartPeriod>
-		<SwapAction>restartSystem</SwapAction>	<!-- OAM command (or 'none') to run when swap space exceeds Major Threshold -->
-		<ActivePmFailoverDisabled>n</ActivePmFailoverDisabled>
-		<MemoryCheckPercent>95</MemoryCheckPercent> <!-- Max real memory to limit growth of buffers to -->
-		<DataFileLog>OFF</DataFileLog>
-		<!-- enable if you want to limit how much memory may be used for hdfs read/write memory buffers.
- 		<hdfsRdwrBufferMaxSize>8G</hdfsRdwrBufferMaxSize>
-		-->
- 		<hdfsRdwrScratch>/tmp/rdwrscratch</hdfsRdwrScratch> <!-- Do not set to an hdfs file path -->
-	</SystemConfig>
-	<SystemModuleConfig>
-		<ModuleType1>dm</ModuleType1>
-		<ModuleDesc1>Director Module</ModuleDesc1>
-		<RunType1>SIMPLEX</RunType1>
-		<ModuleCount1>0</ModuleCount1>
-		<ModuleIPAddr1-1-1>0.0.0.0</ModuleIPAddr1-1-1>
-		<ModuleHostName1-1-1>unassigned</ModuleHostName1-1-1>
-		<ModuleDisableState1-1>ENABLED</ModuleDisableState1-1>
-		<ModuleCPUCriticalThreshold1>0</ModuleCPUCriticalThreshold1>
-		<ModuleCPUMajorThreshold1>0</ModuleCPUMajorThreshold1>
-		<ModuleCPUMinorThreshold1>0</ModuleCPUMinorThreshold1>
-		<ModuleCPUMinorClearThreshold1>0</ModuleCPUMinorClearThreshold1>
-		<ModuleDiskCriticalThreshold1>90</ModuleDiskCriticalThreshold1>
-		<ModuleDiskMajorThreshold1>80</ModuleDiskMajorThreshold1>
-		<ModuleDiskMinorThreshold1>70</ModuleDiskMinorThreshold1>
-		<ModuleMemCriticalThreshold1>90</ModuleMemCriticalThreshold1>
-		<ModuleMemMajorThreshold1>0</ModuleMemMajorThreshold1>
-		<ModuleMemMinorThreshold1>0</ModuleMemMinorThreshold1>
-		<ModuleSwapCriticalThreshold1>90</ModuleSwapCriticalThreshold1>
-		<ModuleSwapMajorThreshold1>80</ModuleSwapMajorThreshold1>
-		<ModuleSwapMinorThreshold1>70</ModuleSwapMinorThreshold1>
-		<ModuleDiskMonitorFileSystem1-1>/</ModuleDiskMonitorFileSystem1-1>
-		<ModuleDBRootCount1-1>unassigned</ModuleDBRootCount1-1>
-		<ModuleDBRootID1-1-1>unassigned</ModuleDBRootID1-1-1>
-		<ModuleType2>um</ModuleType2>
-		<ModuleDesc2>User Module</ModuleDesc2>
-		<RunType2>SIMPLEX</RunType2>
-		<ModuleCount2>1</ModuleCount2>
-		<ModuleIPAddr1-1-2>0.0.0.0</ModuleIPAddr1-1-2>
-		<ModuleHostName1-1-2>unassigned</ModuleHostName1-1-2>
-		<ModuleDisableState1-2>ENABLED</ModuleDisableState1-2>
-		<ModuleCPUCriticalThreshold2>0</ModuleCPUCriticalThreshold2>
-		<ModuleCPUMajorThreshold2>0</ModuleCPUMajorThreshold2>
-		<ModuleCPUMinorThreshold2>0</ModuleCPUMinorThreshold2>
-		<ModuleCPUMinorClearThreshold2>0</ModuleCPUMinorClearThreshold2>
-		<ModuleDiskCriticalThreshold2>90</ModuleDiskCriticalThreshold2>
-		<ModuleDiskMajorThreshold2>80</ModuleDiskMajorThreshold2>
-		<ModuleDiskMinorThreshold2>70</ModuleDiskMinorThreshold2>
-		<ModuleMemCriticalThreshold2>90</ModuleMemCriticalThreshold2>
-		<ModuleMemMajorThreshold2>0</ModuleMemMajorThreshold2>
-		<ModuleMemMinorThreshold2>0</ModuleMemMinorThreshold2>
-		<ModuleSwapCriticalThreshold2>90</ModuleSwapCriticalThreshold2>
-		<ModuleSwapMajorThreshold2>80</ModuleSwapMajorThreshold2>
-		<ModuleSwapMinorThreshold2>70</ModuleSwapMinorThreshold2>
-		<ModuleDiskMonitorFileSystem1-2>/</ModuleDiskMonitorFileSystem1-2>	
-		<ModuleDBRootCount1-2>unassigned</ModuleDBRootCount1-2>
-		<ModuleDBRootID1-1-2>unassigned</ModuleDBRootID1-1-2>
-		<ModuleType3>pm</ModuleType3>
-		<ModuleDesc3>Performance Module</ModuleDesc3>
-		<RunType3>SIMPLEX</RunType3>
-		<ModuleCount3>1</ModuleCount3>
-		<ModuleIPAddr1-1-3>0.0.0.0</ModuleIPAddr1-1-3>
-		<ModuleHostName1-1-3>unassigned</ModuleHostName1-1-3>
-		<ModuleDisableState1-3>ENABLED</ModuleDisableState1-3>
-		<ModuleCPUCriticalThreshold3>0</ModuleCPUCriticalThreshold3>
-		<ModuleCPUMajorThreshold3>0</ModuleCPUMajorThreshold3>
-		<ModuleCPUMinorThreshold3>0</ModuleCPUMinorThreshold3>
-		<ModuleCPUMinorClearThreshold3>0</ModuleCPUMinorClearThreshold3>
-		<ModuleDiskCriticalThreshold3>90</ModuleDiskCriticalThreshold3>
-		<ModuleDiskMajorThreshold3>80</ModuleDiskMajorThreshold3>
-		<ModuleDiskMinorThreshold3>70</ModuleDiskMinorThreshold3>
-		<ModuleMemCriticalThreshold3>90</ModuleMemCriticalThreshold3>
-		<ModuleMemMajorThreshold3>0</ModuleMemMajorThreshold3>
-		<ModuleMemMinorThreshold3>0</ModuleMemMinorThreshold3>
-		<ModuleSwapCriticalThreshold3>90</ModuleSwapCriticalThreshold3>
-		<ModuleSwapMajorThreshold3>80</ModuleSwapMajorThreshold3>
-		<ModuleSwapMinorThreshold3>70</ModuleSwapMinorThreshold3>
-		<ModuleDiskMonitorFileSystem1-3>/</ModuleDiskMonitorFileSystem1-3>
-		<ModuleDBRootCount1-3>1</ModuleDBRootCount1-3>
-		<ModuleDBRootID1-1-3>1</ModuleDBRootID1-1-3>
-	</SystemModuleConfig>
-	<SystemExtDeviceConfig>
-		<Count>0</Count>
-		<Name1>unassigned</Name1>
-		<IPAddr1>0.0.0.0</IPAddr1>
-		<DisableState1>ENABLED</DisableState1>
-	</SystemExtDeviceConfig>
-	<SessionManager>
-		<MaxConcurrentTransactions>1000</MaxConcurrentTransactions>
-		<TxnIDFile>$INSTALLDIR/data1/systemFiles/dbrm/SMTxnID</TxnIDFile>
-	</SessionManager>
-	<VersionBuffer>
-		<!-- VersionBufferFileSize must be a multiple of 8192.
-		One version buffer file will be put on each DB root. -->
-		<VersionBufferFileSize>1GB</VersionBufferFileSize>
-	</VersionBuffer>
-	<OIDManager>
-		<!-- Do not change this file after database built	 -->
-		<OIDBitmapFile>$INSTALLDIR/data1/systemFiles/dbrm/oidbitmap</OIDBitmapFile>
-		<!-- Do not change this value after database built	 -->
-		<FirstOID>3000</FirstOID>
-	</OIDManager>
-	<WriteEngine>
-		<BulkRoot>$INSTALLDIR/data/bulk</BulkRoot>
-		<BulkRollbackDir>$INSTALLDIR/data1/systemFiles/bulkRollback</BulkRollbackDir>
-		<MaxFileSystemDiskUsagePct>98</MaxFileSystemDiskUsagePct>
-		<CompressedPaddingBlocks>1</CompressedPaddingBlocks> <!-- Number of blocks used to pad compressed chunks -->
-	</WriteEngine>
-	<DBRM_Controller>
-		<NumWorkers>1</NumWorkers>
-		<IPAddr>0.0.0.0</IPAddr>
-		<Port>8616</Port>
-	</DBRM_Controller>
-	<!-- Worker Port: 8700 - 8720 is reserved to support External Modules-->
-	<DBRM_Worker1>
-		<IPAddr>0.0.0.0</IPAddr>
-		<Port>8700</Port>
-		<Module>unassigned</Module>
-	</DBRM_Worker1>
-	<DBRM_Worker2>
-		<IPAddr>0.0.0.0</IPAddr>
-		<Port>8700</Port>
-		<Module>unassigned</Module>
-	</DBRM_Worker2>
-	<DBRM_Worker3>
-		<IPAddr>0.0.0.0</IPAddr>
-		<Port>8700</Port>
-		<Module>unassigned</Module>
-	</DBRM_Worker3>
-	<DBRM_Worker4>
-		<IPAddr>0.0.0.0</IPAddr>
-		<Port>8700</Port>
-		<Module>unassigned</Module>
-	</DBRM_Worker4>
-	<DBRM_Worker5>
-		<IPAddr>0.0.0.0</IPAddr>
-		<Port>8700</Port>
-		<Module>unassigned</Module>
-	</DBRM_Worker5>
-	<DBRM_Worker6>
-		<IPAddr>0.0.0.0</IPAddr>
-		<Port>8700</Port>
-		<Module>unassigned</Module>
-	</DBRM_Worker6>
-	<DBRM_Worker7>
-		<IPAddr>0.0.0.0</IPAddr>
-		<Port>8700</Port>
-		<Module>unassigned</Module>
-	</DBRM_Worker7>
-	<DBRM_Worker8>
-		<IPAddr>0.0.0.0</IPAddr>
-		<Port>8700</Port>
-		<Module>unassigned</Module>
-	</DBRM_Worker8>
-	<DBRM_Worker9>
-		<IPAddr>0.0.0.0</IPAddr>
-		<Port>8700</Port>
-		<Module>unassigned</Module>
-	</DBRM_Worker9>
-	<DBRM_Worker10>
-		<IPAddr>0.0.0.0</IPAddr>
-		<Port>8700</Port>
-		<Module>unassigned</Module>
-	</DBRM_Worker10>
-	<DBBC>
-		<!-- The percentage of RAM to use for the disk block cache. Defaults to 70% -->
-		<!-- <NumBlocksPct>70</NumBlocksPct> -->
-		<!-- <NumThreads>16</NumThreads> --> <!-- 1-256.  Default is 16. -->
-		<NumCaches>1</NumCaches><!-- # of parallel caches to instantiate -->
-		<IOMTracing>0</IOMTracing>
-		<BRPTracing>0</BRPTracing>
-		<ReportFrequency>65536</ReportFrequency>
-		<MaxOpenFiles>2K</MaxOpenFiles>
-		<DecreaseOpenFilesCount>200</DecreaseOpenFilesCount>
-		<FDCacheTrace>0</FDCacheTrace>
-	</DBBC>
-	<Installation>
-		<SystemStartupOffline>n</SystemStartupOffline>
-		<InitialInstallFlag>n</InitialInstallFlag>
-		<SingleServerInstall>n</SingleServerInstall>
-		<ServerTypeInstall>2</ServerTypeInstall>
-		<PMwithUM>n</PMwithUM>
-		<MySQLRep>n</MySQLRep>
-		<DBRootStorageType>internal</DBRootStorageType>
-		<UMStorageType>internal</UMStorageType>
-		<EEPackageType>rpm</EEPackageType>
-		<SystemLogConfigFile>unassigned</SystemLogConfigFile>
-		<rpw>mariadb1</rpw>
-		<Cloud>unassigned</Cloud>
-		<AmazonAccessKey>unassigned</AmazonAccessKey>
-		<AmazonSecretKey>unassigned</AmazonSecretKey>
-		<AmazonRegion>us-east-1</AmazonRegion>
-		<AmazonZone>unassigned</AmazonZone>
-		<AmazonSubNetID>unassigned</AmazonSubNetID>
-		<AmazonVPCNextPrivateIP>autoassign</AmazonVPCNextPrivateIP>
-		<UMInstanceType>unassigned</UMInstanceType>
-		<UMSecurityGroup>unassigned</UMSecurityGroup>
-		<UMVolumeSize>unassigned</UMVolumeSize>
-		<UMVolumeType>standard</UMVolumeType>
-		<UMVolumeIOPS>unassigned</UMVolumeIOPS>
-		<PMInstanceType>unassigned</PMInstanceType>
-		<PMVolumeSize>unassigned</PMVolumeSize>
-		<PMVolumeType>standard</PMVolumeType>
-		<PMVolumeIOPS>unassigned</PMVolumeIOPS>
-		<AmazonPMFailover>y</AmazonPMFailover>
-		<AmazonAutoTagging>y</AmazonAutoTagging>
-		<AmazonElasticIPCount>0</AmazonElasticIPCount>
-		<AmazonElasticIPAddr1>unassigned</AmazonElasticIPAddr1>
-		<AmazonElasticModule1>unassigned</AmazonElasticModule1>
-		<GlusterConfig>n</GlusterConfig>
-		<GlusterCopies>0</GlusterCopies>
-		<GlusterStorageType>unassigned</GlusterStorageType>
-		<CoreFileFlag>n</CoreFileFlag>
-		<JavaHome>unassigned</JavaHome>
-		<JavaPath>unassigned</JavaPath>
-		<MySQLPort>3306</MySQLPort>
-		<MySQLPasswordConfig>unassigned</MySQLPasswordConfig>
-		<AmazonDeviceName>/dev/xvd</AmazonDeviceName>
-	</Installation>
-	<ExtentMap>
-		<!--
-		WARNING: these can only be changed on an empty system. Once any object has been allocated
-		it cannot be changed!. Extent size is 8M rows.
-		-->
-		<FilesPerColumnPartition>4</FilesPerColumnPartition> <!-- should be multiple of DBRootCount -->
-		<ExtentsPerSegmentFile>2</ExtentsPerSegmentFile>
-		<BRM_UID>0x0</BRM_UID>
-	</ExtentMap>
-	<HashJoin>
-		<MaxBuckets>128</MaxBuckets>
-		<MaxElems>128K</MaxElems>  <!-- 128 buckets * 128K * 16 = 256 MB -->
-		<FifoSizeLargeSide>128</FifoSizeLargeSide>
-		<PmMaxMemorySmallSide>64M</PmMaxMemorySmallSide><!-- divide by 48 to getapproximate row count -->
-		<TotalUmMemory>50%</TotalUmMemory>
-		<TotalPmUmMemory>10%</TotalPmUmMemory>
-		<CPUniqueLimit>100</CPUniqueLimit>
-		<AllowDiskBasedJoin>N</AllowDiskBasedJoin>
-		<!-- Be careful modifying TempFilePath!  On start, ExeMgr deletes
-			the entire directory and recreates it to make sure no
-			files are left behind.  -->
-		<TempFilePath>$INSTALLDIR/tmp</TempFilePath>
-		<TempFileCompression>Y</TempFileCompression>
-	</HashJoin>
-	<JobList>
-		<FlushInterval>16K</FlushInterval>
-		<FifoSize>32</FifoSize>
-		<RequestSize>1</RequestSize>  <!-- Number of extents per request, should be 
-			  less than MaxOutstandingRequests. Otherwise, default value 1 is used. -->
-		<!--  ProcessorThreadsPerScan is the number of jobs issued to process
-			  each extent.  The default is 16.  MaxOutstandingRequests is the size of 
-			  the window of work in terms of extents.  A value of 20 means there 
-			  is 20 extents worth of work for the PMs to process at any given time.
-			  ProcessorThreadsPerScan * MaxOutstandingRequests should be at least
-			  as many threads are available across all PMs.  -->
-		<!-- <ProcessorThreadsPerScan>16</ProcessorThreadsPerScan> --> 
-		<MaxOutstandingRequests>20</MaxOutstandingRequests> 
-	</JobList>
-	<TupleWSDL>
-		<MaxSize>1M</MaxSize>                   <!-- Max size in bytes per bucket -->
-		<InitialCapacity>1M</InitialCapacity>   <!-- Initial capacity per bucket -->
-		<MaxBuckets>512</MaxBuckets>            <!-- Number of buckets -->
-	</TupleWSDL>
-	<RowAggregation>
-               <!-- <RowAggrThreads>4</RowAggrThreads> --> <!-- Default value is 4 or number of cores when less than 4 -->
-		<!-- <RowAggrBuckets>32</RowAggrBuckets> --> <!-- Default value is number of cores * 4 -->
-		<!-- <RowAggrRowGroupsPerThread>20</RowAggrRowGroupsPerThread> --> <!-- Default value is 20 -->
-	</RowAggregation>
-	<CrossEngineSupport>
-		<Host>unassigned</Host>
-		<Port>3306</Port>
-		<User>unassigned</User>
-		<Password></Password>
-	</CrossEngineSupport>
-	<QueryStats>
-		<Enabled>N</Enabled>
-	</QueryStats>
-	<UserPriority>
-		<Enabled>N</Enabled>
-	</UserPriority>
-	<NetworkCompression>
-		<Enabled>Y</Enabled>
-	</NetworkCompression>
-	<QueryTele>
-		<Host>127.0.0.1</Host>
-		<Port>0</Port>
-	</QueryTele>
-</Calpont>
-
diff --git a/oam/etc/Calpont.xml.singleserver b/oam/etc/Calpont.xml.singleserver
deleted file mode 100644
index eaed66037..000000000
--- a/oam/etc/Calpont.xml.singleserver
+++ /dev/null
@@ -1,530 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- $Id: Columnstore.xml 1286 2009-03-30 22:39:41Z dcathey $ -->
-<Calpont Version="V1.0.0">
-	<ExeMgr1>
-		<IPAddr>127.0.0.1</IPAddr>
-		<Port>8601</Port>
-		<Module>pm1</Module>
-	</ExeMgr1>
-	<JobProc>
-		<IPAddr>0.0.0.0</IPAddr>
-		<Port>8602</Port>
-	</JobProc>
-	<ProcMgr>
-		<IPAddr>127.0.0.1</IPAddr>
-		<Port>8603</Port>
-	</ProcMgr>
-	<ProcStatusControl>
-		<IPAddr>127.0.0.1</IPAddr>
-		<Port>8604</Port>
-	</ProcStatusControl>
-	<ProcStatusControlStandby>
-		<IPAddr>0.0.0.0</IPAddr>
-		<Port>8605</Port>
-	</ProcStatusControlStandby>
-	<localhost_ProcessMonitor>
-		<IPAddr>127.0.0.1</IPAddr>
-		<Port>8800</Port>
-	</localhost_ProcessMonitor>
-	<dm1_ProcessMonitor>
-		<IPAddr>0.0.0.0</IPAddr>
-		<Port>8800</Port>
-	</dm1_ProcessMonitor>
-	<um1_ProcessMonitor>
-		<IPAddr>0.0.0.0</IPAddr>
-		<Port>8800</Port>
-	</um1_ProcessMonitor>
-	<pm1_ProcessMonitor>
-		<IPAddr>127.0.0.1</IPAddr>
-		<Port>8800</Port>
-	</pm1_ProcessMonitor>
-	<dm1_ServerMonitor>
-		<IPAddr>0.0.0.0</IPAddr>
-		<Port>8622</Port>
-	</dm1_ServerMonitor>
-	<um1_ServerMonitor>
-		<IPAddr>0.0.0.0</IPAddr>
-		<Port>8622</Port>
-	</um1_ServerMonitor>
-	<pm1_ServerMonitor>
-		<IPAddr>127.0.0.1</IPAddr>
-		<Port>8622</Port>
-	</pm1_ServerMonitor>
-	<pm1_WriteEngineServer>
-		<IPAddr>127.0.0.1</IPAddr>
-		<Port>8630</Port>
-	</pm1_WriteEngineServer>
-	<DDLProc>
-		<IPAddr>127.0.0.1</IPAddr>
-		<Port>8612</Port>
-	</DDLProc>
-	<DMLProc>
-		<IPAddr>127.0.0.1</IPAddr>
-		<Port>8614</Port>
-	</DMLProc>
-	<BatchInsert>
-		<RowsPerBatch>10000</RowsPerBatch>
-	</BatchInsert>
-	<PrimitiveServers>
-		<Count>1</Count>
-		<ConnectionsPerPrimProc>8</ConnectionsPerPrimProc>
-		<ProcessorThreshold>128</ProcessorThreshold>
-		<!-- <ProcessorThreads>16</ProcessorThreads> --> <!-- defaults to num cores * 2 -->
-		<ProcessorQueueSize>10K</ProcessorQueueSize> <!-- minimum of extent size 8192 -->
-		<DebugLevel>0</DebugLevel>
-		<LBID_Shift>13</LBID_Shift>
-		<ColScanBufferSizeBlocks>512</ColScanBufferSizeBlocks>
-		<ColScanReadAheadBlocks>512</ColScanReadAheadBlocks> <!-- s/b factor of extent size 8192 -->
-		<!-- <BPPCount>16</BPPCount> --> <!-- Default num cores * 2.  A cap on the number of simultaneous primitives per jobstep -->
-		<PrefetchThreshold>1</PrefetchThreshold>
-		<PTTrace>0</PTTrace>
-		<RotatingDestination>n</RotatingDestination>
-		<!-- <HighPriorityPercentage>60</HighPriorityPercentage> -->
-		<!-- <MediumPriorityPercentage>30</MediumPriorityPercentage> -->
-		<!-- <LowPriorityPercentage>10</LowPriorityPercentage> -->
-	<AggregationMemoryCheck>95</AggregationMemoryCheck>
-	</PrimitiveServers>
-	<PMS1>
-		<IPAddr>127.0.0.1</IPAddr>
-		<Port>8620</Port>
-	</PMS1>
-	<PMS2>
-		<IPAddr>127.0.0.1</IPAddr>
-		<Port>8620</Port>
-	</PMS2>
-	<PMS3>
-		<IPAddr>127.0.0.1</IPAddr>
-		<Port>8620</Port>
-	</PMS3>
-	<PMS4>
-		<IPAddr>127.0.0.1</IPAddr>
-		<Port>8620</Port>
-	</PMS4>
-	<PMS5>
-		<IPAddr>127.0.0.1</IPAddr>
-		<Port>8620</Port>
-	</PMS5>
-	<PMS6>
-		<IPAddr>127.0.0.1</IPAddr>
-		<Port>8620</Port>
-	</PMS6>
-	<PMS7>
-		<IPAddr>127.0.0.1</IPAddr>
-		<Port>8620</Port>
-	</PMS7>
-	<PMS8>
-		<IPAddr>127.0.0.1</IPAddr>
-		<Port>8620</Port>
-	</PMS8>
-	<PMS9>
-		<IPAddr>127.0.0.1</IPAddr>
-		<Port>8620</Port>
-	</PMS9>
-	<PMS10>
-		<IPAddr>127.0.0.1</IPAddr>
-		<Port>8620</Port>
-	</PMS10>
-	<PMS11>
-		<IPAddr>127.0.0.1</IPAddr>
-		<Port>8620</Port>
-	</PMS11>
-	<PMS12>
-		<IPAddr>127.0.0.1</IPAddr>
-		<Port>8620</Port>
-	</PMS12>
-	<PMS13>
-		<IPAddr>127.0.0.1</IPAddr>
-		<Port>8620</Port>
-	</PMS13>
-	<PMS14>
-		<IPAddr>127.0.0.1</IPAddr>
-		<Port>8620</Port>
-	</PMS14>
-	<PMS15>
-		<IPAddr>127.0.0.1</IPAddr>
-		<Port>8620</Port>
-	</PMS15>
-	<PMS16>
-		<IPAddr>127.0.0.1</IPAddr>
-		<Port>8620</Port>
-	</PMS16>
-	<PMS17>
-		<IPAddr>127.0.0.1</IPAddr>
-		<Port>8620</Port>
-	</PMS17>
-	<PMS18>
-		<IPAddr>127.0.0.1</IPAddr>
-		<Port>8620</Port>
-	</PMS18>
-	<PMS19>
-		<IPAddr>127.0.0.1</IPAddr>
-		<Port>8620</Port>
-	</PMS19>
-	<PMS20>
-		<IPAddr>127.0.0.1</IPAddr>
-		<Port>8620</Port>
-	</PMS20>
-	<PMS21>
-		<IPAddr>127.0.0.1</IPAddr>
-		<Port>8620</Port>
-	</PMS21>
-	<PMS22>
-		<IPAddr>127.0.0.1</IPAddr>
-		<Port>8620</Port>
-	</PMS22>
-	<PMS23>
-		<IPAddr>127.0.0.1</IPAddr>
-		<Port>8620</Port>
-	</PMS23>
-	<PMS24>
-		<IPAddr>127.0.0.1</IPAddr>
-		<Port>8620</Port>
-	</PMS24>
-	<PMS25>
-		<IPAddr>127.0.0.1</IPAddr>
-		<Port>8620</Port>
-	</PMS25>
-	<PMS26>
-		<IPAddr>127.0.0.1</IPAddr>
-		<Port>8620</Port>
-	</PMS26>
-	<PMS27>
-		<IPAddr>127.0.0.1</IPAddr>
-		<Port>8620</Port>
-	</PMS27>
-	<PMS28>
-		<IPAddr>127.0.0.1</IPAddr>
-		<Port>8620</Port>
-	</PMS28>
-	<PMS29>
-		<IPAddr>127.0.0.1</IPAddr>
-		<Port>8620</Port>
-	</PMS29>
-	<PMS30>
-		<IPAddr>127.0.0.1</IPAddr>
-		<Port>8620</Port>
-	</PMS30>
-	<PMS31>
-		<IPAddr>127.0.0.1</IPAddr>
-		<Port>8620</Port>
-	</PMS31>
-	<PMS32>
-		<IPAddr>127.0.0.1</IPAddr>
-		<Port>8620</Port>
-	</PMS32>
-	<SystemConfig>
-		<SystemLang>C</SystemLang>
-		<SystemName>columnstore-1</SystemName>
-		<ParentOAMModuleName>pm1</ParentOAMModuleName>
-		<StandbyOAMModuleName>unassigned</StandbyOAMModuleName>
-		<!-- Disabled
-		<ProcessHeartbeatPeriod>-1</ProcessHeartbeatPeriod>
-		-->
-		<!-- Warning: Do not change this value once database is built -->
-		<DBRootCount>1</DBRootCount>
-		<DBRoot1>$INSTALLDIR/data1</DBRoot1>
-		<DBRMRoot>$INSTALLDIR/data1/systemFiles/dbrm/BRM_saves</DBRMRoot>
-		<TableLockSaveFile>$INSTALLDIR/data1/systemFiles/dbrm/tablelocks</TableLockSaveFile>
-		<DBRMTimeOut>20</DBRMTimeOut> <!-- in seconds -->
-		<DBRMSnapshotInterval>100000</DBRMSnapshotInterval>
-		<ExternalCriticalThreshold>90</ExternalCriticalThreshold>
-		<ExternalMajorThreshold>80</ExternalMajorThreshold>
-		<ExternalMinorThreshold>70</ExternalMinorThreshold>
-		<TempDiskPath>/tmp</TempDiskPath>
-		<WorkingDir>/tmp</WorkingDir>
-		<TransactionArchivePeriod>10</TransactionArchivePeriod>
-		<NMSIPAddress>0.0.0.0</NMSIPAddress>
-		<TempSaveSize>128M</TempSaveSize> <!-- default SWSDL max element save size -->
-		<WaitPeriod>10</WaitPeriod> <!-- in seconds -->
-		<TempFileDir>/tmp/columnstore_tmp_files</TempFileDir>
-		<CalpontHome>$INSTALLDIR</CalpontHome>
-		<ModuleHeartbeatPeriod>10</ModuleHeartbeatPeriod>
-		<ModuleHeartbeatCount>3</ModuleHeartbeatCount>
-		<ProcessRestartCount>10</ProcessRestartCount>
-		<ProcessRestartPeriod>120</ProcessRestartPeriod>
-		<SwapAction>restartSystem</SwapAction>	<!-- OAM command (or 'none') to run when swap space exceeds Major Threshold -->
-		<ActivePmFailoverDisabled>n</ActivePmFailoverDisabled>
-                <MemoryCheckPercent>95</MemoryCheckPercent> <!-- Max real memory to limit growth of buffers to -->
-		<DataFileLog>OFF</DataFileLog>
-		<!-- enable if you want to limit how much memory may be used for hdfs read/write memory buffers.
- 		<hdfsRdwrBufferMaxSize>8G</hdfsRdwrBufferMaxSize>
-		-->
- 		<hdfsRdwrScratch>/tmp/rdwrscratch</hdfsRdwrScratch> <!-- Do not set to an hdfs file path -->
-	</SystemConfig>
-	<SystemModuleConfig>
-		<ModuleType1>dm</ModuleType1>
-		<ModuleDesc1>Director Module</ModuleDesc1>
-		<RunType1>SIMPLEX</RunType1>
-		<ModuleCount1>0</ModuleCount1>
-		<ModuleIPAddr1-1-1>0.0.0.0</ModuleIPAddr1-1-1>
-		<ModuleHostName1-1-1>unassigned</ModuleHostName1-1-1>
-		<ModuleDisableState1-1>ENABLED</ModuleDisableState1-1>
-		<ModuleCPUCriticalThreshold1>0</ModuleCPUCriticalThreshold1>
-		<ModuleCPUMajorThreshold1>0</ModuleCPUMajorThreshold1>
-		<ModuleCPUMinorThreshold1>0</ModuleCPUMinorThreshold1>
-		<ModuleCPUMinorClearThreshold1>0</ModuleCPUMinorClearThreshold1>
-		<ModuleDiskCriticalThreshold1>90</ModuleDiskCriticalThreshold1>
-		<ModuleDiskMajorThreshold1>80</ModuleDiskMajorThreshold1>
-		<ModuleDiskMinorThreshold1>70</ModuleDiskMinorThreshold1>
-		<ModuleMemCriticalThreshold1>90</ModuleMemCriticalThreshold1>
-		<ModuleMemMajorThreshold1>0</ModuleMemMajorThreshold1>
-		<ModuleMemMinorThreshold1>0</ModuleMemMinorThreshold1>
-		<ModuleSwapCriticalThreshold1>90</ModuleSwapCriticalThreshold1>
-		<ModuleSwapMajorThreshold1>80</ModuleSwapMajorThreshold1>
-		<ModuleSwapMinorThreshold1>70</ModuleSwapMinorThreshold1>
-		<ModuleDiskMonitorFileSystem1-1>/</ModuleDiskMonitorFileSystem1-1>
-		<ModuleDBRootCount1-1>unassigned</ModuleDBRootCount1-1>
-		<ModuleDBRootID1-1-1>unassigned</ModuleDBRootID1-1-1>
-		<ModuleType2>um</ModuleType2>
-		<ModuleDesc2>User Module</ModuleDesc2>
-		<RunType2>SIMPLEX</RunType2>
-		<ModuleCount2>0</ModuleCount2>
-		<ModuleIPAddr1-1-2>0.0.0.0</ModuleIPAddr1-1-2>
-		<ModuleHostName1-1-2>unassigned</ModuleHostName1-1-2>
-		<ModuleDisableState1-2>ENABLED</ModuleDisableState1-2>
-		<ModuleCPUCriticalThreshold2>0</ModuleCPUCriticalThreshold2>
-		<ModuleCPUMajorThreshold2>0</ModuleCPUMajorThreshold2>
-		<ModuleCPUMinorThreshold2>0</ModuleCPUMinorThreshold2>
-		<ModuleCPUMinorClearThreshold2>0</ModuleCPUMinorClearThreshold2>
-		<ModuleDiskCriticalThreshold2>90</ModuleDiskCriticalThreshold2>
-		<ModuleDiskMajorThreshold2>80</ModuleDiskMajorThreshold2>
-		<ModuleDiskMinorThreshold2>70</ModuleDiskMinorThreshold2>
-		<ModuleMemCriticalThreshold2>90</ModuleMemCriticalThreshold2>
-		<ModuleMemMajorThreshold2>0</ModuleMemMajorThreshold2>
-		<ModuleMemMinorThreshold2>0</ModuleMemMinorThreshold2>
-		<ModuleSwapCriticalThreshold2>90</ModuleSwapCriticalThreshold2>
-		<ModuleSwapMajorThreshold2>80</ModuleSwapMajorThreshold2>
-		<ModuleSwapMinorThreshold2>70</ModuleSwapMinorThreshold2>
-		<ModuleDiskMonitorFileSystem1-2>/</ModuleDiskMonitorFileSystem1-2>	
-		<ModuleDBRootCount1-2>unassigned</ModuleDBRootCount1-2>
-		<ModuleDBRootID1-1-2>unassigned</ModuleDBRootID1-1-2>
-		<ModuleType3>pm</ModuleType3>
-		<ModuleDesc3>Performance Module</ModuleDesc3>
-		<RunType3>SIMPLEX</RunType3>
-		<ModuleCount3>1</ModuleCount3>
-		<ModuleIPAddr1-1-3>127.0.0.1</ModuleIPAddr1-1-3>
-		<ModuleHostName1-1-3>localhost</ModuleHostName1-1-3>
-		<ModuleDisableState1-3>ENABLED</ModuleDisableState1-3>
-		<ModuleCPUCriticalThreshold3>0</ModuleCPUCriticalThreshold3>
-		<ModuleCPUMajorThreshold3>0</ModuleCPUMajorThreshold3>
-		<ModuleCPUMinorThreshold3>0</ModuleCPUMinorThreshold3>
-		<ModuleCPUMinorClearThreshold3>0</ModuleCPUMinorClearThreshold3>
-		<ModuleDiskCriticalThreshold3>90</ModuleDiskCriticalThreshold3>
-		<ModuleDiskMajorThreshold3>80</ModuleDiskMajorThreshold3>
-		<ModuleDiskMinorThreshold3>70</ModuleDiskMinorThreshold3>
-		<ModuleMemCriticalThreshold3>90</ModuleMemCriticalThreshold3>
-		<ModuleMemMajorThreshold3>0</ModuleMemMajorThreshold3>
-		<ModuleMemMinorThreshold3>0</ModuleMemMinorThreshold3>
-		<ModuleSwapCriticalThreshold3>90</ModuleSwapCriticalThreshold3>
-		<ModuleSwapMajorThreshold3>80</ModuleSwapMajorThreshold3>
-		<ModuleSwapMinorThreshold3>70</ModuleSwapMinorThreshold3>
-		<ModuleDiskMonitorFileSystem1-3>/</ModuleDiskMonitorFileSystem1-3>
-		<ModuleDBRootCount1-3>1</ModuleDBRootCount1-3>
-		<ModuleDBRootID1-1-3>1</ModuleDBRootID1-1-3>
-	</SystemModuleConfig>
-	<SystemExtDeviceConfig>
-		<Count>0</Count>
-		<Name1>unassigned</Name1>
-		<IPAddr1>0.0.0.0</IPAddr1>
-		<DisableState1>ENABLED</DisableState1>
-	</SystemExtDeviceConfig>
-	<SessionManager>
-		<MaxConcurrentTransactions>1000</MaxConcurrentTransactions>
-		<SharedMemoryTmpFile>$INSTALLDIR/data1/systemFiles/dbrm/CalpontShm</SharedMemoryTmpFile>
-		<TxnIDFile>$INSTALLDIR/data1/systemFiles/dbrm/SMTxnID</TxnIDFile>
-	</SessionManager>
-	<SessionMonitor>
-		<SharedMemoryTmpFile>$INSTALLDIR/data1/systemFiles/dbrm/CalpontSessionMonitorShm</SharedMemoryTmpFile>
-		<TransactionAgeLimit>10</TransactionAgeLimit>
-	</SessionMonitor>
-	<VersionBuffer> 
-		<!-- VersionBufferFileSize must be a multiple of 8192.
-			One version buffer file will be put on each DB root. -->
-		<VersionBufferFileSize>1GB</VersionBufferFileSize> 
-	</VersionBuffer>
-	<OIDManager>
-		<!-- XXXPAT: This is located in tmp so we all have R/W access.
-		It should be relocated to $INSTALLDIR/share/oidbitmap
-		on the production machine-->
-		<!-- Do not change this file after database built	 -->
-		<OIDBitmapFile>$INSTALLDIR/data1/systemFiles/dbrm/oidbitmap</OIDBitmapFile>
-		<!-- Do not change this value after database built	 -->
-		<FirstOID>3000</FirstOID>
-	</OIDManager>
-	<WriteEngine>
-		<BulkRoot>$INSTALLDIR/data/bulk</BulkRoot>
-		<BulkRollbackDir>$INSTALLDIR/data/bulk/rollback</BulkRollbackDir>
-		<MaxFileSystemDiskUsagePct>98</MaxFileSystemDiskUsagePct>
-		<CompressedPaddingBlocks>1</CompressedPaddingBlocks> <!-- Number of blocks used to pad compressed chunks -->
-	</WriteEngine>
-	<DBRM_Controller>
-		<NumWorkers>1</NumWorkers>
-		<IPAddr>127.0.0.1</IPAddr>
-		<Port>8616</Port>
-	</DBRM_Controller>
-	<!-- Worker Port: 8700 - 8720 is reserved to support External Modules-->
-	<DBRM_Worker1>
-		<IPAddr>127.0.0.1</IPAddr>
-		<Port>8700</Port>
-		<Module>pm1</Module>
-	</DBRM_Worker1>
-	<DBRM_Worker2>
-		<IPAddr>0.0.0.0</IPAddr>
-		<Port>8700</Port>
-		<Module>unassigned</Module>
-	</DBRM_Worker2>
-	<DBRM_Worker3>
-		<IPAddr>0.0.0.0</IPAddr>
-		<Port>8700</Port>
-		<Module>unassigned</Module>
-	</DBRM_Worker3>
-	<DBRM_Worker4>
-		<IPAddr>0.0.0.0</IPAddr>
-		<Port>8700</Port>
-		<Module>unassigned</Module>
-	</DBRM_Worker4>
-	<DBRM_Worker5>
-		<IPAddr>0.0.0.0</IPAddr>
-		<Port>8700</Port>
-		<Module>unassigned</Module>
-	</DBRM_Worker5>
-	<DBRM_Worker6>
-		<IPAddr>0.0.0.0</IPAddr>
-		<Port>8700</Port>
-		<Module>unassigned</Module>
-	</DBRM_Worker6>
-	<DBRM_Worker7>
-		<IPAddr>0.0.0.0</IPAddr>
-		<Port>8700</Port>
-		<Module>unassigned</Module>
-	</DBRM_Worker7>
-	<DBRM_Worker8>
-		<IPAddr>0.0.0.0</IPAddr>
-		<Port>8700</Port>
-		<Module>unassigned</Module>
-	</DBRM_Worker8>
-	<DBRM_Worker9>
-		<IPAddr>0.0.0.0</IPAddr>
-		<Port>8700</Port>
-		<Module>unassigned</Module>
-	</DBRM_Worker9>
-	<DBRM_Worker10>
-		<IPAddr>0.0.0.0</IPAddr>
-		<Port>8700</Port>
-		<Module>unassigned</Module>
-	</DBRM_Worker10>
-	<DBBC>
-		<!-- The percentage of RAM to use for the disk block cache. Defaults to 86% -->
-		<NumBlocksPct>50</NumBlocksPct>
-		<!-- <NumThreads>16</NumThreads> --> <!-- 1-256.  Default is 16. -->
-		<NumCaches>1</NumCaches><!-- # of parallel caches to instantiate -->
-		<IOMTracing>0</IOMTracing>
-		<BRPTracing>0</BRPTracing>
-		<ReportFrequency>65536</ReportFrequency>
-		<MaxOpenFiles>2K</MaxOpenFiles>
-		<DecreaseOpenFilesCount>200</DecreaseOpenFilesCount>
-		<FDCacheTrace>0</FDCacheTrace>
-	</DBBC>
-	<Installation>
-		<SystemStartupOffline>n</SystemStartupOffline>
-		<InitialInstallFlag>y</InitialInstallFlag>
-		<SingleServerInstall>y</SingleServerInstall>
-		<ServerTypeInstall>2</ServerTypeInstall>
-		<PMwithUM>n</PMwithUM>
-		<MySQLRep>n</MySQLRep>
-		<DBRootStorageType>internal</DBRootStorageType>
-		<UMStorageType>internal</UMStorageType>
-		<SystemLogConfigFile>unassigned</SystemLogConfigFile>	
-		<rpw>unassigned</rpw>
-		<Cloud>unassigned</Cloud>
-		<EEPackageType>rpm</EEPackageType>
-		<AmazonAccessKey>unassigned</AmazonAccessKey>
-		<AmazonSecretKey>unassigned</AmazonSecretKey>
-		<AmazonRegion>us-east-1</AmazonRegion>
-		<AmazonZone>unassigned</AmazonZone>
-		<AmazonSubNetID>unassigned</AmazonSubNetID>
-		<AmazonVPCNextPrivateIP>unassigned</AmazonVPCNextPrivateIP>
-		<PMInstanceType>unassigned</PMInstanceType>
-		<UMInstanceType>unassigned</UMInstanceType>
-		<UMSecurityGroup>unassigned</UMSecurityGroup>
-		<UMVolumeSize>unassigned</UMVolumeSize>
-		<PMVolumeSize>unassigned</PMVolumeSize>
-		<AmazonPMFailover>n</AmazonPMFailover>
-		<AmazonAutoTagging>n</AmazonAutoTagging>
-		<AmazonElasticIPCount>0</AmazonElasticIPCount>
-		<AmazonElasticIPAddr1>unassigned</AmazonElasticIPAddr1>
-		<AmazonElasticModule1>unassigned</AmazonElasticModule1>
-		<CoreFileFlag>n</CoreFileFlag>
-		<JavaHome>unassigned</JavaHome>
-		<JavaPath>unassigned</JavaPath>
-		<MySQLPort>3306</MySQLPort>
-		<MySQLPasswordConfig>unassigned</MySQLPasswordConfig>
-	</Installation>
-	<ExtentMap>
-		<!--
-		WARNING: these can only be changed on an empty system. Once any object has been allocated
-		it cannot be changed!. Valid values for ExtentRows are: 64M, 8M and 1M. The default is 8M.
-		-->
-		<FilesPerColumnPartition>4</FilesPerColumnPartition> <!-- should be multiple of DBRootCount -->
-		<ExtentsPerSegmentFile>2</ExtentsPerSegmentFile>
-		<BRM_UID>0x0</BRM_UID>
-	</ExtentMap>
-	<HashJoin>
-		<MaxBuckets>128</MaxBuckets>
-		<MaxElems>128K</MaxElems>  <!-- 128 buckets * 128K * 16 = 256 MB -->
-		<FifoSizeLargeSide>128</FifoSizeLargeSide>
-		<PmMaxMemorySmallSide>64M</PmMaxMemorySmallSide><!-- divide by 48 to get element count -->
-		<TotalUmMemory>25%</TotalUmMemory>
-		<TotalPmUmMemory>10%</TotalPmUmMemory>
-		<CPUniqueLimit>100</CPUniqueLimit>
-		<AllowDiskBasedJoin>N</AllowDiskBasedJoin>
-		<!-- Be careful modifying TempFilePath!  On start, ExeMgr deletes
-			the entire directory and recreates it to make sure no
-			files are left behind.  -->
-		<TempFilePath>$INSTALLDIR/tmp</TempFilePath>
-		<TempFileCompression>Y</TempFileCompression>
-	</HashJoin>
-	<JobList>
-		<FlushInterval>16K</FlushInterval>
-		<FifoSize>32</FifoSize>
-		<RequestSize>1</RequestSize>  <!-- Number of extents per request, should be
-			  less than MaxOutstandingRequests. Otherwise, default value 1 is used. -->
-		<!--  ProcessorThreadsPerScan is the number of jobs issued to process
-			  each extent.  The default is 16.  MaxOutstandingRequests is the size of 
-			  the window of work in terms of extents.  A value of 20 means there 
-			  is 20 extents worth of work for the PMs to process at any given time.
-			  ProcessorThreadsPerScan * MaxOutstandingRequests should be at least
-			  as many threads are available across all PMs.  -->
-        <!-- <ProcessorThreadsPerScan>16</ProcessorThreadsPerScan> -->
-        <MaxOutstandingRequests>20</MaxOutstandingRequests>
-	</JobList>
-	<TupleWSDL>
-		<MaxSize>1M</MaxSize>                   <!-- Max size in bytes per bucket -->
-		<InitialCapacity>1M</InitialCapacity>   <!-- Initial capacity per bucket -->
-		<MaxBuckets>512</MaxBuckets>            <!-- Number of buckets -->
-	</TupleWSDL>
-	<RowAggregation>
-               <!-- <RowAggrThreads>4</RowAggrThreads> --> <!-- Default value is 4 or number of cores when less than 4 -->
-		<!-- <RowAggrBuckets>32</RowAggrBuckets> --> <!-- Default value is number of cores * 4 -->
-		<!-- <RowAggrRowGroupsPerThread>20</RowAggrRowGroupsPerThread> --> <!-- Default value is 20 -->
-	</RowAggregation>
-	<CrossEngineSupport>
-		<Host>unassigned</Host>
-		<Port>3306</Port>
-		<User>unassigned</User>
-		<Password></Password>
-	</CrossEngineSupport>
-	<QueryStats>
-		<Enabled>N</Enabled>
-	</QueryStats>
-	<UserPriority>
-		<Enabled>N</Enabled>
-	</UserPriority>
-	<NetworkCompression>
-		<Enabled>Y</Enabled>
-	</NetworkCompression>
-	<QueryTele>
-		<Host>127.0.0.1</Host>
-		<Port>0</Port>
-	</QueryTele>
-</Calpont>
diff --git a/oam/etc/Columnstore.xml b/oam/etc/Columnstore.xml
index 5bafb9f96..6ffd1efe7 100644
--- a/oam/etc/Columnstore.xml
+++ b/oam/etc/Columnstore.xml
@@ -249,13 +249,14 @@
 		<ExternalCriticalThreshold>90</ExternalCriticalThreshold>
 		<ExternalMajorThreshold>80</ExternalMajorThreshold>
 		<ExternalMinorThreshold>70</ExternalMinorThreshold>
-		<TempDiskPath>/tmp</TempDiskPath>
+		<!-- <TempDiskPath>/tmp</TempDiskPath>
 		<WorkingDir>/tmp</WorkingDir>
+		<TempFileDir>/tmp/columnstore_tmp_files</TempFileDir>
+		-->
 		<TransactionArchivePeriod>10</TransactionArchivePeriod>
 		<NMSIPAddress>0.0.0.0</NMSIPAddress>
 		<TempSaveSize>128M</TempSaveSize> <!-- default SWSDL max element save size -->
 		<WaitPeriod>10</WaitPeriod> <!-- in seconds -->
-		<TempFileDir>/tmp/columnstore_tmp_files</TempFileDir>
 		<CalpontHome>$INSTALLDIR</CalpontHome>
 		<ProcessRestartCount>10</ProcessRestartCount>
 		<ProcessRestartPeriod>120</ProcessRestartPeriod>
@@ -266,7 +267,9 @@
 		<!-- enable if you want to limit how much memory may be used for hdfs read/write memory buffers.
  		<hdfsRdwrBufferMaxSize>8G</hdfsRdwrBufferMaxSize>
 		-->
- 		<hdfsRdwrScratch>/tmp/rdwrscratch</hdfsRdwrScratch> <!-- Do not set to an hdfs file path -->
+ 		<hdfsRdwrScratch>/rdwrscratch</hdfsRdwrScratch> <!-- Do not set to an hdfs file path -->
+ 		<TempFileDir>/columnstore_tmp_files</TempFileDir>
+ 		<SystemTempFileDir>/tmp/columnstore_tmp_files</SystemTempFileDir>
 	</SystemConfig>
 	<SystemModuleConfig>
 		<ModuleType1>dm</ModuleType1>
@@ -445,7 +448,6 @@
 		<UMStorageType>internal</UMStorageType>
 		<EEPackageType>rpm</EEPackageType>
 		<SystemLogConfigFile>unassigned</SystemLogConfigFile>
-		<rpw>mariadb1</rpw>
 		<Cloud>unassigned</Cloud>
 		<AmazonVPCNextPrivateIP>autoassign</AmazonVPCNextPrivateIP>
 		<UMInstanceType>unassigned</UMInstanceType>
@@ -469,6 +471,8 @@
 		<MySQLPort>3306</MySQLPort>
 		<AmazonDeviceName>/dev/xvd</AmazonDeviceName>
 		<DistributedInstall>n</DistributedInstall>
+		<LockFileDirectory>/var/lock/subsys</LockFileDirectory>
+		<ProfileFile>unassigned</ProfileFile>
 	</Installation>
 	<ExtentMap>
 		<!--
@@ -490,8 +494,8 @@
 		<AllowDiskBasedJoin>N</AllowDiskBasedJoin>
 		<!-- Be careful modifying TempFilePath!  On start, ExeMgr deletes
 			the entire directory and recreates it to make sure no
-			files are left behind.  -->
-		<TempFilePath>$INSTALLDIR/tmp</TempFilePath>
+			files are left behind.
+		<TempFilePath>/tmp</TempFilePath>  -->
 		<TempFileCompression>Y</TempFileCompression>
 	</HashJoin>
 	<JobList>
diff --git a/oam/etc/Columnstore.xml.singleserver b/oam/etc/Columnstore.xml.singleserver
index 8768eb6ce..2ed98d87f 100644
--- a/oam/etc/Columnstore.xml.singleserver
+++ b/oam/etc/Columnstore.xml.singleserver
@@ -463,6 +463,7 @@
 		<JavaPath>unassigned</JavaPath>
 		<MySQLPort>3306</MySQLPort>
 		<DistributedInstall>y</DistributedInstall>
+		<LockFileDirectory>/var/lock/subsys</LockFileDirectory>
 	</Installation>
 	<ExtentMap>
 		<!--
diff --git a/oam/etc/ConsoleCmds.xml b/oam/etc/ConsoleCmds.xml
index 4bf12d36b..56a6e678f 100644
--- a/oam/etc/ConsoleCmds.xml
+++ b/oam/etc/ConsoleCmds.xml
@@ -260,7 +260,8 @@
 		<Arg3>Optional: Module-name and Parameter-name will display the Module Name Configuration parameter</Arg3>
 	</Cmd38>
 	<Cmd39>
-		<Name>AVAILABLE</Name>
+		<Name>getSystemDirectories</Name>
+		<Desc1>Get System Installation and Temporary Logging Directories</Desc1>		
 	</Cmd39>
 	<Cmd40>
 		<Name>AVAILABLE</Name>
diff --git a/oam/install_scripts/CMakeLists.txt b/oam/install_scripts/CMakeLists.txt
index d450d7f27..4f80ae0b0 100644
--- a/oam/install_scripts/CMakeLists.txt
+++ b/oam/install_scripts/CMakeLists.txt
@@ -11,7 +11,6 @@ install(PROGRAMS post-install
                 remote_scp_get.sh 
                 columnstoreAlias 
                 run.sh 
-                upgrade-columnstore.sh  
                 post-mysql-install 
                 post-mysqld-install 
                 binary_installer.sh  
diff --git a/oam/install_scripts/binary_installer.sh b/oam/install_scripts/binary_installer.sh
index 59a35dd8b..0fc104152 100644
--- a/oam/install_scripts/binary_installer.sh
+++ b/oam/install_scripts/binary_installer.sh
@@ -67,7 +67,7 @@ send_user "\n"
 
 
 send_user "Stop ColumnStore service                       "
-send "ssh -v $USERNAME@$SERVER '$INSTALLDIR/bin/columnstore stop'\n"
+send "ssh -v $USERNAME@$SERVER 'export COLUMNSTORE_INSTALL_DIR=$INSTALLDIR; $INSTALLDIR/bin/columnstore stop'\n"
 set timeout 60
 # check return
 expect {
@@ -133,7 +133,7 @@ send_user "\n"
 #
 send_user "Install MariaDB Columnstore Package on Module               "
 send_user " \n"
-send "ssh -v $USERNAME@$SERVER 'tar -C $PREFIX --exclude db -zxvf $CALPONTPKG'\n"
+send "ssh -v $USERNAME@$SERVER 'tar -C $PREFIX --exclude db -zxf $CALPONTPKG'\n"
 set timeout 360
 expect {
 	"word: " { send "$PASSWORD\n"
@@ -214,7 +214,7 @@ send_user "\n"
 
 send_user "Start ColumnStore service                       "
 send_user " \n"
-send "ssh -v $USERNAME@$SERVER '$INSTALLDIR/bin/columnstore restart'\n"
+send "ssh -v $USERNAME@$SERVER 'export COLUMNSTORE_INSTALL_DIR=$INSTALLDIR; $INSTALLDIR/bin/columnstore restart'\n"
 set timeout 120
 # check return
 expect {
diff --git a/oam/install_scripts/calpontAlias b/oam/install_scripts/calpontAlias
deleted file mode 100644
index ffc4a4756..000000000
--- a/oam/install_scripts/calpontAlias
+++ /dev/null
@@ -1,13 +0,0 @@
-# InfiniDB Alias Commands
-#
-alias mcsmysql='/usr/local/Calpont/mysql/bin/mysql --defaults-file=/usr/local/Calpont/mysql/my.cnf -u root'
-alias ma=/usr/local/Calpont/bin/mcsadmin
-alias mcsadmin=/usr/local/Calpont/bin/mcsadmin
-alias home='cd /usr/local/mariadb/columnstore'
-alias log='cd /var/log/mariadb/columnstore/'
-alias core='cd /var/log/mariadb/columnstore/corefiles'
-alias tmsg='tail -f /var/log/messages'
-alias tdebug='tail -f /var/log/mariadb/columnstore/debug.log'
-alias tinfo='tail -f /var/log/mariadb/columnstore/info.log'
-alias dbrm='cd /usr/local/Calpont/data1/systemFiles/dbrm'
-alias module='cat /usr/local/Calpont/local/module'
diff --git a/oam/install_scripts/calpontInstall.sh b/oam/install_scripts/calpontInstall.sh
deleted file mode 100755
index 0933b9009..000000000
--- a/oam/install_scripts/calpontInstall.sh
+++ /dev/null
@@ -1,167 +0,0 @@
-#!/usr/bin/expect
-#
-# $Id$
-#
-# Install Package on system
-
-set timeout 30
-set USERNAME "root"
-set RPMVERSION " "
-set PASSWORD " "
-set MYSQLPASSWORD dummymysqlpw
-set PACKAGE " "
-set CONFIGFILE " "
-set DEBUG 0
-set NODEPS "-h"
-set INSTALLDIR "/usr/local/mariadb/columnstore"
-
-spawn -noecho /bin/bash
-
-for {set i 0} {$i<[llength $argv]} {incr i} {
-	set arg($i) [lindex $argv $i]
-}
-
-set i 0
-while true {
-	if { $i == [llength $argv] } { break }
-	if { $arg($i) == "-h" } {
-		send_user "\n"
-		send_user "'calpontInstaller.sh' performs a system install of the Calpont InfiniDB Packages\n"
-		send_user "from the /root/ directory. These Packages would have already been installed\n"
-		send_user "on the local Module.\n"
-		send_user "Usage: calpontInstaller.sh -v 'infinidb-version' -p 'password' -t 'package-type' -c 'config-file'-m 'mysql-password' -d\n"
-		send_user "		infinidb-version - InfiniDB Version, i.e. 1.0.0-1\n"
-		send_user "		password    	- root password on the servers being installed'\n"
-		send_user "		package-type 	- Package Type being installed (rpm, deb, or binary)\n"
-		send_user "		config-file 	- Optional: Columnstore.xml config file with directory location, i.e. /root/Columnstore.xml\n"
-		send_user "			 	 	Default version is $INSTALLDIR/etc/Columnstore.xml.rpmsave\n"
-		send_user "		mysql-password    - MySQL password on the servers being installed'\n"		
-		send_user "		-d		- Debug flag, output verbose information\n"
-		exit 0
-	} elseif { $arg($i) == "-v" } {
-		incr i
-		set RPMVERSION $arg($i)
-	} elseif { $arg($i) == "-p" } {
-		incr i
-		set PASSWORD $arg($i)
-	} elseif { $arg($i) == "-t" } {
-		incr i
-		set PACKAGE $arg($i)
-	} elseif { $arg($i) == "-c" } {
-		incr i
-		set CONFIGFILE $arg($i)
-	} elseif { $arg($i) == "-d" } {
-		set DEBUG 1
-	} elseif { $arg($i) == "-f" } {
-		set NODEPS "--nodeps"
-	} elseif { $arg($i) == "-m" } {
-		incr i
-		set MYSQLPASSWORD $arg($i)
-	} elseif { $arg($i) == "-i" } {
-		incr i
-		set INSTALLDIR $arg($i)
-	} elseif { $arg($i) == "-u" } {
-		incr i
-		set USERNAME $arg($i)
-	}
-	incr i
-}
-
-log_user $DEBUG
-
-set timeout 2
-send "$INSTALLDIR/bin/infinidb status\n"
-expect {
-        "is running"	{ puts "InfiniDB is running, can't run calpontInstall.sh while InfiniDB is running. Exiting..\n";
-						exit 1
-					}
-}
-
-if { $CONFIGFILE == " " } {
-	set CONFIGFILE $INSTALLDIR/etc/Columnstore.xml.rpmsave
-}
-
-if { [catch { open $CONFIGFILE "r"} handle ] } {
-	puts "Calpont Config file not found: $CONFIGFILE"; exit 1
-}
-
-exec rm -f $INSTALLDIR/etc/Columnstore.xml.new  > /dev/null 2>&1
-exec mv -f $INSTALLDIR/etc/Columnstore.xml $INSTALLDIR/etc/Columnstore.xml.new  > /dev/null 2>&1
-exec /bin/cp -f $CONFIGFILE  $INSTALLDIR/etc/Columnstore.xml  > /dev/null 2>&1
-
-set timeout 2
-set INSTALL 2
-send "$INSTALLDIR/bin/getConfig DBRM_Controller NumWorkers\n"
-expect {
-        1                         { set INSTALL 1
-										set PASSWORD "dummy"
-										set RPMVERSION "rpm" }
-}
-
-
-if { $INSTALL == "2" && $PASSWORD == " "} {puts "please enter the remote server root password, enter ./calpontInstaller.sh -h for additional info"; exit 1}
-
-if { $INSTALL == "2" && $RPMVERSION == " " } {puts "please enter Package version, enter ./calpontInstaller.sh -h for additional info"; exit 1}
-
-send_user "\n"
-
-if { $INSTALL == "2" } {
-	if { $PACKAGE == "rpm" } {
-		set CALPONTPACKAGE1 /root/infinidb-libs-$RPMVERSION*.rpm
-		set CALPONTPACKAGE2 /root/infinidb-platform-$RPMVERSION*.rpm
-		set CALPONTPACKAGE3 /root/infinidb-enterprise-$RPMVERSION*.rpm
-		set CONNECTORPACKAGE1 /root/infinidb-mysql-$RPMVERSION*.rpm
-		set CONNECTORPACKAGE2 /root/infinidb-storage-engine-$RPMVERSION*.rpm
-		send_user "Installing InfiniDB Packages: $CALPONTPACKAGE1, $CALPONTPACKAGE2, $CALPONTPACKAGE3, $CONNECTORPACKAGE1, $CONNECTORPACKAGE2\n\n"
-		set EEPKG "rpm"
-	} elseif { $PACKAGE == "deb" } {
-		set CALPONTPACKAGE1 /root/infinidb-libs_$RPMVERSION*.deb
-		set CALPONTPACKAGE2 /root/infinidb-platform_$RPMVERSION*.deb
-		set CALPONTPACKAGE3 /root/infinidb-enterprise_$RPMVERSION*.deb
-		set CONNECTORPACKAGE1 /root/infinidb-mysql_$RPMVERSION*.deb
-		set CONNECTORPACKAGE2 /root/infinidb-storage-engine_$RPMVERSION*.deb
-		send_user "Installing InfiniDB Packages: $CALPONTPACKAGE1, $CALPONTPACKAGE2, $CALPONTPACKAGE3, $CONNECTORPACKAGE1, $CONNECTORPACKAGE2\n\n"
-		set EEPKG "deb"
-	} elseif { $PACKAGE == "binary" } {
-		set CALPONTPACKAGE /root/infinidb-ent-$RPMVERSION*bin.tar.gz
-		set CONNECTORPACKAGE1 "nopkg"
-		set CONNECTORPACKAGE2 "nopkg"
-		send_user "Installing InfiniDB Package: $CALPONTPACKAGE\n\n"
-		set EEPKG "binary"
-	} else {
-		puts "please enter Valid Package Type, enter ./calpontInstaller.sh -h for additional info"; exit 1
-	}
-} else {
-	set CALPONTPACKAGE1 "dummy.rpm"
-	set CALPONTPACKAGE2 "dummy.rpm"
-	set CALPONTPACKAGE3 "dummy.rpm"
-	set CONNECTORPACKAGE1 "dummy.rpm"
-	set CONNECTORPACKAGE2 "dummy.rpm"
-	set EEPKG "rpm"
-}
-
-send_user "Performing InfiniDB System Install, please wait...\n"
-
-send "$INSTALLDIR/bin/setConfig -d Installation EEPackageType $EEPKG\n" 
-expect {
-	-re {[$#] }                  {  }
-}
-
-send_user "\n"
-set timeout 600
-#
-# Run installer
-#
-send "$INSTALLDIR/bin/installer $CALPONTPACKAGE1 $CALPONTPACKAGE2 $CALPONTPACKAGE3 $CONNECTORPACKAGE1 $CONNECTORPACKAGE2 initial $PASSWORD n $NODEPS  $MYSQLPASSWORD $DEBUG\n"
-expect {
-	"InfiniDB Install Successfully Completed" 	{ }
-	"ERROR"   { send_user "FAILED: error returned from installer, execute with debug mode on to determine error\n" ; exit 1 }
-	"Enter MySQL password"   { send_user "FAILED: a MySQL password is set\n" ; exit 1 }	
-	timeout	{ send_user "FAILED: Timeout while running installer, execute with debug mode on to determine error\n" ; exit 1 }
-}
-
-send_user "\nCalpont Package System Install Completed\n\n"
-
-exit 0
-# vim:ts=4 sw=4:
-
diff --git a/oam/install_scripts/calpontLogRotate b/oam/install_scripts/calpontLogRotate
deleted file mode 100644
index 39f51f770..000000000
--- a/oam/install_scripts/calpontLogRotate
+++ /dev/null
@@ -1,35 +0,0 @@
-# 
-# Calpont Log Rotate file that gets installed in /etc/logrotate.d
-# as part of the RPM installation
-# 
-
-/var/log/mariadb/columnstore/*.log {
-    missingok
-    rotate 7
-    daily
-    dateext
-	copytruncate
-    olddir /var/log/mariadb/columnstore/archive
-}
-/var/log/mariadb/columnstore/*.log1 {
-    missingok
-    rotate 7
-    daily
-	nocreate
-	compress
-    olddir /var/log/mariadb/columnstore/archive
-}
-/usr/local/Calpont/etc/Columnstore.xml {
-    daily
-    dateext
-	copy
-    olddir /usr/local/Calpont/etc/
-}
-/usr/local/Calpont/mysql/db/*.err {
-    missingok
-    rotate 7
-    daily
-    dateext
-	copytruncate
-    olddir /usr/local/Calpont/mysql/db
-}
diff --git a/oam/install_scripts/calpontSyslog b/oam/install_scripts/calpontSyslog
deleted file mode 100644
index 2b66e256a..000000000
--- a/oam/install_scripts/calpontSyslog
+++ /dev/null
@@ -1,6 +0,0 @@
-# Calpont Database Platform Logging
-local1.=crit -/var/log/mariadb/columnstore/crit.log
-local1.=err -/var/log/mariadb/columnstore/err.log
-local1.=warning -/var/log/mariadb/columnstore/warning.log
-local1.=info -/var/log/mariadb/columnstore/info.log
-local1.=debug -/var/log/mariadb/columnstore/debug.log
diff --git a/oam/install_scripts/calpontSyslog-ng b/oam/install_scripts/calpontSyslog-ng
deleted file mode 100755
index beb9575af..000000000
--- a/oam/install_scripts/calpontSyslog-ng
+++ /dev/null
@@ -1,67 +0,0 @@
-# MariaDB Columnstore Database Platform Logging
-
-source s_columnstore {
-        # message generated by Syslog-NG
-        internal();
-        # standard Linux log source (this is the default place for the syslog()
-        # function to send logs to)
-        unix-stream("/dev/log");
-        # messages from the kernel
-        file("/proc/kmsg" log_prefix("kernel: "));
-        # use the following line if you want to receive remote UDP logging messages
-        # (this is equivalent to the "-r" syslogd flag)
-        # udp();
-};
-
-filter f_local1crit { facility(local1) and level(crit); };
-filter f_local1err  { facility(local1) and level(err); };
-filter f_local1warning { facility(local1) and level(warning); };
-filter f_local1info { facility(local1) and level(info); };
-filter f_local1debug { facility(local1) and level(debug); };
-
-destination d_crit{
-	file("/var/log/mariadb/columnstore/crit.log");
-};
-
-destination d_err{       
-	file("/var/log/mariadb/columnstore/err.log");
-};
-
-destination d_warning{       
-	file("/var/log/mariadb/columnstore/warning.log");
-};
-
-destination d_info{       
-	file("/var/log/mariadb/columnstore/info.log");
-};
-
-destination d_debug{       
-	file("/var/log/mariadb/columnstore/debug.log");
-};
-
-log{
-        source(s_columnstore);
-        filter(f_local1crit);
-        destination(d_crit);
-};
-
-log{        
-	source(s_columnstore);        
-	filter(f_local1err);        
-	destination(d_err);
-};
-log{        
-	source(s_columnstore);        
-	filter(f_local1warning);        
-	destination(d_warning);
-};
-log{        
-	source(s_columnstore);        
-	filter(f_local1info);        
-	destination(d_info);
-};
-log{        
-	source(s_columnstore);        
-	filter(f_local1debug);        
-	destination(d_debug);
-};
diff --git a/oam/install_scripts/calpontSyslog7 b/oam/install_scripts/calpontSyslog7
deleted file mode 100644
index 0ed37f975..000000000
--- a/oam/install_scripts/calpontSyslog7
+++ /dev/null
@@ -1,7 +0,0 @@
-# MariaDB Columnstore Database Platform Logging
-local1.crit -/var/log/mariadb/columnstore/crit.log
-local1.err -/var/log/mariadb/columnstore/err.log
-local1.warning -/var/log/mariadb/columnstore/warning.log
-local1.info -/var/log/mariadb/columnstore/info.log
-local1.debug -/var/log/mariadb/columnstore/debug.log
-
diff --git a/oam/install_scripts/calpontUninstall.sh b/oam/install_scripts/calpontUninstall.sh
deleted file mode 100755
index baee01463..000000000
--- a/oam/install_scripts/calpontUninstall.sh
+++ /dev/null
@@ -1,118 +0,0 @@
-#!/usr/bin/expect
-#
-# $Id$
-#
-# Uninstall Package from system
-
-set COLUMNSTORE_INSTALL_DIR "/usr/local/mariadb/columnstore"
-set env(COLUMNSTORE_INSTALL_DIR) $COLUMNSTORE_INSTALL_DIR
-
-set USERNAME $env(USER)
-set PASSWORD " "
-set DEBUG 0
-
-set INFINIDBRPM1 "infinidb-libs"
-set INFINIDBRPM2 "infinidb-platform"
-set INFINIDBRPM3 "infinidb-enterprise"
-set CONNECTORRPM1 "infinidb-mysql"
-set CONNECTORRPM2 "infinidb-storage-engine"
-
-spawn -noecho /bin/bash
-
-for {set i 0} {$i<[llength $argv]} {incr i} {
-	set arg($i) [lindex $argv $i]
-}
-
-set i 0
-while true {
-	if { $i == [llength $argv] } { break }
-	if { $arg($i) == "-h" } {
-		send_user "\n"
-		send_user "'calpontUninstall.sh' performs a system uninstall of the Calpont InfiniDB Packages.\n"
-		send_user "It will perform a shutdown of the InfiniDB software and the \n"
-		send_user "remove the Packages from all configured servers of the InfiniDB System.\n"
-		send_user "\n"
-		send_user "Usage: calpontUninstall.sh -p 'password' -d\n"
-		send_user "		password    - root password of the remote servers being un-installed'\n"
-		send_user "		-d		- Debug flag, output verbose information\n"
-		exit
-	} elseif { $arg($i) == "-p" } {
-		incr i
-		set PASSWORD $arg($i)
-	} elseif { $arg($i) == "-d" } {
-		set DEBUG 1
-	} elseif { $arg($i) == "-i" } {
-		incr i
-		set INSTALLDIR $arg($i)
-	} elseif { $arg($i) == "-u" } {
-		incr i
-		set USERNAME $arg($i)
-	}
-	incr i
-}
-
-log_user $DEBUG
-
-set timeout 2
-set INSTALL 2
-send "$COLUMNSTORE_INSTALL_DIR/bin/getConfig DBRM_Controller NumWorkers\n"
-expect {
-        1                         { set INSTALL 1 }
-}
-
-set PACKAGE "rpm"
-send "$COLUMNSTORE_INSTALL_DIR/bin/getConfig Installation EEPackageType\n"
-expect {
-        rpm                         { set PACKAGE rpm }
-        deb                         { set PACKAGE deb }
-        binary                         { set PACKAGE binary }
-}
-
-set timeout 60
-log_user $DEBUG
-if { $INSTALL == "2" && $PASSWORD == " "} {puts "please enter the remote server root password, enter ./calpontUninstall.sh -h for additional info"; exit -1}
-
-send_user "\nPerforming InfiniDB System Uninstall\n\n"
-
-# 
-# shutdownSystem
-#
-send_user "Shutdown InfiniDB System                         "
-expect -re {[$#] }
-send "$COLUMNSTORE_INSTALL_DIR/bin/mcsadmin shutdownsystem y\n"
-expect {
-	"shutdownSystem "       { send_user "DONE" }
-}
-send_user "\n"
-
-
-if { $INSTALL == "2"} {
-	set timeout 600
-	#
-	# Run installer
-	#
-	send_user "Run System Uninstaller                           "
-	send "$COLUMNSTORE_INSTALL_DIR/bin/installer $INFINIDBRPM1 $INFINIDBRPM2 $INFINIDBRPM3 $CONNECTORRPM1 $CONNECTORRPM2 uninstall $PASSWORD n --nodeps dummymysqlpw $DEBUG\n"
-	expect {
-		"uninstall request successful" 			{ send_user "DONE" }
-		"ERROR"   								{ send_user "FAILED" ; exit -1 }
-	}
-	send_user "\n"
-}
-
-if { $PACKAGE == "binary" } {
-	send "$COLUMNSTORE_INSTALL_DIR/bin/pre-uninstall\n"
-	expect {
-		-re {[$#] }                  {  }
-	}
-
-	send_user "\n"
-
-	send_user "\nCalpont Package System Uninstall Completed\n\n"
-
-	exit 0
-}
-
-send_user "\nCalpont Package System Uninstall Completed\n\n"
-
-exit 0
diff --git a/oam/install_scripts/columnstore b/oam/install_scripts/columnstore
index 15c00cea5..1ba4a2c1f 100644
--- a/oam/install_scripts/columnstore
+++ b/oam/install_scripts/columnstore
@@ -17,15 +17,31 @@
 # Short-Description: Start/stop MariaDB Columnstore DW DBMS
 ### END INIT INFO
 
+prefix=/usr/local
+
+USER=`whoami 2>/dev/null`
+
+if [ $USER != "root" ]; then
+	prefix=$HOME
+fi
+
+if [ $USER != "root" ]; then
+	if [ -f $prefix/.bash_profile ]; then		
+		profileFile=$prefix/.bash_profile
+	elif [ -f $prefix/.profile ]; then		
+		profileFile=$prefix/.profile
+	else
+		profileFile=$prefix/.bashrc
+	fi
+		
+	. $profileFile
+fi
+
 # Source function library.
 if [ -f /etc/init.d/functions ]; then
 	. /etc/init.d/functions
 fi
 
-if [ -z "$COLUMNSTORE_INSTALL_DIR" ]; then
-	test -f /etc/default/columnstore && . /etc/default/columnstore
-fi
-
 if [ -z "$COLUMNSTORE_INSTALL_DIR" ]; then
 	COLUMNSTORE_INSTALL_DIR=/usr/local/mariadb/columnstore
 fi
@@ -40,7 +56,7 @@ if [ $InstallDir != "/usr/local/mariadb/columnstore" ]; then
 fi
 
 #hadoop
-plugin=`$COLUMNSTORE_INSTALL_DIR/bin/getConfig SystemConfig DataFilePlugin`
+plugin=`$InstallDir/bin/getConfig SystemConfig DataFilePlugin`
 if [ -n "$plugin" ]; then
 	setenv=`$InstallDir/bin/getConfig SystemConfig DataFileEnvFile`
 	. $InstallDir/bin/$setenv >/dev/null 2>&1
@@ -56,18 +72,18 @@ if [ "x$has_um" = x ]; then
 	has_um=0
 fi
 
-user=`whoami 2>/dev/null`
-SUDO=" "
-if [ $user != "root" ]; then
-        SUDO="sudo "
-fi
+lockdir=`$InstallDir/bin/getConfig Installation LockFileDirectory`
+
+#get temp directory
+tmpDir=`$InstallDir/bin/getConfig SystemConfig SystemTempFileDir`
+mkdir $tmpDir >/dev/null 2>&1
 
 checkInstallSetup() {
 	InitialInstallFlag=`$InstallDir/bin/getConfig -c $InstallDir/etc/Columnstore.xml Installation InitialInstallFlag`
 	if [ $InitialInstallFlag != "y" ]; then
 		echo "Please run the postConfigure install script, check the Installation Guide"
 		echo "for additional details"
-		$SUDO rm -f /var/lock/subsys/columnstore
+		rm -f $lockdir/columnstore
 		exit 1
 	fi
 }
@@ -75,18 +91,18 @@ checkInstallSetup() {
 [ -f $InstallDir/bin/ProcMon ] || exit 0
 
 start() {
-	if [ -f /var/lock/subsys/columnstore ]; then
+	if [ -f $lockdir/columnstore ]; then
 		echo "MariaDB Columnstore Database Platform already running"
 		exit 0
 	fi
 
-	($SUDO mkdir -p /var/lock/subsys && $SUDO chmod 777 /var/lock/subsys && $SUDO touch /var/lock/subsys/columnstore) >/dev/null 2>&1
+	(mkdir -p $lockdir && touch $lockdir/columnstore) >/dev/null 2>&1
 
 	if [ -x $InstallDir/bin/columnstore.pre-start ]; then
 		$InstallDir/bin/columnstore.pre-start
 		if [ $? -ne 0 ]; then
 			echo "Error running MariaDB Columnstore pre-start script, not starting MariaDB Columnstore"
-			$SUDO rm -f /var/lock/subsys/columnstore
+			rm -f $lockdir/columnstore
 			exit 1
 		fi
 	fi
@@ -94,30 +110,29 @@ start() {
 
 	CoreFileFlag=`$InstallDir/bin/getConfig -c $InstallDir/etc/Columnstore.xml Installation CoreFileFlag`
 	if [ $CoreFileFlag = "y" ]; then
-
-		#columnstore core files
+    #columnstore core files
 		ulimit -c unlimited  > /dev/null 2>&1
-		$SUDO sysctl -q -w kernel.core_uses_pid=1  > /dev/null 2>&1
-		$SUDO sysctl -q -w kernel.core_pattern=/var/log/mariadb/columnstore/corefiles/core.%e.%p  > /dev/null 2>&1
+		sysctl -q -w kernel.core_uses_pid=1  > /dev/null 2>&1
+		sysctl -q -w kernel.core_pattern=/var/log/mariadb/columnstore/corefiles/core.%e.%p  > /dev/null 2>&1
+
 	fi
 
 	RETVAL=0
 	echo "Starting MariaDB Columnstore Database Platform"
-	$SUDO rm -f /tmp/StopColumnstore
-	exec $InstallDir/bin/run.sh $InstallDir/bin/ProcMon  > /dev/null 2>&1 &
+	rm -f ${tmpDir}/StopColumnstore
+	exec $InstallDir/bin/run.sh -l ${tmpDir} $InstallDir/bin/ProcMon  > /dev/null 2>&1 &
 
 	return $RETVAL
 }	
 stop() {
 	echo "Shutting down MariaDB Columnstore Database Platform"
-	$SUDO touch /tmp/StopColumnstore
-	$SUDO pkill ProcMon
-	$SUDO pkill ProcMgr
-	sleep 1
+	touch ${tmpDir}/StopColumnstore
+	pkill ProcMon
+	pkill ProcMgr
 	$InstallDir/bin/clearShm
 	RETVAL=$?
-	$SUDO rm -f /var/lock/subsys/columnstore
-	$SUDO fuser -k 8604/tcp > /dev/null 2>&1
+	rm -f $lockdir/columnstore
+	fuser -k 8604/tcp > /dev/null 2>&1
 	test -f $InstallDir/mysql/mysql-Columnstore || return $RETVAL
 	$InstallDir/mysql/mysql-Columnstore stop > /dev/null 2>&1
 	if [ -x $InstallDir/bin/columnstore.post-stop ]; then
@@ -132,7 +147,7 @@ restart() {
 status() {
 	isrunning=0
 	if [ $EUID -eq 0 ]; then
-		if [ -f /var/lock/subsys/columnstore ]; then
+		if [ -f $lockdir/columnstore ]; then
 			isrunning=1
 		fi
 	else
@@ -160,7 +175,7 @@ restart)
 	restart
 	;;
 condrestart)
-	[ -f /var/lock/subsys/columnstore ] && restart || :
+	[ -f $lockdir/columnstore ] && restart || :
 	;;
 status)
 	status
diff --git a/oam/install_scripts/configReport.sh b/oam/install_scripts/configReport.sh
deleted file mode 100755
index 975ea4797..000000000
--- a/oam/install_scripts/configReport.sh
+++ /dev/null
@@ -1,82 +0,0 @@
-#!/bin/bash
-#
-# $Id: hardwareReport.sh 421 2007-04-05 15:46:55Z dhill $
-#
-if [ $1 ] ; then
-        MODULE=$1
-else
-        MODULE="pm1"
-fi
-
-if [ $2 ] ; then
-        INSTALLDIR=$2
-else
-        INSTALLDIR="/usr/local/mariadb/columnstore"
-fi
-
-USER=`whoami 2>/dev/null`
-
-if [ $USER = "root" ]; then
-	SUDO=" "
-else
-	SUDO="sudo"
-fi
-
-$SUDO rm -f /tmp/${MODULE}_configReport.txt
-
-{
-echo " "
-echo "******************** Configuration/Status Report for ${MODULE} ********************"
-echo " "
-
-systemctl=`which systemctl 2>/dev/null`
-if [ -n "$systemctl" ]; then
-        echo "-- systemctl configuration --"
-        echo " "
-        echo "################# systemctl list-unit-files --type=service | grep columnstore #################"
-        echo " "
-        $SUDO systemctl list-unit-files --type=service | grep columnstore 2>/dev/null
-else
-  chkconfig=`which chkconfig 2>/dev/null`
-  if [ -n "$chkconfig" ]; then
-	echo "-- chkconfig configuration --"
-	echo " "
-	echo "################# chkconfig --list | grep columnstore #################"
-	echo " "
-	$SUDO chkconfig --list | grep columnstore 2>/dev/null
-  else
-    updaterc=`which update-rc.d 2>/dev/null`
-    if [ -n "$updaterc" ]; then
-	echo "-- services configuration --"
-	echo " "
-	echo "################# service --status-all | grep columnstore #################"
-	echo " "
-	$SUDO service --status-all | grep columnstore 2>/dev/null
-   fi
- fi
-fi
-
-echo " "
-echo "-- fstab Configuration --"
-echo " "
-echo "################# cat /etc/fstab #################"
-echo " "
-$SUDO cat /etc/fstab 2>/dev/null
-
-echo " "
-echo "-- Server Processes --"
-echo " "
-echo "################# ps axu #################"
-echo " "
-$SUDO ps axu
-
-echo " "
-echo "-- Server Processes with resource usage --"
-echo " "
-echo "################# top -b -n 1 #################"
-echo " "
-$SUDO top -b -n 1
-
-} > /tmp/${MODULE}_configReport.txt
-
-exit 0
diff --git a/oam/install_scripts/disable-rep-columnstore.sh b/oam/install_scripts/disable-rep-columnstore.sh
index 1c730da4c..c93f59f90 100644
--- a/oam/install_scripts/disable-rep-columnstore.sh
+++ b/oam/install_scripts/disable-rep-columnstore.sh
@@ -8,13 +8,13 @@
 
 # check log for error
 checkForError() {
-	grep ERROR /tmp/disable-rep-status.log > /tmp/error.check
-	if [ `cat /tmp/error.check | wc -c` -ne 0 ]; then
-		echo "ERROR: check log file: /tmp/disable-rep-status.log"
-		rm -f /tmp/error.check
+	grep ERROR ${tmpdir}/disable-rep-status.log > ${tmpdir}/error.check
+	if [ `cat ${tmpdir}/error.check | wc -c` -ne 0 ]; then
+		echo "ERROR: check log file:${tmpdir}/disable-rep-status.log"
+		rm -f ${tmpdir}/error.check
 		exit 1
 	fi
-	rm -f /tmp/error.check
+	rm -f ${tmpdir}/error.check
 }
 
 prefix=/usr/local
@@ -30,42 +30,44 @@ for arg in "$@"; do
 	elif [ `expr -- "$arg" : '--installdir='` -eq 13 ]; then
 		installdir="`echo $arg | awk -F= '{print $2}'`"
 		prefix=`dirname $installdir`
+	elif [ $(expr -- "$arg" : '--tmpdir=') -eq 9 ]; then
+		tmpdir="$(echo $arg | awk -F= '{print $2}')"
 	fi
 done
 
 test -f $installdir/post/functions && . $installdir/post/functions
 
->/tmp/disable-rep-status.log
+>${tmpdir}/disable-rep-status.log
 
 #
 # Run stop slave command
 #
-echo "Run stop slave command" >>/tmp/disable-rep-status.log
-cat >/tmp/idb_disable-rep.sql <<EOD
+echo "Run stop slave command" >>${tmpdir}/disable-rep-status.log
+cat >${tmpdir}/idb_disable-rep.sql <<EOD
 stop slave;
 EOD
 
-cat /tmp/idb_disable-rep.sql >>/tmp/disable-rep-status.log
+cat ${tmpdir}/idb_disable-rep.sql >>${tmpdir}/disable-rep-status.log
 $installdir/mysql/bin/mysql \
 	--defaults-extra-file=$installdir/mysql/my.cnf \
 	--user=root $pwprompt \
-	calpontsys </tmp/idb_disable-rep.sql >>/tmp/disable-rep-status.log 2>&1
+	calpontsys <${tmpdir}/idb_disable-rep.sql >>${tmpdir}/disable-rep-status.log 2>&1
 
 checkForError
 
 #
 # Run reset slave command
 #
-echo "Run reset slave command" >>/tmp/disable-rep-status.log
-cat >/tmp/idb_disable-rep.sql <<EOD
+echo "Run reset slave command" >>${tmpdir}/disable-rep-status.log
+cat >${tmpdir}/idb_disable-rep.sql <<EOD
 reset slave;
 EOD
 
-cat /tmp/idb_disable-rep.sql >>/tmp/disable-rep-status.log
+cat ${tmpdir}/idb_disable-rep.sql >>${tmpdir}/disable-rep-status.log
 $installdir/mysql/bin/mysql \
 	--defaults-extra-file=$installdir/mysql/my.cnf \
 	--user=root $pwprompt \
-	calpontsys </tmp/idb_disable-rep.sql >>/tmp/disable-rep-status.log 2>&1
+	calpontsys <${tmpdir}/idb_disable-rep.sql >>${tmpdir}/disable-rep-status.log 2>&1
 
 checkForError
 
diff --git a/oam/install_scripts/disable-rep-infinidb.sh b/oam/install_scripts/disable-rep-infinidb.sh
deleted file mode 100644
index 5aacc82a2..000000000
--- a/oam/install_scripts/disable-rep-infinidb.sh
+++ /dev/null
@@ -1,74 +0,0 @@
-#!/bin/bash
-#
-# $Id$
-#
-# generic InfiniDB Disable Replication script.
-#
-# Notes: This script gets run by ProcMon:
-
-# check log for error
-checkForError() {
-	grep ERROR /tmp/disable-rep-status.log > /tmp/error.check
-	if [ `cat /tmp/error.check | wc -c` -ne 0 ]; then
-		echo "ERROR: check log file: /tmp/disable-rep-status.log"
-		rm -f /tmp/error.check
-		exit 1
-	fi
-	rm -f /tmp/error.check
-}
-
-prefix=/usr/local
-installdir=$prefix/mariadb/columnstore
-pwprompt=
-for arg in "$@"; do
-	if [ `expr -- "$arg" : '--prefix='` -eq 9 ]; then
-		prefix="`echo $arg | awk -F= '{print $2}'`"
-		installdir=$prefix/mariadb/columnstore
-	elif [ `expr -- "$arg" : '--password='` -eq 11 ]; then
-		password="`echo $arg | awk -F= '{print $2}'`"
-		pwprompt="--password=$password"
-	elif [ `expr -- "$arg" : '--installdir='` -eq 13 ]; then
-		installdir="`echo $arg | awk -F= '{print $2}'`"
-		prefix=`dirname $installdir`
-	fi
-done
-
-test -f $installdir/post/functions && . $installdir/post/functions
-
->/tmp/disable-rep-status.log
-
-#
-# Run stop slave command
-#
-echo "Run stop slave command" >>/tmp/disable-rep-status.log
-cat >/tmp/idb_disable-rep.sql <<EOD
-stop slave;
-EOD
-
-cat /tmp/idb_disable-rep.sql >>/tmp/disable-rep-status.log
-$installdir/mysql/bin/mysql \
-	--defaults-extra-file=$installdir/mysql/my.cnf \
-	--user=root $pwprompt \
-	calpontsys </tmp/idb_disable-rep.sql >>/tmp/disable-rep-status.log
-
-checkForError
-
-#
-# Run reset slave command
-#
-echo "Run start slave command" >>/tmp/disable-rep-status.log
-cat >/tmp/idb_disable-rep.sql <<EOD
-reset slave;
-EOD
-
-cat /tmp/idb_disable-rep.sql >>/tmp/disable-rep-status.log
-$installdir/mysql/bin/mysql \
-	--defaults-extra-file=$installdir/mysql/my.cnf \
-	--user=root $pwprompt \
-	calpontsys </tmp/idb_disable-rep.sql >>/tmp/disable-rep-status.log
-
-checkForError
-
-#alls good, 'OK' for success
-echo "OK"
-exit 0
diff --git a/oam/install_scripts/infinidb b/oam/install_scripts/infinidb
deleted file mode 100644
index fb1f952e3..000000000
--- a/oam/install_scripts/infinidb
+++ /dev/null
@@ -1,178 +0,0 @@
-#!/bin/bash
-#
-# $Id: infinidb 3704 2013-08-07 03:33:20Z bwilkinson $
-#
-# infinidb        Starts Calpont InfiniDB database platform
-#
-#
-# chkconfig: 2345 99 99
-# description: Calpont InfiniDB is a database platform that utilizes Mysql
-#
-### BEGIN INIT INFO
-# Provides:          infinidb
-# Required-Start:    $local_fs $remote_fs $network $syslog $all
-# Required-Stop:     $local_fs $remote_fs $network $syslog
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: Start/stop InfiniDB DW DBMS
-### END INIT INFO
-
-# Source function library.
-if [ -f /etc/init.d/functions ]; then
-	. /etc/init.d/functions
-fi
-
-if [ -z "$COLUMNSTORE_INSTALL_DIR" ]; then
-	test -f /etc/default/infinidb && . /etc/default/infinidb
-fi
-
-if [ -z "$COLUMNSTORE_INSTALL_DIR" ]; then
-	COLUMNSTORE_INSTALL_DIR=/usr/local/Calpont
-fi
-
-export COLUMNSTORE_INSTALL_DIR=$COLUMNSTORE_INSTALL_DIR
-
-InstallDir=$COLUMNSTORE_INSTALL_DIR
-
-if [ $InstallDir != "/usr/local/Calpont" ]; then
-	export PATH=$InstallDir/bin:$InstallDir/mysql/bin:/bin:/usr/bin
-	export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$InstallDir/lib:$InstallDir/mysql/lib/mysql
-fi
-
-#hadoop
-plugin=`$COLUMNSTORE_INSTALL_DIR/bin/getConfig SystemConfig DataFilePlugin`
-if [ -n "$plugin" ]; then
-	setenv=`$InstallDir/bin/getConfig SystemConfig DataFileEnvFile`
-	. $InstallDir/bin/$setenv >/dev/null 2>&1
-fi
-
-test -f $InstallDir/post/functions && . $InstallDir/post/functions
-
-mt=`module_type`
-mid=`module_id`
-
-has_um=`$InstallDir/bin/getConfig SystemModuleConfig ModuleCount2`
-if [ "x$has_um" = x ]; then
-	has_um=0
-fi
-
-user=$USER
-if [ -z "$user" ]; then
-        user=root
-fi
-
-checkInstallSetup() {
-	InitialInstallFlag=`$InstallDir/bin/getConfig -c $InstallDir/etc/Columnstore.xml Installation InitialInstallFlag`
-	if [ $InitialInstallFlag != "y" ]; then
-		echo "Please run the postConfigure install script, check the Installation Guide"
-		echo "for additional details"
-		rm -f /var/lock/subsys/infinidb
-		exit 1
-	fi
-}
-
-[ -f $InstallDir/bin/ProcMon ] || exit 0
-
-start() {
-	if [ -f /var/lock/subsys/infinidb ]; then
-		echo "InfiniDB Database Platform already running"
-		exit 0
-	fi
-
-	(mkdir -p /var/lock/subsys && touch /var/lock/subsys/infinidb) >/dev/null 2>&1
-
-	if [ -x $InstallDir/bin/infinidb.pre-start ]; then
-		$InstallDir/bin/infinidb.pre-start
-		if [ $? -ne 0 ]; then
-			echo "Error running InfiniDB pre-start script, not starting InfiniDB"
-			rm -f /var/lock/subsys/infinidb
-			exit 1
-		fi
-	fi
-	checkInstallSetup
-
-	CoreFileFlag=`$InstallDir/bin/getConfig -c $InstallDir/etc/Columnstore.xml Installation CoreFileFlag`
-	if [ $CoreFileFlag = "y" ]; then
-		SUDO=
-		if [ "$user" != "root" ]; then 
-			SUDO="sudo"
-		fi
-
-		#infinidb core files
-		$SUDO ulimit -c unlimited  > /dev/null 2>&1
-		$SUDO sysctl -q -w kernel.core_uses_pid=1  > /dev/null 2>&1
-		$SUDO sysctl -q -w kernel.core_pattern=/var/log/mariadb/columnstore/corefiles/core.%e.%p  > /dev/null 2>&1
-	fi
-
-	RETVAL=0
-	echo "Starting InfiniDB Database Platform"
-	rm -f /tmp/StopCalpont
-	exec $InstallDir/bin/run.sh $InstallDir/bin/ProcMon  > /dev/null 2>&1 &
-
-	return $RETVAL
-}	
-stop() {
-	echo "Shutting down InfiniDB Database Platform"
-	touch /tmp/StopCalpont
-	pkill -9 ProcMon
-	pkill -9 ProcMgr
-	pkill -9 snmptrapd
-	sleep 1
-	$InstallDir/bin/clearShm
-	RETVAL=$?
-	rm -f /var/lock/subsys/infinidb
-	fuser -k 8604/tcp > /dev/null 2>&1
-	test -f $InstallDir/mysql/mysql-Columnstore || return $RETVAL
-	$InstallDir/mysql/mysql-Columnstore stop > /dev/null 2>&1
-	if [ -x $InstallDir/bin/infinidb.post-stop ]; then
-		$InstallDir/bin/infinidb.post-stop
-	fi
-	return $RETVAL
-}
-restart() {
-	stop
-	start
-}
-status() {
-	isrunning=0
-	if [ $EUID -eq 0 ]; then
-		if [ -f /var/lock/subsys/infinidb ]; then
-			isrunning=1
-		fi
-	else
-		pgrep ProcMon >/dev/null 2>&1
-		if [ $? -eq 0 ]; then
-			isrunning=1
-		fi
-	fi
-	if [ $isrunning -ne 0 ]; then
-		echo "InfiniDB is running"
-	else
-		echo "InfiniDB is not running"
-		exit 3
-	fi
-}
-
-case "$1" in
-start)
-	start
-	;;
-stop)
-	stop
-	;;
-restart)
-	restart
-	;;
-condrestart)
-	[ -f /var/lock/subsys/infinidb ] && restart || :
-	;;
-status)
-	status
-	;;
-*)
-	echo $"Usage: $0 {start|stop|restart|condrestart|status}"
-	exit 1
-esac
-
-exit $?
-
diff --git a/oam/install_scripts/infinidb.conf b/oam/install_scripts/infinidb.conf
deleted file mode 100644
index abb2e8fd4..000000000
--- a/oam/install_scripts/infinidb.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-/usr/local/Calpont/lib
-
diff --git a/oam/install_scripts/infinidb.def b/oam/install_scripts/infinidb.def
deleted file mode 100644
index 675522a0d..000000000
--- a/oam/install_scripts/infinidb.def
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-# Copy this file to /etc/default and rename it to 'infinidb'.
-
-# Change this line to your InfiniDB installation directory
-COLUMNSTORE_INSTALL_DIR=/usr/local/Calpont
-
-LD_LIBRARY_PATH=$COLUMNSTORE_INSTALL_DIR/lib:$COLUMNSTORE_INSTALL_DIR/mysql/lib/mysql
-export COLUMNSTORE_INSTALL_DIR=$COLUMNSTORE_INSTALL_DIR
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH
diff --git a/oam/install_scripts/infinidb.upstart b/oam/install_scripts/infinidb.upstart
deleted file mode 100644
index bb53d6901..000000000
--- a/oam/install_scripts/infinidb.upstart
+++ /dev/null
@@ -1,16 +0,0 @@
-# $Id$
-
-description "Starts the InfiniDB Enterprise Process Monitor"
-
-start on runlevel 2
-start on runlevel 3
-
-stop on runlevel 0
-stop on runlevel 1
-stop on runlevel 4
-stop on runlevel 5
-stop on runlevel 6
-
-respawn
-exec /usr/local/Calpont/bin/ProcMon
-
diff --git a/oam/install_scripts/install-infinidb.sh b/oam/install_scripts/install-infinidb.sh
deleted file mode 100755
index d19d0090d..000000000
--- a/oam/install_scripts/install-infinidb.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-#
-# $Id: install-infinidb.sh 421 2007-04-05 15:46:55Z dhill $
-#
-# install-infinidb.sh dummy EE version
-
-echo " " 1>&2
-echo " This install-infinidb.sh script is only used to install the Community Edition." 1>&2
-echo " Please use the 'postConfigure' for installing the Enterprise Edition." 1>&2
-echo " Check the Calpont InfiniDB Installation Document for further details." 1>&2
-
-exit 1
-
diff --git a/oam/install_scripts/mariadb-command-line.sh b/oam/install_scripts/mariadb-command-line.sh
index efdbbddd5..86719deb1 100755
--- a/oam/install_scripts/mariadb-command-line.sh
+++ b/oam/install_scripts/mariadb-command-line.sh
@@ -8,20 +8,20 @@
 
 # check log for error
 checkForError() {
-	grep "ERROR 1045" /tmp/mariadb-command-line.log > /tmp/error.check
-	if [ `cat /tmp/error.check | wc -c` -ne 0 ]; then
-		echo "ERROR - PASSWORD: check log file: /tmp/mariadb-command-line.log"
-		rm -f /tmp/error.check
+	grep "ERROR 1045" ${tmpdir}/mariadb-command-line.log > ${tmpdir}/error.check
+	if [ `cat ${tmpdir}/error.check | wc -c` -ne 0 ]; then
+		echo "ERROR - PASSWORD: check log file: ${tmpdir}/mariadb-command-line.log"
+		rm -f ${tmpdir}/error.check
 		exit 2
 	fi
 	
-	grep ERROR /tmp/mariadb-command-line.log > /tmp/error.check
-	if [ `cat /tmp/error.check | wc -c` -ne 0 ]; then
-		echo "ERROR: check log file: /tmp/mariadb-command-line.log"
-		rm -f /tmp/error.check
+	grep ERROR ${tmpdir}/mariadb-command-line.log > ${tmpdir}/error.check
+	if [ `cat ${tmpdir}/error.check | wc -c` -ne 0 ]; then
+		echo "ERROR: check log file: ${tmpdir}/mariadb-command-line.log"
+		rm -f ${tmpdir}/error.check
 		exit 1
 	fi
-	rm -f /tmp/error.check
+	rm -f ${tmpdir}/error.check
 }
 
 prefix=/usr/local
@@ -37,27 +37,29 @@ for arg in "$@"; do
 		prefix=`dirname $installdir`
 	elif [ `expr -- "$arg" : '--port='` -eq 7 ]; then
 		port="`echo $arg | awk -F= '{print $2}'`"
+	elif [ $(expr -- "$arg" : '--tmpdir=') -eq 9 ]; then
+		tmpdir="$(echo $arg | awk -F= '{print $2}')"
 	fi
 done
 
 test -f $installdir/post/functions && . $installdir/post/functions
 
 
->/tmp/mariadb-command-line.log
+>${tmpdir}/mariadb-command-line.log
 
 #
 # Run command
 #
-echo "Run command" >>/tmp/mariadb-command-line.log
-cat >/tmp/mariadb-command-line.sql <<EOD
+echo "Run command" >>${tmpdir}/mariadb-command-line.log
+cat >${tmpdir}/mariadb-command-line.sql <<EOD
 $command;
 EOD
 
-cat /tmp/mariadb-command-line.sql >> /tmp/mariadb-command-line.log
+cat${tmpdir}/mariadb-command-line.sql >> ${tmpdir}/mariadb-command-line.log
 $installdir/mysql/bin/mysql \
 	--defaults-extra-file=$installdir/mysql/my.cnf \
 	--user=root \
-	calpontsys < /tmp/mariadb-command-line.sql >> /tmp/mariadb-command-line.log 2>&1
+	calpontsys < ${tmpdir}/mariadb-command-line.sql >> ${tmpdir}/mariadb-command-line.log 2>&1
 
 checkForError
 
diff --git a/oam/install_scripts/master-rep-columnstore.sh b/oam/install_scripts/master-rep-columnstore.sh
index 5d27ee278..313199d62 100644
--- a/oam/install_scripts/master-rep-columnstore.sh
+++ b/oam/install_scripts/master-rep-columnstore.sh
@@ -8,13 +8,13 @@
 
 # check log for error
 checkForError() {
-	grep ERROR /tmp/master-rep-status-$hostipaddr.log > /tmp/error.check
-	if [ `cat /tmp/error.check | wc -c` -ne 0 ]; then
-		echo "ERROR: check log file: /tmp/master-rep-status-$hostipaddr.log"
-		rm -f /tmp/error.check
+	grep ERROR ${tmpdir}/master-rep-status-$hostipaddr.log > ${tmpdir}/error.check
+	if [ `cat ${tmpdir}/error.check | wc -c` -ne 0 ]; then
+		echo "ERROR: check log file: ${tmpdir}/master-rep-status-$hostipaddr.log"
+		rm -f ${tmpdir}/error.check
 		exit 1
 	fi
-	rm -f /tmp/error.check
+	rm -f ${tmpdir}/error.check
 }
 
 prefix=/usr/local
@@ -29,6 +29,8 @@ for arg in "$@"; do
 		prefix=`dirname $installdir`
 	elif [ `expr -- "$arg" : '--hostIP='` -eq 9 ]; then
 		hostipaddr="`echo $arg | awk -F= '{print $2}'`"
+	elif [ $(expr -- "$arg" : '--tmpdir=') -eq 9 ]; then
+		tmpdir="$(echo $arg | awk -F= '{print $2}')"
 	fi
 done
 
@@ -37,69 +39,69 @@ test -f $installdir/post/functions && . $installdir/post/functions
 repUser="idbrep"
 password="Calpont1"
 
->/tmp/master-rep-status-$hostipaddr.log
+>${tmpdir}/master-rep-status-$hostipaddr.log
 
 #
 # Create Replication User
 #
-echo "Create Replication User $repUser for node $hostipaddr" >>/tmp/master-rep-status-$hostipaddr.log
-cat >/tmp/idb_master-rep.sql <<EOD
+echo "Create Replication User $repUser for node $hostipaddr" >>${tmpdir}/master-rep-status-$hostipaddr.log
+cat >${tmpdir}/idb_master-rep.sql <<EOD
 CREATE USER IF NOT EXISTS '$repUser'@'$hostipaddr' IDENTIFIED BY '$password';
 GRANT REPLICATION SLAVE ON *.* TO '$repUser'@'$hostipaddr';
 EOD
 
-cat /tmp/idb_master-rep.sql >>/tmp/master-rep-status-$hostipaddr.log
+cat ${tmpdir}/idb_master-rep.sql >>${tmpdir}/master-rep-status-$hostipaddr.log
 $installdir/mysql/bin/mysql \
 	--defaults-extra-file=$installdir/mysql/my.cnf \
 	--user=root \
-	calpontsys </tmp/idb_master-rep.sql >>/tmp/master-rep-status-$hostipaddr.log 2>&1
+	calpontsys <${tmpdir}/idb_master-rep.sql >>${tmpdir}/master-rep-status-$hostipaddr.log 2>&1
 
 checkForError
 
 #
 # Grant table access for created user
 #
-echo "Grant table access for $repUser for node $hostipaddr" >>/tmp/master-rep-status-$hostipaddr.log
-cat >/tmp/idb_master-rep.sql <<EOD
+echo "Grant table access for $repUser for node $hostipaddr" >>${tmpdir}/master-rep-status-$hostipaddr.log
+cat >${tmpdir}/idb_master-rep.sql <<EOD
 use mysql
 grant all on *.* to '$repUser'@'$hostipaddr' identified by 'Calpont1';
 grant REPLICATION SLAVE on *.* to '$repUser'@'$hostipaddr' identified by 'Calpont1';
 EOD
 
-cat /tmp/idb_master-rep.sql >>/tmp/master-rep-status-$hostipaddr.log
+cat ${tmpdir}/idb_master-rep.sql >>${tmpdir}/master-rep-status-$hostipaddr.log
 $installdir/mysql/bin/mysql \
 	--defaults-extra-file=$installdir/mysql/my.cnf \
 	--user=root \
-	calpontsys </tmp/idb_master-rep.sql >>/tmp/master-rep-status-$hostipaddr.log 2>&1
+	calpontsys <${tmpdir}/idb_master-rep.sql >>${tmpdir}/master-rep-status-$hostipaddr.log 2>&1
 
 checkForError
 
 #
 # Run SHOW MASTER STATUS
 #
-echo "Run SHOW MASTER STATUS to node log" >>/tmp/master-rep-status-$hostipaddr.log
-cat >/tmp/idb_master-rep.sql <<EOD
+echo "Run SHOW MASTER STATUS to node log" >>${tmpdir}/master-rep-status-$hostipaddr.log
+cat >${tmpdir}/idb_master-rep.sql <<EOD
 SHOW MASTER STATUS
 EOD
 
-cat /tmp/idb_master-rep.sql >>/tmp/master-rep-status-$hostipaddr.log
+cat ${tmpdir}/idb_master-rep.sql >>${tmpdir}/master-rep-status-$hostipaddr.log
 $installdir/mysql/bin/mysql \
 	--defaults-extra-file=$installdir/mysql/my.cnf \
 	--user=root \
-	calpontsys </tmp/idb_master-rep.sql >>/tmp/master-rep-status-$hostipaddr.log 2>&1
+	calpontsys <${tmpdir}/idb_master-rep.sql >>${tmpdir}/master-rep-status-$hostipaddr.log 2>&1
 
 checkForError
 
-echo "Run SHOW MASTER STATUS to master status log /tmp/show-master-status.log" >>/tmp/master-rep-status-$hostipaddr.log
-cat >/tmp/idb_master-rep.sql <<EOD
+echo "Run SHOW MASTER STATUS to master status log ${tmpdir}/show-master-status.log" >>${tmpdir}/master-rep-status-$hostipaddr.log
+cat >${tmpdir}/idb_master-rep.sql <<EOD
 SHOW MASTER STATUS
 EOD
 
-cat /tmp/idb_master-rep.sql >/tmp/show-master-status.log
+cat ${tmpdir}/idb_master-rep.sql >${tmpdir}/show-master-status.log
 $installdir/mysql/bin/mysql \
 	--defaults-extra-file=$installdir/mysql/my.cnf \
 	--user=root \
-	calpontsys </tmp/idb_master-rep.sql >>/tmp/show-master-status.log
+	calpontsys <${tmpdir}/idb_master-rep.sql >>${tmpdir}/show-master-status.log
 
 
 #alls good, 'OK' for success
diff --git a/oam/install_scripts/master-rep-infinidb.sh b/oam/install_scripts/master-rep-infinidb.sh
deleted file mode 100644
index cd4054773..000000000
--- a/oam/install_scripts/master-rep-infinidb.sh
+++ /dev/null
@@ -1,112 +0,0 @@
-#!/bin/bash
-#
-# $Id$
-#
-# generic InfiniDB Master Replication script.
-#
-# Notes: This script gets run by ProcMon during installs and upgrades:
-
-# check log for error
-checkForError() {
-	grep ERROR /tmp/master-rep-status-$hostipaddr.log > /tmp/error.check
-	if [ `cat /tmp/error.check | wc -c` -ne 0 ]; then
-		echo "ERROR: check log file: /tmp/master-rep-status-$hostipaddr.log"
-		rm -f /tmp/error.check
-		exit 1
-	fi
-	rm -f /tmp/error.check
-}
-
-prefix=/usr/local
-installdir=$prefix/mariadb/columnstore
-pwprompt=
-for arg in "$@"; do
-	if [ `expr -- "$arg" : '--prefix='` -eq 9 ]; then
-		prefix="`echo $arg | awk -F= '{print $2}'`"
-		installdir=$prefix/mariadb/columnstore
-	elif [ `expr -- "$arg" : '--password='` -eq 11 ]; then
-		password="`echo $arg | awk -F= '{print $2}'`"
-		pwprompt="--password=$password"
-	elif [ `expr -- "$arg" : '--installdir='` -eq 13 ]; then
-		installdir="`echo $arg | awk -F= '{print $2}'`"
-		prefix=`dirname $installdir`
-	elif [ `expr -- "$arg" : '--hostIP='` -eq 9 ]; then
-		hostipaddr="`echo $arg | awk -F= '{print $2}'`"
-	fi
-done
-
-test -f $installdir/post/functions && . $installdir/post/functions
-
-repUser="idbrep"
-password="Calpont1"
-
->/tmp/master-rep-status-$hostipaddr.log
-
-#
-# Create Replication User
-#
-echo "Create Replication User $repUser for node $hostipaddr" >>/tmp/master-rep-status-$hostipaddr.log
-cat >/tmp/idb_master-rep.sql <<EOD
-CREATE USER '$repUser'@'$hostipaddr' IDENTIFIED BY '$password';
-GRANT REPLICATION SLAVE ON *.* TO '$repUser'@'$hostipaddr';
-EOD
-
-cat /tmp/idb_master-rep.sql >>/tmp/master-rep-status-$hostipaddr.log
-$installdir/mysql/bin/mysql \
-	--defaults-extra-file=$installdir/mysql/my.cnf \
-	--user=root $pwprompt \
-	calpontsys </tmp/idb_master-rep.sql >>/tmp/master-rep-status-$hostipaddr.log
-
-checkForError
-
-#
-# Grant table access for created user
-#
-echo "Grant table access for $repUser for node $hostipaddr" >>/tmp/master-rep-status-$hostipaddr.log
-cat >/tmp/idb_master-rep.sql <<EOD
-use mysql
-grant all on *.* to '$repUser'@'$hostipaddr' identified by 'Calpont1';
-grant REPLICATION SLAVE on *.* to '$repUser'@'$hostipaddr' identified by 'Calpont1';
-EOD
-
-cat /tmp/idb_master-rep.sql >>/tmp/master-rep-status-$hostipaddr.log
-$installdir/mysql/bin/mysql \
-	--defaults-extra-file=$installdir/mysql/my.cnf \
-	--user=root $pwprompt \
-	calpontsys </tmp/idb_master-rep.sql >>/tmp/master-rep-status-$hostipaddr.log
-
-checkForError
-
-#
-# Run SHOW MASTER STATUS
-#
-echo "Run SHOW MASTER STATUS to node log" >>/tmp/master-rep-status-$hostipaddr.log
-cat >/tmp/idb_master-rep.sql <<EOD
-SHOW MASTER STATUS
-EOD
-
-cat /tmp/idb_master-rep.sql >>/tmp/master-rep-status-$hostipaddr.log
-$installdir/mysql/bin/mysql \
-	--defaults-extra-file=$installdir/mysql/my.cnf \
-	--user=root $pwprompt \
-	calpontsys </tmp/idb_master-rep.sql >>/tmp/master-rep-status-$hostipaddr.log
-
-checkForError
-
-echo "Run SHOW MASTER STATUS to master status log /tmp/show-master-status.log" >>/tmp/master-rep-status-$hostipaddr.log
-cat >/tmp/idb_master-rep.sql <<EOD
-SHOW MASTER STATUS
-EOD
-
-cat /tmp/idb_master-rep.sql >/tmp/show-master-status.log
-$installdir/mysql/bin/mysql \
-	--defaults-extra-file=$installdir/mysql/my.cnf \
-	--user=root $pwprompt \
-	calpontsys </tmp/idb_master-rep.sql >>/tmp/show-master-status.log
-
-
-#alls good, 'OK' for success
-echo "OK"
-exit 0
-
-
diff --git a/oam/install_scripts/module_installer.sh b/oam/install_scripts/module_installer.sh
index 8910cca7f..038611675 100755
--- a/oam/install_scripts/module_installer.sh
+++ b/oam/install_scripts/module_installer.sh
@@ -15,6 +15,7 @@ rpmmode=install
 user=`whoami 2>/dev/null`
 quiet=0
 shiftcnt=0
+password=" "
 
 for arg in "$@"; do
 	if [ $(expr -- "$arg" : '--prefix=') -eq 9 ]; then
@@ -40,6 +41,9 @@ for arg in "$@"; do
 	elif [ $(expr -- "$arg" : '--module') -eq 8 ]; then
 		module="$(echo $arg | awk -F= '{print $2}')"
 		((shiftcnt++))
+	elif [ $(expr -- "$arg" : '--password') -eq 10 ]; then
+		password="$(echo $arg | awk -F= '{print $2}')"
+		((shiftcnt++))
 	fi
 done
 shift $shiftcnt
@@ -55,6 +59,9 @@ fi
 PMwithUM=`$COLUMNSTORE_INSTALL_DIR/bin/getConfig Installation PMwithUM`
 ServerTypeInstall=`$COLUMNSTORE_INSTALL_DIR/bin/getConfig Installation ServerTypeInstall`
 
+#get temp directory
+tmpDir=`$installdir/bin/getConfig SystemConfig SystemTempFileDir`
+
 cloud=`$COLUMNSTORE_INSTALL_DIR/bin/getConfig Installation Cloud`
 if [ $cloud = "amazon-ec2" ] || [ $cloud = "amazon-vpc" ]; then
 	echo "Amazon setup on Module"
@@ -63,18 +70,15 @@ if [ $cloud = "amazon-ec2" ] || [ $cloud = "amazon-vpc" ]; then
 	if [ $module = "pm" ]; then
 		if test -f $COLUMNSTORE_INSTALL_DIR/local/etc/pm1/fstab ; then
 			echo "Setup fstab on Module"
-        		if [ $user = "root" ]; then
-				touch /etc/fstab
-				rm -f /etc/fstab.columnstoreSave
-				cp /etc/fstab /etc/fstab.columnstoreSave
-				cat $COLUMNSTORE_INSTALL_DIR/local/etc/pm1/fstab >> /etc/fstab
-			else
-                                sudo touch /etc/fstab
-				sudo chmod 666 /etc/fstab
-                                sudo rm -f /etc/fstab.columnstoreSave
-                                sudo cp /etc/fstab /etc/fstab.columnstoreSave
-                                sudo cat $COLUMNSTORE_INSTALL_DIR/local/etc/pm1/fstab >> /etc/fstab
+			SUDO=""
+			if [ $user != "root" ]; then
+				SUDO="sudo "
 			fi
+			touch /etc/fstab
+			$SUDO chmod 666 /etc/fstab
+			rm -f /etc/fstab.columnstoreSave
+			cp /etc/fstab /etc/fstab.columnstoreSave
+			cat $COLUMNSTORE_INSTALL_DIR/local/etc/pm1/fstab >> /etc/fstab
 		fi
 	fi
 fi
@@ -84,8 +88,8 @@ test -f $COLUMNSTORE_INSTALL_DIR/post/functions && . $COLUMNSTORE_INSTALL_DIR/po
 mid=`module_id`
 
 #if um, cloud, separate system type, external um storage, then setup mount
-if [ $module = "um" ]; then
-	if [ $cloud = "amazon-ec2" ] || [ $cloud = "amazon-vpc" ]; then
+if [ $cloud = "amazon-ec2" ] || [ $cloud = "amazon-vpc" ]; then
+	if [ $module = "um" ]; then
 		systemtype=`$COLUMNSTORE_INSTALL_DIR/bin/getConfig Installation ServerTypeInstall`
 		if [ $systemtype = "1" ]; then
 			umstoragetype=`$COLUMNSTORE_INSTALL_DIR/bin/getConfig Installation UMStorageType`
@@ -93,16 +97,19 @@ if [ $module = "um" ]; then
 				echo "Setup UM Volume Mount"
 				device=`$COLUMNSTORE_INSTALL_DIR/bin/getConfig Installation UMVolumeDeviceName$mid`
 				mkdir -p $COLUMNSTORE_INSTALL_DIR/mysql/db > /dev/null 2>&1
- 				if [ $user = "root" ]; then
- 					mount $device $COLUMNSTORE_INSTALL_DIR/mysql/db -t ext2 -o noatime,nodiratime,noauto
- 					chown mysql:mysql -R $COLUMNSTORE_INSTALL_DIR/mysql > /dev/null 2>&1
- 				else
- 					sudo mount $device $COLUMNSTORE_INSTALL_DIR/mysql/db -t ext2 -o noatime,nodiratime,noauto,user
- 					sudo chown $user:$user -R $COLUMNSTORE_INSTALL_DIR/mysql > /dev/null 2>&1
- 				fi
+				sudo mount $device $COLUMNSTORE_INSTALL_DIR/mysql/db -t ext2 -o noatime,nodiratime,noauto,user
+				sudo chown $user:$user -R $COLUMNSTORE_INSTALL_DIR/mysql > /dev/null 2>&1
 			fi
 		fi
 	fi
+
+	#setup rc.local for amazon
+	RCFILE=/etc/rc.d/rc.local
+
+	if [ $user != "root" ]; then
+		  echo "uncomment runuser in rc.local, amazon AMI"
+		  sudo sed -i -e 's/#runuser/runuser/g' /etc/rc.d/rc.local >/dev/null 2>&1
+	fi
 fi
 
 #if pm, create dbroot directories
@@ -134,85 +141,50 @@ MySQLRep=`$COLUMNSTORE_INSTALL_DIR/bin/getConfig Installation MySQLRep`
 if [ $MySQLRep = "y" ]; then
 	if test -f $COLUMNSTORE_INSTALL_DIR/mysql/my.cnf ; then
 		echo "Run Upgrade on my.cnf on Module"
-		$COLUMNSTORE_INSTALL_DIR/bin/mycnfUpgrade > /tmp/mycnfUpgrade.log 2>&1
+		$COLUMNSTORE_INSTALL_DIR/bin/mycnfUpgrade > ${tmpDir}/mycnfUpgrade.log 2>&1
 	fi
 fi
 
 if test -f $COLUMNSTORE_INSTALL_DIR/mysql/my.cnf ; then
 	mysqlPort=`$COLUMNSTORE_INSTALL_DIR/bin/getConfig Installation MySQLPort`
 	echo "Run Mysql Port update on my.cnf on Module"
-	$COLUMNSTORE_INSTALL_DIR/bin/mycnfUpgrade $mysqlPort > /tmp/mycnfUpgrade_port.log 2>&1
+	$COLUMNSTORE_INSTALL_DIR/bin/mycnfUpgrade $mysqlPort > ${tmpDir}/mycnfUpgrade_port.log 2>&1
 fi
 
 # if um, run mysql install scripts
 if [ $module = "um" ] || ( [ $module = "pm" ] && [ $PMwithUM = "y" ] ) || [ $ServerTypeInstall = "2" ]; then
+
+	mysqlPassword=" "
+	if [[ $password != " " ]]; then
+		mysqlPassword="--password="$password
+	fi
+
 	echo "Run post-mysqld-install"
-	$COLUMNSTORE_INSTALL_DIR/bin/post-mysqld-install --installdir=$COLUMNSTORE_INSTALL_DIR > /tmp/post-mysqld-install.log 2>&1
+	$COLUMNSTORE_INSTALL_DIR/bin/post-mysqld-install --installdir=$COLUMNSTORE_INSTALL_DIR $mysqlPassword --tmpdir=${tmpDir} > ${tmpDir}/post-mysqld-install.log 2>&1
 	if [ $? -ne 0 ]; then
-	    echo "ERROR: post-mysqld-install failed: check /tmp/post-mysqld-install.log"
+	    echo "ERROR: post-mysqld-install failed: check ${tmpDir}/post-mysqld-install.log"
 	    exit 1
 	fi
+	
 	echo "Run post-mysql-install"
 	
-	$COLUMNSTORE_INSTALL_DIR/bin/post-mysql-install --installdir=$COLUMNSTORE_INSTALL_DIR  > /tmp/post-mysql-install.log 2>&1
+	$COLUMNSTORE_INSTALL_DIR/bin/post-mysql-install --installdir=$COLUMNSTORE_INSTALL_DIR --tmpdir=${tmpDir} > ${tmpDir}/post-mysql-install.log 2>&1
         if [ $? -ne 0 ]; then
-            echo "ERROR: post-mysql-install failed: check /tmp/post-mysql-install.log"
+            echo "ERROR: post-mysql-install failed: check ${tmpDir}/post-mysql-install.log"
             exit 1
 	fi
 fi
 
-$COLUMNSTORE_INSTALL_DIR/bin/syslogSetup.sh check > /tmp/syslogSetup-check.log 2>&1
-if [ $? -ne 0 ]; then
-	# try setup again
-	$COLUMNSTORE_INSTALL_DIR/bin/syslogSetup.sh install > /tmp/syslogSetup-install.log 2>&1
-	if [ $? -ne 0 ]; then
-		echo "WARNING: syslogSetup.sh check failed: check /tmp/syslogSetup-check.log"
-       		exit 2
-	fi
-fi
- 
-#setup rc.local
-if [ -f /etc/rc.d ]; then
-    RCFILE=/etc/rc.d/rc.local
-else
-    RCFILE=/etc/rc.local
-fi
-touch $RCFILE
-
-echo "add deadline to rc.local"
-if [ $module = "um" ]; then
-	if [ $user = "root" ]; then
-		echo "for scsi_dev in \`mount | awk '/mnt\\/tmp/  {print $1}' | awk -F/ '{print $3}' | sed 's/[0-9]*$//'\`; do" >> $RCFILE
-		echo "echo deadline > /sys/block/$scsi_dev/queue/scheduler" >> $RCFILE
-		echo "done" >> $RCFILE
-	else
-                sudo echo "for scsi_dev in \`mount | awk '/mnt\\/tmp/  {print $1}' | awk -F/ '{print $3}' | sed 's/[0-9]*$//'\`; do" >> $RCFILE
-                sudo echo "echo deadline > /sys/block/$scsi_dev/queue/scheduler" >> $RCFILE
-                sudo echo "done" >> $RCFILE
-	fi
-else
-        if [ $user = "root" ]; then
-		echo "for scsi_dev in \`mount | awk '/mnt\\/tmp/  {print $1}' | awk -F/ '{print $3}' | sed 's/[0-9]*$//'\`; do" >> $RCFILE
-		echo "echo deadline > /sys/block/$scsi_dev/queue/scheduler" >> $RCFILE
-		echo "done" >> $RCFILE
-
-		echo "for scsi_dev in \`mount | awk '/columnstore\\/data/ {print $1}' | awk -F/ '{print $3}' | sed 's/[0-9]*$//'\`; do" >> $RCFILE
-		echo "echo deadline > /sys/block/$scsi_dev/queue/scheduler" >> $RCFILE
-		echo "done" >> $RCFILE
-	else
-                sudo echo "for scsi_dev in \`mount | awk '/mnt\\/tmp/  {print $1}' | awk -F/ '{print $3}' | sed 's/[0-9]*$//'\`; do" >> $RCFILE
-                sudo echo "echo deadline > /sys/block/$scsi_dev/queue/scheduler" >> $RCFILE
-                sudo echo "done" >> $RCFILE
-
-                sudo echo "for scsi_dev in \`mount | awk '/columnstore\\/data/ {print $1}' | awk -F/ '{print $3}' | sed 's/[0-9]*$//'\`; do" >> $RCFILE
-                sudo echo "echo deadline > /sys/block/$scsi_dev/queue/scheduler" >> $RCFILE
-                sudo echo "done" >> $RCFILE
-	fi
-fi
-
-if [ $user != "root" ]; then
-      echo "uncomment runuser in rc.local"
-      sudo sed -i -e 's/#sudo runuser/sudo runuser/g' $RCFILE >/dev/null 2>&1
+if [ $user == "root" ]; then
+    $COLUMNSTORE_INSTALL_DIR/bin/syslogSetup.sh check > ${tmpDir}/syslogSetup-check.log 2>&1
+    if [ $? -ne 0 ]; then
+	    # try setup again
+	    $COLUMNSTORE_INSTALL_DIR/bin/syslogSetup.sh install > ${tmpDir}/syslogSetup-install.log 2>&1
+	    if [ $? -ne 0 ]; then
+		    echo "WARNING: syslogSetup.sh check failed: check ${tmpDir}/syslogSetup-check.log"
+		    exit 2
+	    fi
+    fi
 fi
 
 echo "!!!Module Installation Successfully Completed!!!"
diff --git a/oam/install_scripts/post-install b/oam/install_scripts/post-install
index 5a61a9074..a08a17d0a 100755
--- a/oam/install_scripts/post-install
+++ b/oam/install_scripts/post-install
@@ -8,10 +8,6 @@ prefix=/usr/local
 installdir=$prefix/mariadb/columnstore
 rpmmode=install
 user=`whoami 2>/dev/null`
-SUDO=" "
-if [ $user != "root" ]; then
-        SUDO="sudo "
-fi
 
 quiet=0
 
@@ -32,7 +28,9 @@ for arg in "$@"; do
 	elif [ `expr -- "$arg" : '--plugin='` -eq 9 ]; then
 		plugin="`echo $arg | awk -F= '{print $2}'`"
 	else
-		echo "post-install: ignoring unknown argument: $arg" 1>&2
+		echo "post-install: invalid unknown argument: $arg" 1>&2
+		echo "exiting..."
+		exit 1
 	fi
 done
  
@@ -70,6 +68,12 @@ fi
 
 cd $installdir/lib || exit 1
 
+touch /dev/shm/columnstore-test && rm /dev/shm/columnstore-test
+if [ $? -ne 0 ] ; then
+    echo "User $user will need R/W access to /dev/shm."
+    exit 1
+fi
+
 #remove libudfsdk.so.1.0.0 file, if it exist # mcol-875
 rm -f $installdir/lib/libudfsdk.so
 rm -f $installdir/lib/libudfsdk.so.1
@@ -93,53 +97,65 @@ if [ -f libstdc++.so.6.0.14 ]; then
 fi
 
 # softlink for libperl.sp, used by cplogger
-$SUDO ln -s /usr/lib64/perl5/CORE/libperl.so /usr/lib64/libperl.so >/dev/null 2>&1
-
-#setup profile files
-profileFileAlias=/etc/profile.d/columnstoreAlias.sh
-profileFileEnv=/etc/profile.d/columnstoreEnv.sh
+ln -s /usr/lib64/perl5/CORE/libperl.so /usr/lib64/libperl.so >/dev/null 2>&1
 
 if [ $installdir != "/usr/local/mariadb/columnstore" ]; then
         sed -i -e s@/usr/local/mariadb/columnstore@$installdir@g $installdir/bin/columnstoreAlias
 fi
 
 if [ $user != "root" ]; then
-	sudo rm -f $profileFileEnv
-	sudo rm -f $profileFileAlias
-	
-	sudo touch $profileFileEnv
-	sudo chmod 666 $profileFileEnv
-	egrep -qs 'MariaDB Columnstore Non-Root' ${profileFileEnv}
+	if [ -f $prefix/.bash_profile ]; then		
+		profileFile=$prefix/.bash_profile
+	elif [ -f $prefix/.profile ]; then		
+		profileFile=$prefix/.profile
+	else
+		profileFile=$prefix/.bashrc
+		touch $prefix/.bashrc
+	fi
+		
+	if [ ! -f ${profileFile}_backup ]; then
+	    cp $profileFile ${profileFile}_backup
+	fi
+
+	egrep -qs 'MariaDB Columnstore Non-Root Environment Variables' ${profileFile}
 	rc1=$?
 	if [ $rc1 -ne 0 ]; then
-        	sudo echo " " >> ${profileFileEnv}
-		sudo echo "# MariaDB Columnstore Non-Root Environment Variables" >> ${profileFileEnv}
-        	sudo echo "export COLUMNSTORE_INSTALL_DIR=$COLUMNSTORE_INSTALL_DIR" >> ${profileFileEnv}
-        	sudo echo "export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$COLUMNSTORE_INSTALL_DIR/lib:$COLUMNSTORE_INSTALL_DIR/mysql/lib" >> ${profileFileEnv}
-        	. ${profileFileEnv}
+        	echo " " >> ${profileFile}
+		echo "# MariaDB Columnstore Non-Root Environment Variables" >> ${profileFile}
+        	echo "export COLUMNSTORE_INSTALL_DIR=$COLUMNSTORE_INSTALL_DIR" >> ${profileFile}
+        	echo "export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$COLUMNSTORE_INSTALL_DIR/lib:$COLUMNSTORE_INSTALL_DIR/mysql/lib" >> ${profileFile}
 	fi
 	
-	sudo /bin/cp -f $installdir/bin/columnstoreAlias $profileFileAlias
-	sudo chmod 666 $profileFileAlias
+	egrep -qs 'MariaDB Columnstore Non-Root Alias Variables' ${profileFile}
+	rc1=$?
+	if [ $rc1 -ne 0 ]; then
+        	echo " " >> ${profileFile}
+		echo "# MariaDB Columnstore Non-Root Alias Variables" >> ${profileFile}
+		cat $installdir/bin/columnstoreAlias >> ${profileFile}
+	fi
+
+	#source the file
+	. ${profileFile}
 else
-	/bin/cp -f $installdir/bin/columnstoreAlias $profileFileAlias
-	chmod 644 $profileFileAlias
+	profileFile="/etc/profile.d/columnstoreAlias.sh"
+	/bin/cp -f $installdir/bin/columnstoreAlias /etc/profile.d/columnstoreAlias.sh
+	chmod 644 /etc/profile.d/columnstoreAlias.sh >/dev/null 2>&1
 fi
 
-cd /
+# set Profile File in config file
+$installdir/bin/setConfig -d Installation ProfileFile $profileFile
 
-test -d /var/log/mariadb || $SUDO mkdir /var/log/mariadb >/dev/null 2>&1
-test -d /var/log/mariadb/columnstore || $SUDO mkdir /var/log/mariadb/columnstore >/dev/null 2>&1
-
-if [ $user != "root" ]; then
-	$SUDO chmod -R 777 /var/log/mariadb >/dev/null 2>&1
-	$SUDO chown -R $user:$user /var/log/mariadb >/dev/null 2>&1
+# create directories
+if [ $user == "root" ]; then
+	test -d /var/log/mariadb || mkdir /var/log/mariadb >/dev/null 2>&1
+	test -d /var/log/mariadb/columnstore || mkdir /var/log/mariadb/columnstore >/dev/null 2>&1
+	test -d /var/log/mariadb/columnstore/archive || mkdir /var/log/mariadb/columnstore/archive >/dev/null 2>&1
+	test -d /var/log/mariadb/columnstore/corefiles || mkdir /var/log/mariadb/columnstore/corefiles >/dev/null 2>&1
+	test -d /var/log/mariadb/columnstore/trace || mkdir /var/log/mariadb/columnstore/trace >/dev/null 2>&1
+	test -h /var/log/mariadb/columnstore/data && rm -f /var/log/mariadb/columnstore/data
+	chmod 755 /var/log/mariadb/columnstore/corefiles > /dev/null 2>&1
 fi
 
-test -d /var/log/mariadb/columnstore/archive || mkdir /var/log/mariadb/columnstore/archive >/dev/null 2>&1
-test -d /var/log/mariadb/columnstore/corefiles || mkdir /var/log/mariadb/columnstore/corefiles >/dev/null 2>&1
-test -d /var/log/mariadb/columnstore/trace || mkdir /var/log/mariadb/columnstore/trace >/dev/null 2>&1
-test -h /var/log/mariadb/columnstore/data && rm -f /var/log/mariadb/columnstore/data
 # make sure trace dir is world-writable and sticky
 test -d $installdir/data || mkdir $installdir/data
 test -d $installdir/data1 || mkdir $installdir/data1
@@ -159,16 +175,30 @@ mkdir -p $installdir/data/bulk/rollback >/dev/null 2>&1
 mkdir -p $installdir/data/bulk/tmpjob >/dev/null 2>&1
 rm -f $installdir/data/bulk/tmpjob/* >/dev/null 2>&1
 
-#create columnstore temp file directory
-mkdir -p /tmp/columnstore_tmp_files >/dev/null 2>&1
+#get temp base directory
+tmpDir="/tmp"
+if [ $user != "root" ]; then
+	tmpDir=$HOME"/.tmp"
+	mkdir $tmpDir >/dev/null 2>&1
+else
+	#get columnstore temp file directory name
+	TempFileDir=`$installdir/bin/getConfig SystemConfig TempFileDir`
+	tmpDir=${tmpDir}${TempFileDir}
+	mkdir $tmpDir >/dev/null 2>&1
+fi
 
-#setup core file directory and link
-mkdir /var/log/mariadb/columnstore/corefiles > /dev/null 2>&1
-chmod 777 /var/log/mariadb/columnstore/corefiles > /dev/null 2>&1
+#set base columnstore temp file directory
+$installdir/bin/setConfig -d SystemConfig SystemTempFileDir $tmpDir
+
+#get place file buffer temporary files
+hdfsRdwrScratch=`$installdir/bin/getConfig SystemConfig hdfsRdwrScratch`
+hdfsDir=${tmpDir}${hdfsRdwrScratch}
+
+#create place file buffer temporary files
+mkdir -p $hdfsDir >/dev/null 2>&1
 
 #create mount directories
 mkdir /mnt/tmp > /dev/null 2>&1
-mkdir /var/log/mariadb/columnstore/data/archive > /dev/null 2>&1
 
 # remove mysql archive log
 test -d $installdir/mysql/db || mkdir -p $installdir/mysql/db
@@ -177,8 +207,6 @@ rm -rf $installdir/mysql/db/columnstore_log_archive > /dev/null 2>&1
 # delete Columnstore shared memory segments
 $installdir/bin/clearShm  > /dev/null 2>&1
 
-systemctl=`which systemctl 2>/dev/null`
-
 #check and create rc.local file if missing
 if [ -f /etc/rc.d ]; then
     RCFILE=/etc/rc.d/rc.local
@@ -190,22 +218,16 @@ if [ $user = "root" ]; then
     touch $RCFILE    
     chmod +x $RCFILE
 else
-    $SUDO touch $RCFILE
-    $SUDO chmod 777 $RCFILE
-    $SUDO printf '%s\n' '#!/bin/bash' "#" | $SUDO tee -a $RCFILE > /dev/null 2>&1
-    
-    if [ -n "$systemctl" ]; then
-	$SUDO systemctl start rc-local >/dev/null 2>&1
-	$SUDO systemctl enable rc-local >/dev/null 2>&1
-    fi
+    printf '%s\n' '#!/bin/bash' "#" | tee -a $RCFILE > /dev/null 2>&1
 fi
 
-
-#setup the columnstore service script
-rm -f /etc/init.d/columnstore >/dev/null 2>&1
-rm -f /etc/init.d/mysql-Columnstore >/dev/null 2>&1
-
 if [ $user = "root" ]; then
+	#setup the columnstore service script
+	rm -f /etc/init.d/columnstore >/dev/null 2>&1
+	rm -f /etc/init.d/mysql-Columnstore >/dev/null 2>&1
+	rm -f /etc/default/columnstore
+
+	systemctl=`which systemctl 2>/dev/null`
 	if [ -n "$systemctl" ]; then
 
 		chmod 644 $installdir/bin/columnstore.service
@@ -234,31 +256,49 @@ if [ $user = "root" ]; then
 fi
 
 if [ $user = "root" ]; then
-	$installdir/bin/syslogSetup.sh install > /tmp/syslog_install.log 2>&1
-	rm -f /etc/default/columnstore
+	$installdir/bin/syslogSetup.sh install > $tmpDir/syslog_install.log 2>&1
+
+	#check if MariaDB Columnstore system logging was setup
+	cat $tmpDir/syslog_install.log | grep 'No System Logging' >/dev/null 2>&1
+	if [ $? -eq 0 ]; then
+	    cat $tmpDir/syslog_install.log
+	fi
 else
-        sed -i -e s@/usr/local/mariadb/columnstore@$installdir@g $installdir/bin/columnstore.def
-        sed -i -e s@/usr/local/mariadb/columnstore@$installdir@g $installdir/bin/columnstoreLogRotate
+	sed -i -e s@/usr/local/mariadb/columnstore@$installdir@g $installdir/bin/columnstoreLogRotate
 
-        $SUDO cp $installdir/bin/columnstore.def /etc/default/columnstore
+	sed -i -e s@prefix=/home/guest@prefix=$prefix@g $installdir/bin/*
 
-        sed -i -e s@prefix=/home/guest@prefix=$prefix@g $installdir/bin/*
+	chown $user:$user $installdir/etc/Columnstore.xml
+	
+cat <<EOD
 
-	$SUDO chmod 777 /tmp
-	$installdir/bin/syslogSetup.sh --installdir=$installdir install > /tmp/syslog_install.log 2>&1
-	$SUDO chown $user:$user $installdir/etc/Columnstore.xml
-	$SUDO mkdir /var/lock/subsys > /dev/null 2>&1
-	$SUDO chmod 777 /var/lock/subsys > /dev/null 2>&1
-	$SUDO rm -f /var/lock/subsys/mysql-Columnstore
-	$SUDO chmod 666 /etc/fstab
+NOTE: For non-root install, you will need to run the following commands as root user to
+      setup the MariaDB ColumnStore System Logging
+
+export COLUMNSTORE_INSTALL_DIR=$COLUMNSTORE_INSTALL_DIR
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH
+$installdir/bin/syslogSetup.sh --installdir=$installdir --user=$user install
+      
+      
+EOD
 fi
 
-#check if MariaDB Columnstore system logging was setup
-cat /tmp/syslog_install.log | grep 'No System Logging' >/dev/null 2>&1
-if [ $? -eq 0 ]; then
-	cat /tmp/syslog_install.log
+#determine lock file directory
+
+# Lock directory for root user
+lockdir='/var/lock/subsys'
+if [ $user != "root" ];then
+    # Lock directory for non-root user
+    lockdir=$prefix/.lock
 fi
 
+$installdir/bin/setConfig -d Installation LockFileDirectory $lockdir
+
+mkdir $lockdir >/dev/null 2>&1
+
+rm -f $lockdir/mysql-Columnstore
+rm -f $lockdir/columnstore
+
 #backup copy of Alarm Config File
 /bin/cp -f $installdir/etc/AlarmConfig.xml $installdir/etc/AlarmConfig.xml.installSave > /dev/null 2>&1
 
@@ -275,6 +315,7 @@ if [ $user = "root" ]; then
 else
 	LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$installdir/lib $installdir/bin/cplogger -i 19 "***** MariaDB Columnstore Installed *****"
 fi
+
 #setup hadoop
 hadoop=`which hadoop 2>/dev/null`
 if [ -z "$hadoop" ]; then
@@ -283,16 +324,22 @@ if [ -z "$hadoop" ]; then
 cat <<EOD
 The next steps are:
 
-If installing on a pm1 node:
+If installing on a pm1 node using non-distributed install
 
-export COLUMNSTORE_INSTALL_DIR=$installdir
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$installdir/lib:$installdir/mysql/lib
+export COLUMNSTORE_INSTALL_DIR=$COLUMNSTORE_INSTALL_DIR
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH
 $installdir/bin/postConfigure -i $installdir
 
+If installing on a pm1 node using distributed install
+
+export COLUMNSTORE_INSTALL_DIR=$COLUMNSTORE_INSTALL_DIR
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH
+$installdir/bin/postConfigure -i $installdir -d
+
 If installing on a non-pm1 using the non-distributed option:
 
-export COLUMNSTORE_INSTALL_DIR=$installdir
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$installdir/lib:$installdir/mysql/lib
+export COLUMNSTORE_INSTALL_DIR=$COLUMNSTORE_INSTALL_DIR
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH
 $installdir/bin/columnstore start
 
 EOD
@@ -300,10 +347,14 @@ EOD
 cat <<EOD
 The next step is:
 
-If installing on a pm1 node:
+If installing on a pm1 node using non-distributed install
 
 $installdir/bin/postConfigure
 
+If installing on a pm1 node using distributed install
+
+$installdir/bin/postConfigure -d
+
 If installing on a non-pm1 using the non-distributed option:
 
 $installdir/bin/columnstore start
@@ -317,7 +368,7 @@ else
 	chmod 755 $installdir/bin/setenv-hdfs-20
 
 	. $installdir/bin/setenv-hdfs-20
-	$installdir/bin/hdfsCheck $installdir/lib/hdfs-20.so > /tmp/hdfs-20-test.log 2>&1
+	$installdir/bin/hdfsCheck $installdir/lib/hdfs-20.so > $tmpDir/hdfs-20-test.log 2>&1
 	if [ $? -eq 0 ]; then
 		#Passed set in config file
 		$installdir/bin/setConfig -d SystemConfig DataFilePlugin $installdir/lib/hdfs-20.so
@@ -331,29 +382,29 @@ If you are intending to install MariaDB Columnstore over Hadoop, the next steps
 
 If installing on a pm1 node:
 
-export COLUMNSTORE_INSTALL_DIR=$installdir
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$installdir/lib:$installdir/mysql/lib
+export COLUMNSTORE_INSTALL_DIR=$COLUMNSTORE_INSTALL_DIR
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH
 . $installdir/bin/setenv-hdfs-20
 $installdir/bin/postConfigure -i $installdir
 
 If installing on a non-pm1 using the non-distributed option:
 
-export COLUMNSTORE_INSTALL_DIR=$installdir
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$installdir/lib:$installdir/mysql/lib
+export COLUMNSTORE_INSTALL_DIR=$COLUMNSTORE_INSTALL_DIR
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH
 $installdir/bin/columnstore start
 
 If you are intending to install MariaDB Columnstore without Hadoop, the next steps are:
 
 If installing on a pm1 node:
 
-export COLUMNSTORE_INSTALL_DIR=$installdir
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$installdir/lib:$installdir/mysql/lib
+export COLUMNSTORE_INSTALL_DIR=$COLUMNSTORE_INSTALL_DIR
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH
 $installdir/bin/postConfigure -i $installdir
 
 If installing on a non-pm1 using the non-distributed option:
 
-export COLUMNSTORE_INSTALL_DIR=$installdir
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$installdir/lib:$installdir/mysql/lib
+export COLUMNSTORE_INSTALL_DIR=$COLUMNSTORE_INSTALL_DIR
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH
 $installdir/bin/columnstore start
 
 EOD
@@ -384,7 +435,7 @@ EOD
 		fi
 	else
 		. $installdir/bin/setenv-hdfs-12
-		$installdir/bin/hdfsCheck $installdir/lib/hdfs-12.so > /tmp/hdfs-12-test.log 2>&1
+		$installdir/bin/hdfsCheck $installdir/lib/hdfs-12.so > $tmpDir/hdfs-12-test.log 2>&1
 		if [ $? -eq 0 ]; then
 			#Passed set in config file
 			$installdir/bin/setConfig -d SystemConfig DataFilePlugin $installdir/lib/hdfs-12.so
@@ -397,8 +448,8 @@ If you are intending to install MariaDB Columnstore over Hadoop, the next steps
 
 If installing on a pm1 node:
 
-export COLUMNSTORE_INSTALL_DIR=$installdir
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$installdir/lib:$installdir/mysql/lib:$libpath
+export COLUMNSTORE_INSTALL_DIR=$COLUMNSTORE_INSTALL_DIR
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH
 . $installdir/bin/setenv-hdfs-12
 $installdir/bin/postConfigure -i $installdir
 
@@ -406,8 +457,8 @@ If you are intending to install MariaDB Columnstore without Hadoop, the next ste
 
 If installing on a pm1 node:
 
-export COLUMNSTORE_INSTALL_DIR=$installdir
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$installdir/lib:$installdir/mysql/lib
+export COLUMNSTORE_INSTALL_DIR=$COLUMNSTORE_INSTALL_DIR
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH
 . $installdir/bin/setenv-hdfs-12
 $installdir/bin/postConfigure -i $installdir
 
diff --git a/oam/install_scripts/post-mysql-install b/oam/install_scripts/post-mysql-install
index 421d5b77f..ae5970ffe 100755
--- a/oam/install_scripts/post-mysql-install
+++ b/oam/install_scripts/post-mysql-install
@@ -7,16 +7,16 @@
 # check log for error
 checkForError() {
 	# check for password error
-	grep "ERROR 1045" /tmp/mysql_install.log > /tmp/error.check
-	if [ `cat /tmp/error.check | wc -c` -ne 0 ]; then
+	grep "ERROR 1045" ${tmpdir}/mysql_install.log > ${tmpdir}/error.check
+	if [ `cat ${tmpdir}/error.check | wc -c` -ne 0 ]; then
 		  echo "MySQL Password file missing or incorrect, check .my.cnf file"
-		  rm -f /tmp/error.check
+		  rm -f ${tmpdir}/error.check
 		  $installdir/mysql/mysql-Columnstore stop
 		  sleep 2
 		  exit 2;
 	fi
 
-	rm -f /tmp/error.check
+	rm -f ${tmpdir}/error.check
 
         #---------------------------------------------------------------------------
         # See if engine columnstore exist
@@ -24,7 +24,7 @@ checkForError() {
         echo "checking for engine columnstore..."
         $installdir/mysql/bin/mysql \
                 --defaults-extra-file=$installdir/mysql/my.cnf \
-                --user=root $pwprompt \
+                --user=root \
                 --execute='show engines;' \
                 calpontsys | grep -i columnstore
 
@@ -44,8 +44,8 @@ checkForError() {
 prefix=/usr/local
 installdir=$prefix/mariadb/columnstore
 rpmmode=install
-password=
-pwprompt=
+tmpdir="/tmp"
+
 for arg in "$@"; do
 	if [ $(expr -- "$arg" : '--prefix=') -eq 9 ]; then
 		prefix="$(echo $arg | awk -F= '{print $2}')"
@@ -55,6 +55,8 @@ for arg in "$@"; do
 	elif [ $(expr -- "$arg" : '--installdir=') -eq 13 ]; then
 		installdir="$(echo $arg | awk -F= '{print $2}')"
 		prefix=$(dirname $installdir)
+	elif [ $(expr -- "$arg" : '--tmpdir=') -eq 9 ]; then
+		tmpdir="$(echo $arg | awk -F= '{print $2}')"
 	else
 		echo "ignoring unknown argument: $arg" 1>&2
 	fi
@@ -62,7 +64,7 @@ done
 
 USER=`whoami 2>/dev/null`
 if [ $USER != "root" ]; then
-	sudo ldconfig >/dev/null 2>&1
+	ldconfig >/dev/null 2>&1
 	export COLUMNSTORE_INSTALL_DIR=$installdir
 	export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$COLUMNSTORE_INSTALL_DIR/lib:$COLUMNSTORE_INSTALL_DIR/mysql/lib
 else
@@ -101,13 +103,13 @@ if [ -x $installdir/mysql/mysql-Columnstore ]; then
 	$installdir/mysql/mysql-Columnstore start
 
 	sleep 5
-
+	
 	# Install various Calpont stuff...
-	$installdir/mysql/install_calpont_mysql.sh  --installdir=$installdir
+	$installdir/mysql/install_calpont_mysql.sh  --installdir=$installdir --tmpdir=$tmpdir
 	checkForError
 	if [ $? -ne 0 ]; then
 	# retry
-		$installdir/mysql/install_calpont_mysql.sh --installdir=$installdir
+		$installdir/mysql/install_calpont_mysql.sh --installdir=$installdir --tmpdir=$tmpdir
 		checkForError
 		if [ $? -ne 0 ]; then
 			echo "ERROR: Invalid password in .my.cnf, or Columnstore plugin install missing"
diff --git a/oam/install_scripts/post-mysqld-install b/oam/install_scripts/post-mysqld-install
index e712b2813..939f48006 100755
--- a/oam/install_scripts/post-mysqld-install
+++ b/oam/install_scripts/post-mysqld-install
@@ -8,6 +8,11 @@ prefix=/usr/local
 installdir=$prefix/mariadb/columnstore
 rpmmode=install
 user=mysql
+tmpdir="/tmp"
+
+password=" "
+pwprompt=
+
 if [ $EUID -ne 0 ]; then
 	USER=`whoami 2>/dev/null`
 	user=$USER
@@ -24,6 +29,10 @@ for arg in "$@"; do
 		prefix=`dirname $installdir`
 	elif [ `expr -- "$arg" : '--user='` -eq 7 ]; then
 		user="`echo $arg | awk -F= '{print $2}'`"
+	elif [ $(expr -- "$arg" : '--password=') -eq 11 ]; then
+		password="$(echo $arg | awk -F= '{print $2}')"
+	elif [ $(expr -- "$arg" : '--tmpdir=') -eq 9 ]; then
+		tmpdir="$(echo $arg | awk -F= '{print $2}')"
 	else
 		echo "post-mysqld-install: ignoring unknown argument: $arg" 1>&2
 	fi
@@ -68,6 +77,45 @@ fi
 # InfiniDB testing hook...
 test -x /usr/local/bin/idb-testing-mysql-pre-start && /usr/local/bin/idb-testing-mysql-pre-start $installdir/mysql
 
+# If DB exist, run upgrade script if it exist
+if [ -d $installdir/mysql/db/calpontsys ]; then
+
+	if [ -x $installdir/mysql/mysql-Columnstore ]; then
+		# Restart in the same way that mysqld will be started normally.
+		$installdir/mysql/mysql-Columnstore stop >/dev/null 2>&1
+		sleep 2
+		$installdir/mysql/mysql-Columnstore start
+
+		sleep 5
+		
+		# Run MariaDB (mysql) upgrade script, if it exist
+		if [ -x $installdir/mysql/bin/mysql_upgrade ]; then
+			echo "Running mysql_upgrade script"
+			if [[ ${password} == " " ]]; then
+				$installdir/mysql/bin/mysql_upgrade --defaults-file=$installdir/mysql/my.cnf > $tmpdir/mysql_upgrade.log
+				if [ $? -ne 0 ]; then
+					echo "ERROR: mysql_upgrade failure, check $tmpdir/mysql_upgrade.log"
+					$installdir/mysql/mysql-Columnstore stop
+					sleep 2
+					exit 2;
+				fi
+			else
+				$installdir/mysql/bin/mysql_upgrade --defaults-file=$installdir/mysql/my.cnf --password=$password  > $tmpdir/mysql_upgrade.log
+				if [ $? -ne 0 ]; then
+					echo "ERROR: mysql_upgrade failure, check $tmpdir/mysql_upgrade.log"
+					$installdir/mysql/mysql-Columnstore stop
+					sleep 2
+					exit 2;
+				fi
+			fi
+		fi
+		
+		# stop
+		$installdir/mysql/mysql-Columnstore stop
+		sleep 2
+	fi
+fi
+
 ### Don't give the user the notes, we'll fix them ourselves...
 $installdir/mysql/scripts/mysql_install_db --rpm --user=$user --defaults-extra-file=$installdir/mysql/my.cnf --basedir=$installdir/mysql >/dev/null
 # Change permissions again to fix any new files.
diff --git a/oam/install_scripts/pre-uninstall b/oam/install_scripts/pre-uninstall
index 2f58b5421..3154e1db4 100755
--- a/oam/install_scripts/pre-uninstall
+++ b/oam/install_scripts/pre-uninstall
@@ -2,16 +2,12 @@
 #
 # $Id: post-uninstall 421 2007-04-05 15:46:55Z dhill $
 #
-# Post-uninstall steps for columnstore install
+# pre-uninstall steps for columnstore install
 
 prefix=/usr/local
 installdir=$prefix/mariadb/columnstore
 rpmmode=install
 user=`whoami 2>/dev/null`
-SUDO=" "
-if [ $user != "root" ]; then
-        SUDO="sudo "
-fi
 
 quiet=0
 
@@ -24,12 +20,15 @@ for arg in "$@"; do
 	elif [ `expr -- "$arg" : '--installdir='` -eq 13 ]; then
 		installdir="`echo $arg | awk -F= '{print $2}'`"
 		prefix=`dirname $installdir`
+		prefix=`dirname $prefix`
 	elif [ `expr -- "$arg" : '--user='` -eq 7 ]; then
 		user="`echo $arg | awk -F= '{print $2}'`"
 	elif [ `expr -- "$arg" : '--quiet'` -eq 7 ]; then
 		quiet=1
 	else
-		echo "post-uninstall: ignoring unknown argument: $arg" 1>&2
+		echo "pre-install: invalid unknown argument: $arg" 1>&2
+		echo "exiting..."
+		exit 1
 	fi
 done
 
@@ -37,64 +36,61 @@ done
 $installdir/bin/columnstore stop > /dev/null 2>&1
 $installdir/myql/columnstore-Mysql stop > /dev/null 2>&1
 
-# uninstall OS scripts updated by postConfigure
-if test -f /etc/exports.columnstoreSave ; then
-	$SUDO mv -f /etc/exports.columnstoreSave /etc/exports > /dev/null 2>&1
-else
-	$SUDO rm -f /etc/exports > /dev/null 2>&1
+if [ $user != "root" ]; then
+	export COLUMNSTORE_INSTALL_DIR=$installdir
+	export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$installdir/lib:$installdir/mysql/lib
 fi
 
-export COLUMNSTORE_INSTALL_DIR=$installdir
-
-cloud=`$COLUMNSTORE_INSTALL_DIR/bin/getConfig Installation Cloud`
+cloud=`$installdir/bin/getConfig Installation Cloud`
 if [ $cloud = "amazon-ec2" ] || [ $cloud = "amazon-vpc" ]; then
 	if test -f /etc/fstab ; then
-		$SUDO sed -i '/Columnstore\/data/d' /etc/fstab > /dev/null 2>&1
+	    sed -i '/Columnstore\/data/d' /etc/fstab > /dev/null 2>&1
 	fi
 fi
- 
-#remove log file directories
-#rm -rf /var/log/mariadb/columnstore > /dev/null 2>&1
-#rm -f $installdir/mysql/db/*.err > /dev/null 2>&1
-$SUDO rm -f /var/log/mariadb/columnstore/activeAlarms > /dev/null 2>&1
-$SUDO rm -f /var/log/mariadb/columnstore/*.log1 > /dev/null 2>&1
-rm -rf $installdir/mysql/db/columnstore_log_archive > /dev/null 2>&1
-$SUDO rm -f /etc/default/columnstore
 
-# remove Mariab Columnstore Log Rotate File abd Transaction Log File
-$SUDO rm -f /etc/logrotate.d/columnstore > /dev/null 2>&1
-$SUDO rm -f /etc/cron.d/transactionLog > /dev/null 2>&1
+#remove profile file
+if [ $user != "root" ]; then
+	if [ -f $prefix/.bash_profile ]; then		
+		profileFile=$prefix/.bash_profile
+	elif [ -f $prefix/.profile ]; then		
+		profileFile=$prefix/.profile
+	else
+		profileFile=$prefix/.bashrc
+		touch $prefix/.bashrc
+	fi
+
+	if [ -f ${profileFile}_backup ] ; then
+	    mv -f ${profileFile}_backup $profileFile
+	fi
+else
+	rm -f /etc/profile.d/columnstoreAlias.sh
+fi
+
+#remove log file directories
+if [ $user == "root" ]; then
+	rm -f /var/log/mariadb/columnstore/activeAlarms > /dev/null 2>&1
+	rm -f /var/log/mariadb/columnstore/*.log1 > /dev/null 2>&1
+fi
+
+rm -rf $installdir/mysql/db/columnstore_log_archive > /dev/null 2>&1\
 
 # delete Mariab Columnstore shared memory segments
 $installdir/bin/clearShm  > /dev/null 2>&1
 
-# delete prat files
-$SUDO rm -f /etc/cron.d/ps > /dev/null 2>&1
-$SUDO rm -f /etc/pscollect > /dev/null 2>&1
-$SUDO /etc/init.d/crond reload  > /dev/null 2>&1
-$SUDO systemctl reload crond.service > /dev/null 2>&1
-
-# delete tmp files
+#get temp directory
+tmpDir=`$installdir/bin/getConfig SystemConfig SystemTempFileDir`
+if [[ $tmpDir = *"tmp" ]]; then
+	# delete tmp files
+	rm -rf $tmpDir/*
+fi
 rm -f $installdir/local/*.columnstore
 rm -rf $installdir/local/etc/
-rm -rf /tmp/bucketreuse
-rm -f /tmp/columnstore.txt
-rm -f /tmp/dbbuilder.*
-rm -f /tmp/dbrmfiles
-$SUDO rm -f /var/lock/subsys/columnstore
-rm -f /tmp/pkgcheck
-rm -f /tmp/upgrade-status.log.*
-rm -f /tmp/mount.log
-rm -f $installdir/data/bulk/tmpjob/* >/dev/null 2>&1
-rm -rf /tmp/columnstore_tmp_files
+rm -f $installdir/data/bulk/tmp/job/* >/dev/null 2>&1
 rm -f $installdir/local/moveDbrootTransactionLog
 
-#delete any old setenv files under home directory
-if [ $user = "root" ]; then
-	rm -f /root/setenv-hdfs*
-else
-	rm -f /home/$user/setenv-hdfs*
-fi
+lockdir=`$installdir/bin/getConfig Installation LockFileDirectory`
+rm -f $lockdir/columnstore
+rm -f $lockdir/mysql-Columnstore
 
 # delete core files
 #rm -f /var/log/mariadb/columnstore/corefiles/* > /dev/null 2>&1
@@ -103,8 +99,6 @@ fi
 if [ -x $installdir/bin/syslogSetup.sh ]; then
 	if [ $user = "root" ]; then
 		$installdir/bin/syslogSetup.sh uninstall >/dev/null 2>&1
-	else
-		$SUDO $installdir/bin/syslogSetup.sh uninstall >/dev/null 2>&1
 	fi
 fi
 
@@ -141,26 +135,29 @@ if [ $quiet != 1 ]; then
 	rm -f $installdir/etc/AlarmConfig.xml.installSave
 fi
 
-#umount file systems
-if [ $user = "root" ]; then
-	rm -f $installdir/data*/OAMdbrootCheck > /dev/null 2>&1
-else
-	$SUDO rm -f $installdir/data*/OAMdbrootCheck > /dev/null 2>&1
-fi
+#remove OAMdbrootCheck file
+rm -f $installdir/data*/OAMdbrootCheck > /dev/null 2>&1
 
 #remove library paths
 if [ $user = "root" ]; then
         rm -f /etc/ld.so.conf.d/columnstore.conf
         ldconfig
 else
-	$SUDO rm -f /etc/defaults/columnstore
-fi
+	rm -f /etc/default/columnstore
+
+cat <<EOD
+
+NOTE: For non-root install, you will need to run the following commands as root user to
+      uninstall the MariaDB ColumnStore System Logging. This can be skipped if
+      running this script as part of an upgrade
+
+export COLUMNSTORE_INSTALL_DIR=$COLUMNSTORE_INSTALL_DIR
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH
+$installdir/bin/syslogSetup.sh --installdir=$installdir --user=$user uninstall
+
+
+EOD
 
-#cleanup profile file
-if [ $user = "root" ]; then
-	rm -f /etc/profile.d/columnstore*
-else
-	$SUDO rm -f /etc/profile.d/columnstore*
 fi
 
 #tell user to run post configure script
diff --git a/oam/install_scripts/remote_command.sh b/oam/install_scripts/remote_command.sh
index 75095632e..85e76306f 100755
--- a/oam/install_scripts/remote_command.sh
+++ b/oam/install_scripts/remote_command.sh
@@ -16,9 +16,9 @@ set PASSWORD [lindex $argv 1]
 set COMMAND [lindex $argv 2]
 set DEBUG [lindex $argv 3]
 
-exec whoami >/tmp/whoami.tmp
-set USERNAME [exec cat /tmp/whoami.tmp]
-exec rm -f /tmp/whoami.tmp
+exec whoami >whoami.tmp
+set USERNAME [exec cat whoami.tmp]
+exec rm -f whoami.tmp
 
 set UNM [lindex $argv 4]
 if { $UNM != "" && $UNM != "-" } {
diff --git a/oam/install_scripts/remote_scp_get.sh b/oam/install_scripts/remote_scp_get.sh
index 61a1de219..96b8d644e 100755
--- a/oam/install_scripts/remote_scp_get.sh
+++ b/oam/install_scripts/remote_scp_get.sh
@@ -7,9 +7,9 @@
 # Argument 2 - Remote Server root password
 # Argument 3 - Command
 set timeout 10
-exec whoami >/tmp/whoami.tmp
-set USERNAME [exec cat /tmp/whoami.tmp]
-exec rm -f /tmp/whoami.tmp
+exec whoami > whoami.tmp
+set USERNAME [exec cat whoami.tmp]
+exec rm -f whoami.tmp
 set SERVER [lindex $argv 0]
 set PASSWORD [lindex $argv 1]
 set FILE [lindex $argv 2]
diff --git a/oam/install_scripts/remote_scp_put.sh b/oam/install_scripts/remote_scp_put.sh
index c94ea666e..cee9211a7 100644
--- a/oam/install_scripts/remote_scp_put.sh
+++ b/oam/install_scripts/remote_scp_put.sh
@@ -7,9 +7,9 @@
 # Argument 2 - Remote Server root password
 # Argument 3 - Command
 set timeout 30
-exec whoami >/tmp/whoami.tmp
-set USERNAME [exec cat /tmp/whoami.tmp]
-exec rm -f /tmp/whoami.tmp
+exec whoami >whoami.tmp
+set USERNAME [exec cat whoami.tmp]
+exec rm -f whoami.tmp
 set SERVER [lindex $argv 0]
 set PASSWORD [lindex $argv 1]
 set FILE [lindex $argv 2]
diff --git a/oam/install_scripts/run.sh b/oam/install_scripts/run.sh
index 0cef59ffe..59523337d 100755
--- a/oam/install_scripts/run.sh
+++ b/oam/install_scripts/run.sh
@@ -3,13 +3,14 @@
 # $Id$
 #
 
-usage="usage: run.sh [-vh] [-s sleep] [-t tries] executable"
+usage="usage: run.sh [-vh] [-s sleep] [-t tries] [-l logDir] executable"
 
 vflg=0
 sopt="5"
 topt="0"
+lopt="/tmp/columnstore_tmp_files"
 
-while getopts "vs:t:h" flag; do
+while getopts "vs:t:l:h" flag; do
 	case $flag in
 	v) vflg=1
 		;;
@@ -17,6 +18,8 @@ while getopts "vs:t:h" flag; do
 		;;
 	t) topt=$OPTARG
 		;;
+	l) lopt=$OPTARG
+		;;
 	h) echo $usage
 		exit 0
 		;;
@@ -26,9 +29,9 @@ while getopts "vs:t:h" flag; do
 	esac
 done
 
-shift $((OPTIND - 1))
+shift $((OPTIND-1))
 
-exename="$1"
+exename="$@"
 
 if [ -z "$exename" ]; then
 	echo $usage 1>&2
@@ -47,7 +50,7 @@ fi
 
 while [ $keep_going -ne 0 ]; do
 	$exename $args
-	if [ -e /tmp/StopColumnstore ]; then
+	if [ -e ${lopt}/StopColumnstore ]; then
 		exit 0
 	fi
 	if [ $topt -gt 0 -a $retries -ge $topt ]; then
diff --git a/oam/install_scripts/slave-rep-columnstore.sh b/oam/install_scripts/slave-rep-columnstore.sh
index ae8914237..bb4c5b6af 100644
--- a/oam/install_scripts/slave-rep-columnstore.sh
+++ b/oam/install_scripts/slave-rep-columnstore.sh
@@ -8,13 +8,13 @@
 
 # check log for error
 checkForError() {
-	grep ERROR /tmp/slave-rep-status.log > /tmp/error.check
-	if [ `cat /tmp/error.check | wc -c` -ne 0 ]; then
-		echo "ERROR: check log file: /tmp/slave-rep-status.log"
-		rm -f /tmp/error.check
+	grep ERROR ${tmpdir}/slave-rep-status.log > ${tmpdir}/error.check
+	if [ `cat ${tmpdir}/error.check | wc -c` -ne 0 ]; then
+		echo "ERROR: check log file: ${tmpdir}/slave-rep-status.log"
+		rm -f ${tmpdir}/error.check
 		exit 1
 	fi
-	rm -f /tmp/error.check
+	rm -f ${tmpdir}/error.check
 }
 
 prefix=/usr/local
@@ -35,6 +35,8 @@ for arg in "$@"; do
 		masterlogpos="`echo $arg | awk -F= '{print $2}'`"
 	elif [ `expr -- "$arg" : '--port='` -eq 7 ]; then
 		port="`echo $arg | awk -F= '{print $2}'`"
+	elif [ $(expr -- "$arg" : '--tmpdir=') -eq 9 ]; then
+		tmpdir="$(echo $arg | awk -F= '{print $2}')"
 	fi
 done
 
@@ -43,29 +45,29 @@ test -f $installdir/post/functions && . $installdir/post/functions
 repUser="idbrep"
 password="Calpont1"
 
->/tmp/slave-rep-status.log
+>${tmpdir}/slave-rep-status.log
 
 #
 # Run stop slave command
 #
-echo "Run stop slave command" >>/tmp/slave-rep-status.log
-cat >/tmp/idb_slave-rep.sql <<EOD
+echo "Run stop slave command" >>${tmpdir}/slave-rep-status.log
+cat >${tmpdir}/idb_slave-rep.sql <<EOD
 stop slave;
 EOD
 
-cat /tmp/idb_slave-rep.sql >>/tmp/slave-rep-status.log
+cat ${tmpdir}/idb_slave-rep.sql >>${tmpdir}/slave-rep-status.log
 $installdir/mysql/bin/mysql \
 	--defaults-extra-file=$installdir/mysql/my.cnf \
 	--user=root \
-	calpontsys </tmp/idb_slave-rep.sql >>/tmp/slave-rep-status.log 2>&1
+	calpontsys <${tmpdir}/idb_slave-rep.sql >>${tmpdir}/slave-rep-status.log 2>&1
 
 checkForError
 
 #
 # Run Change Master Command
 #
-echo "Run Change Master Command" >>/tmp/slave-rep-status.log
-cat >/tmp/idb_slave-rep.sql <<EOD
+echo "Run Change Master Command" >>${tmpdir}/slave-rep-status.log
+cat >${tmpdir}/idb_slave-rep.sql <<EOD
 CHANGE MASTER TO
     	MASTER_HOST='$masteripaddr',
     	MASTER_USER='$repUser',
@@ -76,43 +78,43 @@ CHANGE MASTER TO
 
 EOD
 
-cat /tmp/idb_slave-rep.sql >>/tmp/slave-rep-status.log
+cat ${tmpdir}/idb_slave-rep.sql >>${tmpdir}/slave-rep-status.log
 $installdir/mysql/bin/mysql \
 	--defaults-extra-file=$installdir/mysql/my.cnf \
 	--user=root \
-	calpontsys </tmp/idb_slave-rep.sql >>/tmp/slave-rep-status.log 2>&1
+	calpontsys <${tmpdir}/idb_slave-rep.sql >>${tmpdir}/slave-rep-status.log 2>&1
 
 checkForError
 
 #
 # Run start slave command
 #
-echo "Run start slave command" >>/tmp/slave-rep-status.log
-cat >/tmp/idb_slave-rep.sql <<EOD
+echo "Run start slave command" >>${tmpdir}/slave-rep-status.log
+cat >${tmpdir}/idb_slave-rep.sql <<EOD
 start slave;
 EOD
 
-cat /tmp/idb_slave-rep.sql >>/tmp/slave-rep-status.log
+cat ${tmpdir}/idb_slave-rep.sql >>${tmpdir}/slave-rep-status.log
 $installdir/mysql/bin/mysql \
 	--defaults-extra-file=$installdir/mysql/my.cnf \
 	--user=root \
-	calpontsys </tmp/idb_slave-rep.sql >>/tmp/slave-rep-status.log 2>&1
+	calpontsys <${tmpdir}/idb_slave-rep.sql >>${tmpdir}/slave-rep-status.log 2>&1
 
 checkForError
 
 #
 # Run SHOW SLAVE STATUS
 #
-echo "Run SHOW SLAVE STATUS to node log" >>/tmp/slave-rep-status.log
-cat >/tmp/idb_slave-rep.sql <<EOD
+echo "Run SHOW SLAVE STATUS to node log" >>${tmpdir}/slave-rep-status.log
+cat >${tmpdir}/idb_slave-rep.sql <<EOD
 SHOW SLAVE STATUS\G
 EOD
 
-cat /tmp/idb_slave-rep.sql >>/tmp/slave-rep-status.log
+cat ${tmpdir}/idb_slave-rep.sql >>${tmpdir}/slave-rep-status.log
 $installdir/mysql/bin/mysql \
 	--defaults-extra-file=$installdir/mysql/my.cnf \
 	--user=root \
-	calpontsys </tmp/idb_slave-rep.sql >>/tmp/slave-rep-status.log 2>&1
+	calpontsys <${tmpdir}/idb_slave-rep.sql >>${tmpdir}/slave-rep-status.log 2>&1
 
 checkForError
 
diff --git a/oam/install_scripts/slave-rep-infinidb.sh b/oam/install_scripts/slave-rep-infinidb.sh
deleted file mode 100644
index d9d41def6..000000000
--- a/oam/install_scripts/slave-rep-infinidb.sh
+++ /dev/null
@@ -1,119 +0,0 @@
-#!/bin/bash
-#
-# $Id$
-#
-# generic InfiniDB Slave Replication script.
-#
-# Notes: This script gets run by ProcMon during installs and upgrades:
-
-# check log for error
-checkForError() {
-	grep ERROR /tmp/slave-rep-status.log > /tmp/error.check
-	if [ `cat /tmp/error.check | wc -c` -ne 0 ]; then
-		echo "ERROR: check log file: /tmp/slave-rep-status.log"
-		rm -f /tmp/error.check
-		exit 1
-	fi
-	rm -f /tmp/error.check
-}
-
-prefix=/usr/local
-installdir=$prefix/mariadb/columnstore
-pwprompt=
-for arg in "$@"; do
-	if [ `expr -- "$arg" : '--prefix='` -eq 9 ]; then
-		prefix="`echo $arg | awk -F= '{print $2}'`"
-		installdir=$prefix/mariadb/columnstore
-	elif [ `expr -- "$arg" : '--password='` -eq 11 ]; then
-		password="`echo $arg | awk -F= '{print $2}'`"
-		pwprompt="--password=$password"
-	elif [ `expr -- "$arg" : '--installdir='` -eq 13 ]; then
-		installdir="`echo $arg | awk -F= '{print $2}'`"
-		prefix=`dirname $installdir`
-	elif [ `expr -- "$arg" : '--masteripaddr='` -eq 15 ]; then
-		masteripaddr="`echo $arg | awk -F= '{print $2}'`"
-	elif [ `expr -- "$arg" : '--masterlogfile='` -eq 16 ]; then
-		masterlogfile="`echo $arg | awk -F= '{print $2}'`"
-	elif [ `expr -- "$arg" : '--masterlogpos='` -eq 15 ]; then
-		masterlogpos="`echo $arg | awk -F= '{print $2}'`"
-	elif [ `expr -- "$arg" : '--port='` -eq 7 ]; then
-		port="`echo $arg | awk -F= '{print $2}'`"
-	fi
-done
-
-test -f $installdir/post/functions && . $installdir/post/functions
-
-repUser="idbrep"
-password="Calpont1"
-
->/tmp/slave-rep-status.log
-
-#
-# Run stop slave command
-#
-echo "Run stop slave command" >>/tmp/slave-rep-status.log
-cat >/tmp/idb_slave-rep.sql <<EOD
-stop slave;
-EOD
-
-cat /tmp/idb_slave-rep.sql >>/tmp/slave-rep-status.log
-$installdir/mysql/bin/mysql \
-	--defaults-extra-file=$installdir/mysql/my.cnf \
-	--user=root $pwprompt \
-	calpontsys </tmp/idb_slave-rep.sql >>/tmp/slave-rep-status.log
-
-#
-# Run Change Master Command
-#
-echo "Run Change Master Command" >>/tmp/slave-rep-status.log
-cat >/tmp/idb_slave-rep.sql <<EOD
-CHANGE MASTER TO
-    	MASTER_HOST='$masteripaddr',
-    	MASTER_USER='$repUser',
-    	MASTER_PASSWORD='$password',
-    	MASTER_PORT=$port,
-   	MASTER_LOG_FILE='$masterlogfile',
-    	MASTER_LOG_POS=$masterlogpos;
-	MASTER_USE_GTID=$masterlogpos;
-
-EOD
-
-cat /tmp/idb_slave-rep.sql >>/tmp/slave-rep-status.log
-$installdir/mysql/bin/mysql \
-	--defaults-extra-file=$installdir/mysql/my.cnf \
-	--user=root $pwprompt \
-	calpontsys </tmp/idb_slave-rep.sql >>/tmp/slave-rep-status.log
-
-#
-# Run start slave command
-#
-echo "Run start slave command" >>/tmp/slave-rep-status.log
-cat >/tmp/idb_slave-rep.sql <<EOD
-start slave;
-EOD
-
-cat /tmp/idb_slave-rep.sql >>/tmp/slave-rep-status.log
-$installdir/mysql/bin/mysql \
-	--defaults-extra-file=$installdir/mysql/my.cnf \
-	--user=root $pwprompt \
-	calpontsys </tmp/idb_slave-rep.sql >>/tmp/slave-rep-status.log
-
-#
-# Run SHOW SLAVE STATUS
-#
-echo "Run SHOW SLAVE STATUS to node log" >>/tmp/slave-rep-status.log
-cat >/tmp/idb_slave-rep.sql <<EOD
-SHOW SLAVE STATUS\G
-EOD
-
-cat /tmp/idb_slave-rep.sql >>/tmp/slave-rep-status.log
-$installdir/mysql/bin/mysql \
-	--defaults-extra-file=$installdir/mysql/my.cnf \
-	--user=root $pwprompt \
-	calpontsys </tmp/idb_slave-rep.sql >>/tmp/slave-rep-status.log
-
-checkForError
-
-#alls good, 'OK' for success
-echo "OK"
-exit 0
diff --git a/oam/install_scripts/softwareReport.sh b/oam/install_scripts/softwareReport.sh
deleted file mode 100755
index 09fcb4db6..000000000
--- a/oam/install_scripts/softwareReport.sh
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/bin/bash
-#
-# $Id: hardwareReport.sh 421 2007-04-05 15:46:55Z dhill $
-#
-if [ $1 ] ; then
-        MODULE=$1
-else
-        MODULE="pm1"
-fi
-
-if [ $2 ] ; then
-        INSTALLDIR=$2
-else
-        INSTALLDIR="/usr/local/mariadb/columnstore"
-fi
-
-USER=`whoami 2>/dev/null`
-
-if [ $USER = "root" ]; then
-	SUDO=" "
-else
-	SUDO="sudo"
-fi
-
-$SUDO rm -f /tmp/${MODULE}_softwareReport.txt
-
-{
-echo " "
-echo "******************** Software Report for ${MODULE} ********************"
-echo " "
-
-echo " "
-echo "-- Columnstore Package Details --"
-echo " "
-echo "################# mcsadmin getcolumnstoresoftwareinfo #################"
-echo " "
-$INSTALLDIR/bin/mcsadmin getsoftwareinfo
-
-echo " "
-echo "-- Columnstore Storage Configuration --"
-echo " "
-echo "################# mcsadmin getStorageConfig #################"
-echo " "
-$INSTALLDIR/bin/mcsadmin getStorageConfig
-
-} > /tmp/${MODULE}_softwareReport.txt
-
-exit 0
diff --git a/oam/install_scripts/startupTests.sh b/oam/install_scripts/startupTests.sh
index 00615518b..2c0decc4d 100755
--- a/oam/install_scripts/startupTests.sh
+++ b/oam/install_scripts/startupTests.sh
@@ -5,8 +5,27 @@
 # startupTests - perform sanity testing on system DB at system startup time
 #				 called by Process-Monitor
 
-if [ -z "$COLUMNSTORE_INSTALL_DIR" ]; then
-	test -f /etc/default/columnstore && . /etc/default/columnstore
+USER=`whoami 2>/dev/null`
+
+if [ $USER != "root" ]; then
+	prefix=$HOME
+fi
+
+if [ $USER != "root" ]; then
+	if [ -f $prefix/.bash_profile ]; then		
+		profileFile=$prefix/.bash_profile
+	elif [ -f $prefix/.profile ]; then		
+		profileFile=$prefix/.profile
+	else
+		profileFile=$prefix/.bashrc
+	fi
+		
+	. $profileFile
+fi
+
+# Source function library.
+if [ -f /etc/init.d/functions ]; then
+	. /etc/init.d/functions
 fi
 
 if [ -z "$COLUMNSTORE_INSTALL_DIR" ]; then
@@ -14,7 +33,6 @@ if [ -z "$COLUMNSTORE_INSTALL_DIR" ]; then
 fi
 
 export COLUMNSTORE_INSTALL_DIR=$COLUMNSTORE_INSTALL_DIR
-
 test -f $COLUMNSTORE_INSTALL_DIR/post/functions && . $COLUMNSTORE_INSTALL_DIR/post/functions
 
 for testScript in $COLUMNSTORE_INSTALL_DIR/post/*.sh; do
diff --git a/oam/install_scripts/syslogSetup.sh b/oam/install_scripts/syslogSetup.sh
index 78b292dac..e2d690fb4 100755
--- a/oam/install_scripts/syslogSetup.sh
+++ b/oam/install_scripts/syslogSetup.sh
@@ -13,12 +13,9 @@ syslog_conf=nofile
 rsyslog7=0
 
 user=`whoami 2>/dev/null`
-group=user
 
-SUDO=" "
-if [ "$user" != "root" ]; then
-        SUDO="sudo "
-fi
+groupname=adm
+username=syslog
 
 for arg in "$@"; do
 	if [ `expr -- "$arg" : '--prefix='` -eq 9 ]; then
@@ -27,6 +24,10 @@ for arg in "$@"; do
 	elif [ `expr -- "$arg" : '--installdir='` -eq 13 ]; then
 		installdir="`echo $arg | awk -F= '{print $2}'`"
 		prefix=`dirname $installdir`
+	elif [ `expr -- "$arg" : '--user='` -eq 7 ]; then
+		user="`echo $arg | awk -F= '{print $2}'`"
+		groupname=$user
+		username=$user
 	elif [ `expr -- "$arg" : '--..*'` -ge 3 ]; then
 		echo "ignoring unknown argument: $arg" 1>&2
 	elif [ `expr -- "$arg" : '--'` -eq 2 ]; then
@@ -46,6 +47,9 @@ fi
 columnstoreSyslogFile=$installdir/bin/columnstoreSyslog
 columnstoreSyslogFile7=$installdir/bin/columnstoreSyslog7
 
+#get temp directory
+tmpDir=`$installdir/bin/getConfig SystemConfig SystemTempFileDir`
+
 checkSyslog() {
 #check which syslog daemon is being used
 #first check which is running 
@@ -70,13 +74,13 @@ if [ "$daemon" = "nodaemon" ]; then
 
 	if [ -f /etc/syslog.conf ]; then
 		daemon="syslog"
-		$SUDO /etc/init.d/syslog start > /dev/null 2>&1
+		 /etc/init.d/syslog start > /dev/null 2>&1
 	elif [ -f /etc/rsyslog.conf ]; then
 		daemon="rsyslog"
-		$SUDO /etc/init.d/rsyslog start > /dev/null 2>&1
+		 /etc/init.d/rsyslog start > /dev/null 2>&1
 	elif [ -f /etc/init.d/syslog-ng ]; then
 		daemon="syslog-ng"
-		$SUDO /etc/init.d/syslog-ng start > /dev/null 2>&1
+		 /etc/init.d/syslog-ng start > /dev/null 2>&1
 	fi
 fi
 
@@ -100,16 +104,16 @@ if [ "$daemon" = "syslog-ng" ]; then
 	fi
 elif [ "$daemon" = "rsyslog" ]; then
 	#check if rsyslog version 7 or greater
-	$SUDO rsyslogd -v > /tmp/rsyslog.ver
-	cnt=`grep "rsyslogd 7" /tmp/rsyslog.ver | wc -l`
+	 rsyslogd -v > ${tmpDir}/rsyslog.ver
+	cnt=`grep "rsyslogd 7" ${tmpDir}/rsyslog.ver | wc -l`
 	if [ $cnt -gt 0 ]; then
 		rsyslog7=1
 	fi
-	cnt=`grep "rsyslogd 8" /tmp/rsyslog.ver | wc -l`
+	cnt=`grep "rsyslogd 8" ${tmpDir}/rsyslog.ver | wc -l`
 	if [ $cnt -gt 0 ]; then
 		rsyslog7=1
 	fi
-	cnt=`grep "rsyslogd 9" /tmp/rsyslog.ver | wc -l`
+	cnt=`grep "rsyslogd 9" ${tmpDir}/rsyslog.ver | wc -l`
 	if [ $cnt -gt 0 ]; then
 		rsyslog7=1
 	fi
@@ -152,23 +156,40 @@ fi
 
 }
 
+makeDir() {
+	test -d /var/log/mariadb/columnstore || mkdir -p /var/log/mariadb/columnstore >/dev/null 2>&1
+	test -d /var/log/mariadb/columnstore/archive || mkdir /var/log/mariadb/columnstore/archive >/dev/null 2>&1
+	test -d /var/log/mariadb/columnstore/corefiles || mkdir /var/log/mariadb/columnstore/corefiles >/dev/null 2>&1
+	test -d /var/log/mariadb/columnstore/trace || mkdir /var/log/mariadb/columnstore/trace >/dev/null 2>&1
+	chmod 777 -R /var/log/mariadb/columnstore
+	chown $user:$user -R /var/log/mariadb
+}
+
 install() {
+makeDir
 checkSyslog
 if [ ! -z "$syslog_conf" ] ; then
 	$installdir/bin/setConfig -d Installation SystemLogConfigFile ${syslog_conf} >/dev/null 2>&1
-	if [ "$syslog_conf" != /etc/rsyslog.d/columnstore.conf ]; then
-		$SUDO rm -f ${syslog_conf}.columnstoreSave
-		$SUDO cp ${syslog_conf} ${syslog_conf}.columnstoreSave >/dev/null 2>&1
-		$SUDO sed -i '/# MariaDB/,$d' ${syslog_conf}.columnstoreSave > /dev/null 2>&1
+	if [ $user != "root" ]; then
+		 chown $user:$user /home/$user/mariadb/columnstore/etc/*
+	fi 
+	
+	if [ "$syslog_conf" == /etc/rsyslog.d/columnstore.conf ] ||
+		[ "$syslog_conf" == /etc/rsyslog.d/49-columnstore.conf ]; then
+		i=1
+	else
+		rm -f ${syslog_conf}.columnstoreSave
+		cp ${syslog_conf} ${syslog_conf}.columnstoreSave >/dev/null 2>&1
+		sed -i '/# MariaDB/,$d' ${syslog_conf}.columnstoreSave > /dev/null 2>&1
 	fi
-
+	
 	egrep -qs 'MariaDB Columnstore Database Platform Logging' ${syslog_conf}
 	if [ $? -ne 0 ]; then
 		#set the syslog for ColumnStore logging
 		# remove older version incase it was installed by previous build
-		$SUDO rm -rf /etc/rsyslog.d/columnstore.conf
+		 rm -rf /etc/rsyslog.d/columnstore.conf
 
-		// determine username/groupname
+		# determine username/groupname
 		
 		if [ -f /var/log/messages ]; then
 		      user=`stat -c "%U %G" /var/log/messages | awk '{print $1}'`
@@ -180,23 +201,23 @@ if [ ! -z "$syslog_conf" ] ; then
 		      group=`stat -c "%U %G" /var/log/syslog | awk '{print $2}'`
 		fi
 		
-		//set permissions
-		$SUDO chown $user:$group -R /var/log/mariadb > /dev/null 2>&1
+		# set permissions
+		chown $user:$group -R /var/log/mariadb > /dev/null 2>&1
 		
 		if [ $rsyslog7 == 1 ]; then
-			sed -i -e s/groupname/$group/g ${columnstoreSyslogFile7}
-			sed -i -e s/username/$user/g ${columnstoreSyslogFile7}
-			
-			$SUDO rm -f /etc/rsyslog.d/49-columnstore.conf
-			$SUDO cp  ${columnstoreSyslogFile7} ${syslog_conf}
+			 rm -f /etc/rsyslog.d/49-columnstore.conf
+			 cp  ${columnstoreSyslogFile7} ${syslog_conf}
+
+			 sed -i -e s/groupname/$groupname/g ${syslog_conf}
+			 sed -i -e s/username/$username/g ${syslog_conf}
 		else		
-			$SUDO cp  ${columnstoreSyslogFile} ${syslog_conf}
+			 cp  ${columnstoreSyslogFile} ${syslog_conf}
 		fi
 	fi
 
 	# install Columnstore Log Rotate File
-	$SUDO cp $installdir/bin/columnstoreLogRotate /etc/logrotate.d/columnstore > /dev/null 2>&1
-	$SUDO chmod 644 /etc/logrotate.d/columnstore
+	 cp $installdir/bin/columnstoreLogRotate /etc/logrotate.d/columnstore > /dev/null 2>&1
+	 chmod 644 /etc/logrotate.d/columnstore
 
 	restartSyslog
 fi
@@ -212,20 +233,23 @@ if [ ! -z "$syslog_conf" ] ; then
 			if [ $? -eq 0 ]; then
 				if [ -f ${syslog_conf}.columnstoreSave ] ; then
 					#uninstall the syslog for ColumnStore logging
-					$SUDO v -f ${syslog_conf} ${syslog_conf}.ColumnStoreBackup
-					$SUDO mv -f ${syslog_conf}.columnstoreSave ${syslog_conf} >/dev/null 2>&1
+					 v -f ${syslog_conf} ${syslog_conf}.ColumnStoreBackup
+					 mv -f ${syslog_conf}.columnstoreSave ${syslog_conf} >/dev/null 2>&1
 					if [ ! -f ${syslog_conf} ] ; then
-						$SUDO cp ${syslog_conf}.ColumnStoreBackup ${syslog_conf}
+						 cp ${syslog_conf}.ColumnStoreBackup ${syslog_conf}
 					fi
 				fi
 			fi
-			$SUDO sed -i '/# MariaDB/,$d' ${syslog_conf} > /dev/null 2>&1
+			 sed -i '/# MariaDB/,$d' ${syslog_conf} > /dev/null 2>&1
 		else
-			$SUDO rm -f "$syslog_conf"
+			 rm -f "$syslog_conf"
 		fi
 	else
-		$SUDO rm -f "$syslog_conf"
+		 rm -f "$syslog_conf"
 	fi
+	
+	# uninstall Columnstore Log Rotate File
+	rm -f /etc/logrotate.d/columnstore
 
 	restartSyslog
 
@@ -264,21 +288,21 @@ restartSyslog() {
 
 	if [ "$daemon" = "syslog-ng" ]; then
 		if [ -f /etc/init.d/syslog-ng ]; then
-			$SUDO /etc/init.d/syslog-ng restart  > /dev/null 2>&1
+			 /etc/init.d/syslog-ng restart  > /dev/null 2>&1
 		else
-		        $SUDO systemctl restart syslog-ng.service > /dev/null 2>&1
+		         systemctl restart syslog-ng.service > /dev/null 2>&1
 		fi
 	elif [ "$daemon" = "rsyslog" ]; then
                 if [ -f /etc/init.d/rsyslog ]; then
-                        $SUDO /etc/init.d/rsyslog restart  > /dev/null 2>&1
+                         /etc/init.d/rsyslog restart  > /dev/null 2>&1
                 else
-                        $SUDO systemctl restart rsyslog.service > /dev/null 2>&1
+                         systemctl restart rsyslog.service > /dev/null 2>&1
                 fi
 	elif [ "$daemon" = "syslog" ]; then	
                 if [ -f /etc/init.d/syslog ]; then
-                        $SUDO /etc/init.d/syslog restart  > /dev/null 2>&1
+                         /etc/init.d/syslog restart  > /dev/null 2>&1
                 else
-                        $SUDO systemctl restart syslog.service > /dev/null 2>&1
+                         systemctl restart syslog.service > /dev/null 2>&1
                 fi
 	fi
 }
diff --git a/oam/install_scripts/upgrade-columnstore.sh b/oam/install_scripts/upgrade-columnstore.sh
deleted file mode 100755
index 9e54e78a5..000000000
--- a/oam/install_scripts/upgrade-columnstore.sh
+++ /dev/null
@@ -1,444 +0,0 @@
-#!/bin/bash
-#
-# $Id$
-#
-# generic InfiniDB upgrade script.
-#
-# Notes: This script gets run every time InfiniDB starts up so it needs to be:
-#           1) able to only do stuff once if needed and nothing if not needed
-#           2) reasonably fast when there's nothing to do
-
-# check log for error
-checkForError() {
-	grep ERROR /tmp/upgrade-status.log.$$ > /tmp/error.check
-	if [ `cat /tmp/error.check | wc -c` -ne 0 ]; then
-		echo "ERROR: check log file: /tmp/upgrade-status.log.$$"
-		rm -f /tmp/error.check
-		exit 1;
-	fi
-	rm -f /tmp/error.check
-}
-
-if [ "x$1" != xdoupgrade ]; then
-	echo "Don't run this script by hand! You probably want to use install-infinidb.sh." 1>&2
-	exit 1
-fi
-
-prefix=/usr/local
-installdir=$prefix/mariadb/columnstore
-pwprompt=
-for arg in "$@"; do
-	if [ `expr -- "$arg" : '--prefix='` -eq 9 ]; then
-		prefix="`echo $arg | awk -F= '{print $2}'`"
-		installdir=$prefix/mariadb/columnstore
-	elif [ `expr -- "$arg" : '--password='` -eq 11 ]; then
-		password="`echo $arg | awk -F= '{print $2}'`"
-		pwprompt="--password=$password"
-	elif [ `expr -- "$arg" : '--installdir='` -eq 13 ]; then
-		installdir="`echo $arg | awk -F= '{print $2}'`"
-		prefix=`dirname $installdir`
-	fi
-done
-
-test -f $installdir/post/functions && . $installdir/post/functions
-
-mt=`module_type`
-mid=`module_id`
-
-# for CE version
-if [ -z "$mt" ]; then
-	mt=pm
-fi
-if [ -z "$mid" ]; then
-	mid=1
-fi
-
-has_um=`$installdir/bin/getConfig SystemModuleConfig ModuleCount2`
-if [ -z "$has_um" ]; then
-	has_um=0
-fi
-
->/tmp/upgrade-status.log.$$
-echo "mt = $mt" >>/tmp/upgrade-status.log.$$
-echo "mid = $mid" >>/tmp/upgrade-status.log.$$
-echo "has_um = $has_um" >>/tmp/upgrade-status.log.$$
-
-#This upgrade only for UM or PM with no UM
-if [ $has_um -eq 0 -o "x$mt" = xum ]; then
-	#---------------------------------------------------------------------------
-	# See if compressiontype column is in SYSCOLUMN
-	#---------------------------------------------------------------------------
-	echo "checking calpontsys for compressiontype..." >>/tmp/upgrade-status.log.$$
-	$installdir/mysql/bin/mysql \
-		--defaults-file=$installdir/mysql/my.cnf \
-		--user=root $pwprompt \
-		--execute='describe syscolumn;' \
-		calpontsys | grep compressiontype >>/tmp/upgrade-status.log.$$ 2>&1
-
-	#
-	# Add compressiontype column to SYSCOLUMN if applicable
-	#
-	if [ $? -ne 0 ]; then
-		echo "calpontsys needs upgrade for compressiontype" >>/tmp/upgrade-status.log.$$
-		echo "added compressiontype column" >>/tmp/upgrade-status.log.$$
-		cat >/tmp/idb_upgrade.sql <<EOD
-alter table syscolumn add compressiontype int comment 'schema sync only';
-EOD
-		cat /tmp/idb_upgrade.sql >>/tmp/upgrade-status.log.$$
-		$installdir/mysql/bin/mysql \
-			--defaults-file=$installdir/mysql/my.cnf \
-			--user=root $pwprompt \
-			calpontsys </tmp/idb_upgrade.sql >>/tmp/upgrade-status.log.$$ 2>&1
-
-		checkForError
-
-		if [ $mid -eq 1 ]; then
-			echo "update compressiontype to backend" >>/tmp/upgrade-status.log.$$
-			cat >/tmp/idb_upgrade.sql <<EOD
-select calonlinealter('alter table syscolumn add (compressiontype int)') as xxx;
-update syscolumn set compressiontype=0 where compressiontype is null;
-EOD
-			cat /tmp/idb_upgrade.sql >>/tmp/upgrade-status.log.$$
-			$installdir/mysql/bin/mysql \
-				--defaults-file=$installdir/mysql/my.cnf \
-				--user=root $pwprompt \
-				calpontsys </tmp/idb_upgrade.sql >>/tmp/upgrade-status.log.$$ 2>&1
-	
-			checkForError
-		fi
-
-		#
-		# Verify that compressiontype was successfully added to SYSCOLUMN
-		#
-		rm -f /tmp/idb_upgrade.sql
-		$installdir/mysql/bin/mysql \
-			--defaults-file=$installdir/mysql/my.cnf \
-			--user=root $pwprompt \
-			--execute='describe syscolumn;' \
-			calpontsys | grep compressiontype >/tmp/upgrade-status-1.log 2>&1
-		rc=$?
-		cat /tmp/upgrade-status-1.log >>/tmp/upgrade-status.log.$$
-		if [ $rc -ne 0 ]; then
-			echo "FAILED adding compressiontype to SYSCOLUMN!"
-			exit 1
-		fi
-		cnt=`wc -l /tmp/upgrade-status-1.log | awk '{print $1}'`
-		rm -f /tmp/upgrade-status-1.log
-		if [ -z "$cnt" ]; then
-			cnt=0
-		fi
-		if [ $cnt -ne 1 ]; then
-			echo "FAILED adding compressiontype to SYSCOLUMN!"
-			exit 1
-		fi
-
-		#
-		# Verify that compressiontype (OID 1041) was successfully added to BRM
-		#
-		if [ $has_um -eq 0 ]; then
-			$installdir/bin/editem -o1041 1>/tmp/upgrade-status-1.log 2>/dev/null
-			rc=$?
-			cat /tmp/upgrade-status-1.log >>/tmp/upgrade-status.log.$$
-			if [ $rc -ne 0 ]; then
-				echo "FAILED adding compressiontype to BRM!"
-				exit 1
-			fi
-			cnt=`wc -l /tmp/upgrade-status-1.log | awk '{print $1}'`
-			rm -f /tmp/upgrade-status-1.log
-			if [ -z "$cnt" ]; then
-				cnt=0
-			fi
-			if [ $cnt -lt 2 ]; then
-				echo "FAILED adding compressiontype to BRM!"
-				exit 1
-			fi
-		fi
-	fi
-
-	#---------------------------------------------------------------------------
-	# See if autoincrement column is in SYSTABLE
-	#---------------------------------------------------------------------------
-	echo "checking calpontsys for autoincrement..." >>/tmp/upgrade-status.log.$$
-	$installdir/mysql/bin/mysql \
-		--defaults-file=$installdir/mysql/my.cnf \
-		--user=root $pwprompt \
-		--execute='describe systable;' \
-		calpontsys | grep autoincrement >>/tmp/upgrade-status.log.$$ 2>&1
-
-	#
-	# Add autoincrement column to SYSTABLE if applicable
-	#
-	if [ $? -ne 0 ]; then
-		echo "calpontsys needs upgrade for autoincrement" >>/tmp/upgrade-status.log.$$
-		echo "add autoincrement columns" >>/tmp/upgrade-status.log.$$
-		cat >/tmp/idb_upgrade.sql <<EOD
-alter table systable add autoincrement int comment 'schema sync only';
-EOD
-		cat /tmp/idb_upgrade.sql >>/tmp/upgrade-status.log.$$
-		$installdir/mysql/bin/mysql \
-			--defaults-file=$installdir/mysql/my.cnf \
-			--user=root $pwprompt \
-			calpontsys </tmp/idb_upgrade.sql >>/tmp/upgrade-status.log.$$ 2>&1
-
-		checkForError
-
-		if [ $mid -eq 1 ]; then
-			echo "update autoincrement to backend" >>/tmp/upgrade-status.log.$$
-			cat >/tmp/idb_upgrade.sql <<EOD
-select calonlinealter('alter table systable add (autoincrement int)') as xxx;
-update systable set autoincrement=0 where autoincrement is null;
-EOD
-			cat /tmp/idb_upgrade.sql >>/tmp/upgrade-status.log.$$
-			$installdir/mysql/bin/mysql \
-				--defaults-file=$installdir/mysql/my.cnf \
-				--user=root $pwprompt \
-				calpontsys </tmp/idb_upgrade.sql >>/tmp/upgrade-status.log.$$ 2>&1
-	
-			checkForError
-		fi
-
-		#
-		#Verify that autoincrement was successfully added to SYSTABLE
-		#
-		rm -f /tmp/idb_upgrade.sql
-		$installdir/mysql/bin/mysql \
-			--defaults-file=$installdir/mysql/my.cnf \
-			--user=root $pwprompt \
-			--execute='describe systable;' \
-			calpontsys | grep autoincrement >/tmp/upgrade-status-1.log 2>&1
-		rc=$?
-		cat /tmp/upgrade-status-1.log >>/tmp/upgrade-status.log.$$
-		if [ $rc -ne 0 ]; then
-			echo "FAILED adding autoincrement to SYSTABLE!"
-			exit 1
-		fi
-		cnt=`wc -l /tmp/upgrade-status-1.log | awk '{print $1}'`
-		rm -f /tmp/upgrade-status-1.log
-		if [ -z "$cnt" ]; then
-			cnt=0
-		fi
-		if [ $cnt -ne 1 ]; then
-			echo "FAILED adding autoincrement to SYSTABLE!"
-			exit 1
-		fi
-
-		#
-		# Verify that autoincrement (OID 1011) was successfully added to BRM
-		#
-		if [ $has_um -eq 0 ]; then
-			$installdir/bin/editem -o1011 1>/tmp/upgrade-status-1.log 2>/dev/null
-			rc=$?
-			cat /tmp/upgrade-status-1.log >>/tmp/upgrade-status.log.$$
-			if [ $rc -ne 0 ]; then
-				echo "FAILED adding autoincrement to BRM!"
-				exit 1
-			fi
-			cnt=`wc -l /tmp/upgrade-status-1.log | awk '{print $1}'`
-			rm -f /tmp/upgrade-status-1.log
-			if [ "x$cnt" = x ]; then
-				cnt=0
-			fi
-			if [ $cnt -lt 2 ]; then
-				echo "FAILED adding autoincrement to BRM!"
-				exit 1
-			fi
-		fi
-	fi
-
-	#---------------------------------------------------------------------------
-	# See if nextvalue column is in SYSCOLUMN
-	#---------------------------------------------------------------------------
-	echo "checking calpontsys for nextvalue..." >>/tmp/upgrade-status.log.$$
-	$installdir/mysql/bin/mysql \
-		--defaults-file=$installdir/mysql/my.cnf \
-		--user=root $pwprompt \
-		--execute='describe syscolumn;' \
-		calpontsys | grep nextvalue >>/tmp/upgrade-status.log.$$ 2>&1
-
-	#
-	# Add nextvalue column to SYSCOLUMN if applicable.
-	# Also set old autoincrement column in SYSCOLUMN to 'n'.
-	#
-	if [ $? -ne 0 ]; then
-		echo "calpontsys needs upgrade for nextvalue" >>/tmp/upgrade-status.log.$$
-		echo "add nextvalue columns" >>/tmp/upgrade-status.log.$$
-		cat >/tmp/idb_upgrade.sql <<EOD
-alter table syscolumn add nextvalue bigint comment 'schema sync only';
-EOD
-		cat /tmp/idb_upgrade.sql >>/tmp/upgrade-status.log.$$
-		$installdir/mysql/bin/mysql \
-			--defaults-file=$installdir/mysql/my.cnf \
-			--user=root $pwprompt \
-			calpontsys </tmp/idb_upgrade.sql >>/tmp/upgrade-status.log.$$ 2>&1
-
-		checkForError
-
-		if [ $mid -eq 1 ]; then
-			echo "update nextvalue to backend" >>/tmp/upgrade-status.log.$$
-			cat >/tmp/idb_upgrade.sql <<EOD
-select calonlinealter('alter table syscolumn add (nextvalue bigint)') as xxx;
-update syscolumn set nextvalue=1 where nextvalue is null;
-update syscolumn set autoincrement='n' where autoincrement is null;
-EOD
-			cat /tmp/idb_upgrade.sql >>/tmp/upgrade-status.log.$$
-			$installdir/mysql/bin/mysql \
-				--defaults-file=$installdir/mysql/my.cnf \
-				--user=root $pwprompt \
-				calpontsys </tmp/idb_upgrade.sql >>/tmp/upgrade-status.log.$$ 2>&1
-	
-			checkForError
-		fi
-
-		#
-		# Verify that nextvalue was successfully added to SYSCOLUMN
-		#
-		rm -f /tmp/idb_upgrade.sql
-		$installdir/mysql/bin/mysql \
-			--defaults-file=$installdir/mysql/my.cnf \
-			--user=root $pwprompt \
-			--execute='describe syscolumn;' \
-			calpontsys | grep nextvalue >/tmp/upgrade-status-1.log 2>&1
-		rc=$?
-		cat /tmp/upgrade-status-1.log >>/tmp/upgrade-status.log.$$
-		if [ $rc -ne 0 ]; then
-			echo "FAILED adding nextvalue to SYSCOLUMN!"
-			exit 1
-		fi
-		cnt=`wc -l /tmp/upgrade-status-1.log | awk '{print $1}'`
-		rm -f /tmp/upgrade-status-1.log
-		if [ -z "$cnt" ]; then
-			cnt=0
-		fi
-		if [ $cnt -ne 1 ]; then
-			echo "FAILED adding nextvalue to SYSCOLUMN!"
-			exit 1
-		fi
-
-		#
-		# Verify that nextvalue (OID 1042) was successfully added to BRM
-		#
-		if [ $has_um -eq 0 ]; then
-			$installdir/bin/editem -o1042 1>/tmp/upgrade-status-1.log 2>/dev/null
-			rc=$?
-			cat /tmp/upgrade-status-1.log >>/tmp/upgrade-status.log.$$
-			if [ $rc -ne 0 ]; then
-				echo "FAILED adding nextvalue to BRM!"
-				exit 1
-			fi
-			cnt=`wc -l /tmp/upgrade-status-1.log | awk '{print $1}'`
-			rm -f /tmp/upgrade-status-1.log
-			if [ "x$cnt" = x ]; then
-				cnt=0
-			fi
-			if [ $cnt -lt 2 ]; then
-				echo "FAILED adding nextvalue to BRM!"
-				exit 1
-			fi
-		fi
-	fi
-
-	#---------------------------------------------------------------------------
-	# See if systable schema and tablename columns are varchar(128).
-	#---------------------------------------------------------------------------
-	recreate=0
-	echo "checking calpontsys.systable schema and tablename for varchar(128)..." >>/tmp/upgrade-status.log.$$
-	colCount=` \
-	$installdir/mysql/bin/mysql \
-		--defaults-file=$installdir/mysql/my.cnf \
-		--user=root $pwprompt \
-		--execute='describe systable;' \
-		calpontsys | egrep "schema|tablename" | grep "varchar(128)" | wc -l`
-	if [ $colCount -ne 2 ]; then
-		recreate=1
-		echo "calpontsys needs upgrade to expand systable schema and tablename" >>/tmp/upgrade-status.log.$$
-	fi
-	
-	#---------------------------------------------------------------------------
-	# See if syscolumn schema, tablename, and columname columns are varchar(128).
-	#---------------------------------------------------------------------------
-	if [ $recreate -eq 0 ]; then
-		echo "checking calpontsys.syscolumn schema, tablename, columnname for varchar(128)..." >>/tmp/upgrade-status.log.$$
-		colCount=` \
-		$installdir/mysql/bin/mysql \
-			--defaults-file=$installdir/mysql/my.cnf \
-			--user=root $pwprompt \
-			--execute='describe syscolumn;' \
-			calpontsys | egrep "schema|tablename|columnname" | grep "varchar(128)" | wc -l`
-		if [ $colCount -ne 3 ]; then
-			recreate=1
-			echo "calpontsys needs upgrade to expand syscolumn schema, tablename, and columnname" >>/tmp/upgrade-status.log.$$
-		fi
-	fi
-
-	#---------------------------------------------------------------------------
-	# See if defaultvalue column in SYSCOLUMN is varchar(64)
-	#---------------------------------------------------------------------------
-	if [ $recreate -eq 0 ]; then
-		echo "checking calpontsys for defaultvalue varchar(64)..." >>/tmp/upgrade-status.log.$$
-		$installdir/mysql/bin/mysql \
-			--defaults-file=$installdir/mysql/my.cnf \
-			--user=root $pwprompt \
-			--execute='describe syscolumn;' \
-			calpontsys | grep defaultvalue | grep 'varchar(64)' >>/tmp/upgrade-status.log.$$ 2>&1
-		if [ $? -ne 0 ]; then
-			recreate=1
-			echo "calpontsys needs upgrade to change defaultvalue" >>/tmp/upgrade-status.log.$$
-		fi
-	fi
-
-	#
-	# Change defaultvalue column to varchar(64) if applicable
-	#
-	if [ $recreate -ne 0 ]; then
-		cat >/tmp/idb_upgrade.sql <<EOD
-drop table if exists systable restrict;
-drop table if exists syscolumn restrict;
-EOD
-		cat /tmp/idb_upgrade.sql >>/tmp/upgrade-status.log.$$
-		$installdir/mysql/bin/mysql \
-			--defaults-file=$installdir/mysql/my.cnf \
-			--user=root $pwprompt \
-			calpontsys </tmp/idb_upgrade.sql >>/tmp/upgrade-status.log.$$ 2>&1
-
-		checkForError
-
-		echo "create systable and syscolumn with schema sync only" >>/tmp/upgrade-status.log.$$
-		cat $installdir/mysql/syscatalog_mysql.sql >>/tmp/upgrade-status.log.$$
-		$installdir/mysql/bin/mysql \
-			--defaults-file=$installdir/mysql/my.cnf \
-			--user=root $pwprompt \
-			calpontsys <$installdir/mysql/syscatalog_mysql.sql >>/tmp/upgrade-status.log.$$ 2>&1
-
-		checkForError
-
-		#
-		# Verify column widths:
-		# varchar(64) for syscolumn.defaultvalue
-		# varchar(128) for systable (schema, tablename) and syscolumn (schema, tablename, and columnname).
-		#
-		rm -f /tmp/idb_upgrade.sql
-		echo "verify column widths" >>/tmp/upgrade-status.log.$$
-		$installdir/mysql/bin/mysql \
-			--defaults-file=$installdir/mysql/my.cnf \
-			--user=root $pwprompt \
-			--execute='describe syscolumn;' \
-			calpontsys | grep defaultvalue | grep 'varchar(64)' >/tmp/upgrade-status-1.log 2>&1
-		$installdir/mysql/bin/mysql \
-			--defaults-file=$installdir/mysql/my.cnf \
-			--user=root $pwprompt \
-			--execute='describe systable; describe syscolumn;' \
-			calpontsys | egrep "schema|tablename|columnname" | grep 'varchar(128)' >>/tmp/upgrade-status-1.log 2>&1
-		cat /tmp/upgrade-status-1.log >>/tmp/upgrade-status.log.$$
-		cnt=`wc -l /tmp/upgrade-status-1.log | awk '{print $1}'`
-		rm -f /tmp/upgrade-status-1.log
-		if [ -z "$cnt" ]; then
-			cnt=0
-		fi
-		if [ $cnt -ne 6 ]; then
-			echo "FAILED width of schema, tablename, columnname, defaultvalue verification!"
-			exit 1
-		fi
-	fi
-fi
-
-echo "OK"
diff --git a/oam/install_scripts/upgrade-infinidb.sh b/oam/install_scripts/upgrade-infinidb.sh
deleted file mode 100755
index 9e54e78a5..000000000
--- a/oam/install_scripts/upgrade-infinidb.sh
+++ /dev/null
@@ -1,444 +0,0 @@
-#!/bin/bash
-#
-# $Id$
-#
-# generic InfiniDB upgrade script.
-#
-# Notes: This script gets run every time InfiniDB starts up so it needs to be:
-#           1) able to only do stuff once if needed and nothing if not needed
-#           2) reasonably fast when there's nothing to do
-
-# check log for error
-checkForError() {
-	grep ERROR /tmp/upgrade-status.log.$$ > /tmp/error.check
-	if [ `cat /tmp/error.check | wc -c` -ne 0 ]; then
-		echo "ERROR: check log file: /tmp/upgrade-status.log.$$"
-		rm -f /tmp/error.check
-		exit 1;
-	fi
-	rm -f /tmp/error.check
-}
-
-if [ "x$1" != xdoupgrade ]; then
-	echo "Don't run this script by hand! You probably want to use install-infinidb.sh." 1>&2
-	exit 1
-fi
-
-prefix=/usr/local
-installdir=$prefix/mariadb/columnstore
-pwprompt=
-for arg in "$@"; do
-	if [ `expr -- "$arg" : '--prefix='` -eq 9 ]; then
-		prefix="`echo $arg | awk -F= '{print $2}'`"
-		installdir=$prefix/mariadb/columnstore
-	elif [ `expr -- "$arg" : '--password='` -eq 11 ]; then
-		password="`echo $arg | awk -F= '{print $2}'`"
-		pwprompt="--password=$password"
-	elif [ `expr -- "$arg" : '--installdir='` -eq 13 ]; then
-		installdir="`echo $arg | awk -F= '{print $2}'`"
-		prefix=`dirname $installdir`
-	fi
-done
-
-test -f $installdir/post/functions && . $installdir/post/functions
-
-mt=`module_type`
-mid=`module_id`
-
-# for CE version
-if [ -z "$mt" ]; then
-	mt=pm
-fi
-if [ -z "$mid" ]; then
-	mid=1
-fi
-
-has_um=`$installdir/bin/getConfig SystemModuleConfig ModuleCount2`
-if [ -z "$has_um" ]; then
-	has_um=0
-fi
-
->/tmp/upgrade-status.log.$$
-echo "mt = $mt" >>/tmp/upgrade-status.log.$$
-echo "mid = $mid" >>/tmp/upgrade-status.log.$$
-echo "has_um = $has_um" >>/tmp/upgrade-status.log.$$
-
-#This upgrade only for UM or PM with no UM
-if [ $has_um -eq 0 -o "x$mt" = xum ]; then
-	#---------------------------------------------------------------------------
-	# See if compressiontype column is in SYSCOLUMN
-	#---------------------------------------------------------------------------
-	echo "checking calpontsys for compressiontype..." >>/tmp/upgrade-status.log.$$
-	$installdir/mysql/bin/mysql \
-		--defaults-file=$installdir/mysql/my.cnf \
-		--user=root $pwprompt \
-		--execute='describe syscolumn;' \
-		calpontsys | grep compressiontype >>/tmp/upgrade-status.log.$$ 2>&1
-
-	#
-	# Add compressiontype column to SYSCOLUMN if applicable
-	#
-	if [ $? -ne 0 ]; then
-		echo "calpontsys needs upgrade for compressiontype" >>/tmp/upgrade-status.log.$$
-		echo "added compressiontype column" >>/tmp/upgrade-status.log.$$
-		cat >/tmp/idb_upgrade.sql <<EOD
-alter table syscolumn add compressiontype int comment 'schema sync only';
-EOD
-		cat /tmp/idb_upgrade.sql >>/tmp/upgrade-status.log.$$
-		$installdir/mysql/bin/mysql \
-			--defaults-file=$installdir/mysql/my.cnf \
-			--user=root $pwprompt \
-			calpontsys </tmp/idb_upgrade.sql >>/tmp/upgrade-status.log.$$ 2>&1
-
-		checkForError
-
-		if [ $mid -eq 1 ]; then
-			echo "update compressiontype to backend" >>/tmp/upgrade-status.log.$$
-			cat >/tmp/idb_upgrade.sql <<EOD
-select calonlinealter('alter table syscolumn add (compressiontype int)') as xxx;
-update syscolumn set compressiontype=0 where compressiontype is null;
-EOD
-			cat /tmp/idb_upgrade.sql >>/tmp/upgrade-status.log.$$
-			$installdir/mysql/bin/mysql \
-				--defaults-file=$installdir/mysql/my.cnf \
-				--user=root $pwprompt \
-				calpontsys </tmp/idb_upgrade.sql >>/tmp/upgrade-status.log.$$ 2>&1
-	
-			checkForError
-		fi
-
-		#
-		# Verify that compressiontype was successfully added to SYSCOLUMN
-		#
-		rm -f /tmp/idb_upgrade.sql
-		$installdir/mysql/bin/mysql \
-			--defaults-file=$installdir/mysql/my.cnf \
-			--user=root $pwprompt \
-			--execute='describe syscolumn;' \
-			calpontsys | grep compressiontype >/tmp/upgrade-status-1.log 2>&1
-		rc=$?
-		cat /tmp/upgrade-status-1.log >>/tmp/upgrade-status.log.$$
-		if [ $rc -ne 0 ]; then
-			echo "FAILED adding compressiontype to SYSCOLUMN!"
-			exit 1
-		fi
-		cnt=`wc -l /tmp/upgrade-status-1.log | awk '{print $1}'`
-		rm -f /tmp/upgrade-status-1.log
-		if [ -z "$cnt" ]; then
-			cnt=0
-		fi
-		if [ $cnt -ne 1 ]; then
-			echo "FAILED adding compressiontype to SYSCOLUMN!"
-			exit 1
-		fi
-
-		#
-		# Verify that compressiontype (OID 1041) was successfully added to BRM
-		#
-		if [ $has_um -eq 0 ]; then
-			$installdir/bin/editem -o1041 1>/tmp/upgrade-status-1.log 2>/dev/null
-			rc=$?
-			cat /tmp/upgrade-status-1.log >>/tmp/upgrade-status.log.$$
-			if [ $rc -ne 0 ]; then
-				echo "FAILED adding compressiontype to BRM!"
-				exit 1
-			fi
-			cnt=`wc -l /tmp/upgrade-status-1.log | awk '{print $1}'`
-			rm -f /tmp/upgrade-status-1.log
-			if [ -z "$cnt" ]; then
-				cnt=0
-			fi
-			if [ $cnt -lt 2 ]; then
-				echo "FAILED adding compressiontype to BRM!"
-				exit 1
-			fi
-		fi
-	fi
-
-	#---------------------------------------------------------------------------
-	# See if autoincrement column is in SYSTABLE
-	#---------------------------------------------------------------------------
-	echo "checking calpontsys for autoincrement..." >>/tmp/upgrade-status.log.$$
-	$installdir/mysql/bin/mysql \
-		--defaults-file=$installdir/mysql/my.cnf \
-		--user=root $pwprompt \
-		--execute='describe systable;' \
-		calpontsys | grep autoincrement >>/tmp/upgrade-status.log.$$ 2>&1
-
-	#
-	# Add autoincrement column to SYSTABLE if applicable
-	#
-	if [ $? -ne 0 ]; then
-		echo "calpontsys needs upgrade for autoincrement" >>/tmp/upgrade-status.log.$$
-		echo "add autoincrement columns" >>/tmp/upgrade-status.log.$$
-		cat >/tmp/idb_upgrade.sql <<EOD
-alter table systable add autoincrement int comment 'schema sync only';
-EOD
-		cat /tmp/idb_upgrade.sql >>/tmp/upgrade-status.log.$$
-		$installdir/mysql/bin/mysql \
-			--defaults-file=$installdir/mysql/my.cnf \
-			--user=root $pwprompt \
-			calpontsys </tmp/idb_upgrade.sql >>/tmp/upgrade-status.log.$$ 2>&1
-
-		checkForError
-
-		if [ $mid -eq 1 ]; then
-			echo "update autoincrement to backend" >>/tmp/upgrade-status.log.$$
-			cat >/tmp/idb_upgrade.sql <<EOD
-select calonlinealter('alter table systable add (autoincrement int)') as xxx;
-update systable set autoincrement=0 where autoincrement is null;
-EOD
-			cat /tmp/idb_upgrade.sql >>/tmp/upgrade-status.log.$$
-			$installdir/mysql/bin/mysql \
-				--defaults-file=$installdir/mysql/my.cnf \
-				--user=root $pwprompt \
-				calpontsys </tmp/idb_upgrade.sql >>/tmp/upgrade-status.log.$$ 2>&1
-	
-			checkForError
-		fi
-
-		#
-		#Verify that autoincrement was successfully added to SYSTABLE
-		#
-		rm -f /tmp/idb_upgrade.sql
-		$installdir/mysql/bin/mysql \
-			--defaults-file=$installdir/mysql/my.cnf \
-			--user=root $pwprompt \
-			--execute='describe systable;' \
-			calpontsys | grep autoincrement >/tmp/upgrade-status-1.log 2>&1
-		rc=$?
-		cat /tmp/upgrade-status-1.log >>/tmp/upgrade-status.log.$$
-		if [ $rc -ne 0 ]; then
-			echo "FAILED adding autoincrement to SYSTABLE!"
-			exit 1
-		fi
-		cnt=`wc -l /tmp/upgrade-status-1.log | awk '{print $1}'`
-		rm -f /tmp/upgrade-status-1.log
-		if [ -z "$cnt" ]; then
-			cnt=0
-		fi
-		if [ $cnt -ne 1 ]; then
-			echo "FAILED adding autoincrement to SYSTABLE!"
-			exit 1
-		fi
-
-		#
-		# Verify that autoincrement (OID 1011) was successfully added to BRM
-		#
-		if [ $has_um -eq 0 ]; then
-			$installdir/bin/editem -o1011 1>/tmp/upgrade-status-1.log 2>/dev/null
-			rc=$?
-			cat /tmp/upgrade-status-1.log >>/tmp/upgrade-status.log.$$
-			if [ $rc -ne 0 ]; then
-				echo "FAILED adding autoincrement to BRM!"
-				exit 1
-			fi
-			cnt=`wc -l /tmp/upgrade-status-1.log | awk '{print $1}'`
-			rm -f /tmp/upgrade-status-1.log
-			if [ "x$cnt" = x ]; then
-				cnt=0
-			fi
-			if [ $cnt -lt 2 ]; then
-				echo "FAILED adding autoincrement to BRM!"
-				exit 1
-			fi
-		fi
-	fi
-
-	#---------------------------------------------------------------------------
-	# See if nextvalue column is in SYSCOLUMN
-	#---------------------------------------------------------------------------
-	echo "checking calpontsys for nextvalue..." >>/tmp/upgrade-status.log.$$
-	$installdir/mysql/bin/mysql \
-		--defaults-file=$installdir/mysql/my.cnf \
-		--user=root $pwprompt \
-		--execute='describe syscolumn;' \
-		calpontsys | grep nextvalue >>/tmp/upgrade-status.log.$$ 2>&1
-
-	#
-	# Add nextvalue column to SYSCOLUMN if applicable.
-	# Also set old autoincrement column in SYSCOLUMN to 'n'.
-	#
-	if [ $? -ne 0 ]; then
-		echo "calpontsys needs upgrade for nextvalue" >>/tmp/upgrade-status.log.$$
-		echo "add nextvalue columns" >>/tmp/upgrade-status.log.$$
-		cat >/tmp/idb_upgrade.sql <<EOD
-alter table syscolumn add nextvalue bigint comment 'schema sync only';
-EOD
-		cat /tmp/idb_upgrade.sql >>/tmp/upgrade-status.log.$$
-		$installdir/mysql/bin/mysql \
-			--defaults-file=$installdir/mysql/my.cnf \
-			--user=root $pwprompt \
-			calpontsys </tmp/idb_upgrade.sql >>/tmp/upgrade-status.log.$$ 2>&1
-
-		checkForError
-
-		if [ $mid -eq 1 ]; then
-			echo "update nextvalue to backend" >>/tmp/upgrade-status.log.$$
-			cat >/tmp/idb_upgrade.sql <<EOD
-select calonlinealter('alter table syscolumn add (nextvalue bigint)') as xxx;
-update syscolumn set nextvalue=1 where nextvalue is null;
-update syscolumn set autoincrement='n' where autoincrement is null;
-EOD
-			cat /tmp/idb_upgrade.sql >>/tmp/upgrade-status.log.$$
-			$installdir/mysql/bin/mysql \
-				--defaults-file=$installdir/mysql/my.cnf \
-				--user=root $pwprompt \
-				calpontsys </tmp/idb_upgrade.sql >>/tmp/upgrade-status.log.$$ 2>&1
-	
-			checkForError
-		fi
-
-		#
-		# Verify that nextvalue was successfully added to SYSCOLUMN
-		#
-		rm -f /tmp/idb_upgrade.sql
-		$installdir/mysql/bin/mysql \
-			--defaults-file=$installdir/mysql/my.cnf \
-			--user=root $pwprompt \
-			--execute='describe syscolumn;' \
-			calpontsys | grep nextvalue >/tmp/upgrade-status-1.log 2>&1
-		rc=$?
-		cat /tmp/upgrade-status-1.log >>/tmp/upgrade-status.log.$$
-		if [ $rc -ne 0 ]; then
-			echo "FAILED adding nextvalue to SYSCOLUMN!"
-			exit 1
-		fi
-		cnt=`wc -l /tmp/upgrade-status-1.log | awk '{print $1}'`
-		rm -f /tmp/upgrade-status-1.log
-		if [ -z "$cnt" ]; then
-			cnt=0
-		fi
-		if [ $cnt -ne 1 ]; then
-			echo "FAILED adding nextvalue to SYSCOLUMN!"
-			exit 1
-		fi
-
-		#
-		# Verify that nextvalue (OID 1042) was successfully added to BRM
-		#
-		if [ $has_um -eq 0 ]; then
-			$installdir/bin/editem -o1042 1>/tmp/upgrade-status-1.log 2>/dev/null
-			rc=$?
-			cat /tmp/upgrade-status-1.log >>/tmp/upgrade-status.log.$$
-			if [ $rc -ne 0 ]; then
-				echo "FAILED adding nextvalue to BRM!"
-				exit 1
-			fi
-			cnt=`wc -l /tmp/upgrade-status-1.log | awk '{print $1}'`
-			rm -f /tmp/upgrade-status-1.log
-			if [ "x$cnt" = x ]; then
-				cnt=0
-			fi
-			if [ $cnt -lt 2 ]; then
-				echo "FAILED adding nextvalue to BRM!"
-				exit 1
-			fi
-		fi
-	fi
-
-	#---------------------------------------------------------------------------
-	# See if systable schema and tablename columns are varchar(128).
-	#---------------------------------------------------------------------------
-	recreate=0
-	echo "checking calpontsys.systable schema and tablename for varchar(128)..." >>/tmp/upgrade-status.log.$$
-	colCount=` \
-	$installdir/mysql/bin/mysql \
-		--defaults-file=$installdir/mysql/my.cnf \
-		--user=root $pwprompt \
-		--execute='describe systable;' \
-		calpontsys | egrep "schema|tablename" | grep "varchar(128)" | wc -l`
-	if [ $colCount -ne 2 ]; then
-		recreate=1
-		echo "calpontsys needs upgrade to expand systable schema and tablename" >>/tmp/upgrade-status.log.$$
-	fi
-	
-	#---------------------------------------------------------------------------
-	# See if syscolumn schema, tablename, and columname columns are varchar(128).
-	#---------------------------------------------------------------------------
-	if [ $recreate -eq 0 ]; then
-		echo "checking calpontsys.syscolumn schema, tablename, columnname for varchar(128)..." >>/tmp/upgrade-status.log.$$
-		colCount=` \
-		$installdir/mysql/bin/mysql \
-			--defaults-file=$installdir/mysql/my.cnf \
-			--user=root $pwprompt \
-			--execute='describe syscolumn;' \
-			calpontsys | egrep "schema|tablename|columnname" | grep "varchar(128)" | wc -l`
-		if [ $colCount -ne 3 ]; then
-			recreate=1
-			echo "calpontsys needs upgrade to expand syscolumn schema, tablename, and columnname" >>/tmp/upgrade-status.log.$$
-		fi
-	fi
-
-	#---------------------------------------------------------------------------
-	# See if defaultvalue column in SYSCOLUMN is varchar(64)
-	#---------------------------------------------------------------------------
-	if [ $recreate -eq 0 ]; then
-		echo "checking calpontsys for defaultvalue varchar(64)..." >>/tmp/upgrade-status.log.$$
-		$installdir/mysql/bin/mysql \
-			--defaults-file=$installdir/mysql/my.cnf \
-			--user=root $pwprompt \
-			--execute='describe syscolumn;' \
-			calpontsys | grep defaultvalue | grep 'varchar(64)' >>/tmp/upgrade-status.log.$$ 2>&1
-		if [ $? -ne 0 ]; then
-			recreate=1
-			echo "calpontsys needs upgrade to change defaultvalue" >>/tmp/upgrade-status.log.$$
-		fi
-	fi
-
-	#
-	# Change defaultvalue column to varchar(64) if applicable
-	#
-	if [ $recreate -ne 0 ]; then
-		cat >/tmp/idb_upgrade.sql <<EOD
-drop table if exists systable restrict;
-drop table if exists syscolumn restrict;
-EOD
-		cat /tmp/idb_upgrade.sql >>/tmp/upgrade-status.log.$$
-		$installdir/mysql/bin/mysql \
-			--defaults-file=$installdir/mysql/my.cnf \
-			--user=root $pwprompt \
-			calpontsys </tmp/idb_upgrade.sql >>/tmp/upgrade-status.log.$$ 2>&1
-
-		checkForError
-
-		echo "create systable and syscolumn with schema sync only" >>/tmp/upgrade-status.log.$$
-		cat $installdir/mysql/syscatalog_mysql.sql >>/tmp/upgrade-status.log.$$
-		$installdir/mysql/bin/mysql \
-			--defaults-file=$installdir/mysql/my.cnf \
-			--user=root $pwprompt \
-			calpontsys <$installdir/mysql/syscatalog_mysql.sql >>/tmp/upgrade-status.log.$$ 2>&1
-
-		checkForError
-
-		#
-		# Verify column widths:
-		# varchar(64) for syscolumn.defaultvalue
-		# varchar(128) for systable (schema, tablename) and syscolumn (schema, tablename, and columnname).
-		#
-		rm -f /tmp/idb_upgrade.sql
-		echo "verify column widths" >>/tmp/upgrade-status.log.$$
-		$installdir/mysql/bin/mysql \
-			--defaults-file=$installdir/mysql/my.cnf \
-			--user=root $pwprompt \
-			--execute='describe syscolumn;' \
-			calpontsys | grep defaultvalue | grep 'varchar(64)' >/tmp/upgrade-status-1.log 2>&1
-		$installdir/mysql/bin/mysql \
-			--defaults-file=$installdir/mysql/my.cnf \
-			--user=root $pwprompt \
-			--execute='describe systable; describe syscolumn;' \
-			calpontsys | egrep "schema|tablename|columnname" | grep 'varchar(128)' >>/tmp/upgrade-status-1.log 2>&1
-		cat /tmp/upgrade-status-1.log >>/tmp/upgrade-status.log.$$
-		cnt=`wc -l /tmp/upgrade-status-1.log | awk '{print $1}'`
-		rm -f /tmp/upgrade-status-1.log
-		if [ -z "$cnt" ]; then
-			cnt=0
-		fi
-		if [ $cnt -ne 6 ]; then
-			echo "FAILED width of schema, tablename, columnname, defaultvalue verification!"
-			exit 1
-		fi
-	fi
-fi
-
-echo "OK"
diff --git a/oam/install_scripts/xm_installer.sh b/oam/install_scripts/xm_installer.sh
deleted file mode 100755
index 37d778e39..000000000
--- a/oam/install_scripts/xm_installer.sh
+++ /dev/null
@@ -1,173 +0,0 @@
-#!/usr/bin/expect
-#
-# $Id$
-#
-# Install custom OS files on External Module
-# Argument 1 - Remote Module Name
-# Argument 2 - Remote Server Host Name or IP address
-# Argument 3 - OAM Parent Host Name
-# Argument 4 - Root Password of remote server
-# Argument 5 - Debug flag 1 for on, 0 for off
-set timeout 10
-set USERNAME root
-set MODULE [lindex $argv 0]
-set SERVER [lindex $argv 1]
-set OAMHOSTNAME [lindex $argv 2]
-set PASSWORD [lindex $argv 3]
-set DEBUG [lindex $argv 4]
-log_user $DEBUG
-spawn -noecho /bin/bash
-#
-# Validate Calpont RPM is installed
-#
-send_user "\n"
-send_user "Check Calpont RPM installed                     "
-expect -re "# "
-send "ssh $USERNAME@$SERVER 'rpm -iq calpont'\n"
-expect {
-	-re "Host key verification failed" { send_user "FAILED: Host key verification failed\n" ; exit }
-	-re "service not known" { send_user "FAILED: Invalid Host\n" ; exit }
-	-re "authenticity" { send "yes\n" 
-						expect {
-							-re "word: " { send "$PASSWORD\n" }
-						}
-						}
-	-re "word: " { send "$PASSWORD\n" }
-}
-expect {
-	-re "tools " 			  { send_user "DONE" }
-	-re "Permission denied"   { send_user "ERROR: Invalid password\n" ; exit -1 }
-	-re "package calpont"     { send_user "ERROR: Calpont RPM not installed on External Module\n" ; exit -1 }
-}
-#
-# Create mount directories
-#
-send_user "\n"
-send_user "Create etc mount directory                      "
-expect -re "# "
-send "ssh $USERNAME@$SERVER 'mkdir /mnt/$OAMHOSTNAME\_etc'\n"
-expect -re "word: "
-# send the password
-send "$PASSWORD\n"
-expect {
-	-re "# " 				  { send_user "DONE" }
-	-re "Permission denied"   { send_user "ERROR: Invalid password\n" ; exit -1 }
-	-re "mkdir: cannot"       { send_user "DONE: already installed\n" 
-								send_user "\nInstallation Successfully Completed on '$MODULE'\n"; exit 0 }
-}
-send_user "\n"
-send_user "Create OAM mount directory                      "
-send "ssh $USERNAME@$SERVER 'mkdir /mnt/$OAMHOSTNAME\_OAM'\n"
-expect -re "word: "
-# send the password
-send "$PASSWORD\n"
-expect {
-	-re "# " 				  { send_user "DONE" }
-	-re "Permission denied"   { send_user "ERROR: Invalid password\n" ; exit -1 }
-	-re "mkdir: cannot"       { send_user "DONE: already installed\n" 
-								send_user "\nInstallation Successfully Completed on '$MODULE'\n"; exit 0 }
-}
-#
-# copy over calpont OS files
-#
-send_user "\n"
-send_user "Copy Mount File to Module                       "
-send "scp /tmp/etc/$MODULE/*mount  $USERNAME@$SERVER:/mnt/.\n"
-expect -re "word: "
-# send the password
-send "$PASSWORD\n"
-expect {
-	-re "100%" 				{ send_user "DONE" }
-	-re "scp"  				{ send_user "ERROR\n" ; 
-				 			send_user "\n*** Installation ERROR\n" ; 
-							exit -1 }
-	-re "Permission denied"         { send_user "ERROR: Invalid password\n" ; exit -1 }
-	-re "No such file or directory" { send_user "ERROR: Invalid file\n" ; exit -1 }
-}
-#
-send_user "\n"
-send_user "Copy Custom inittab to Module                   "
-send "scp /tmp/etc/$MODULE/inittab.calpont  $USERNAME@$SERVER:/tmp/.\n"
-expect -re "word: "
-# send the password
-send "$PASSWORD\n"
-expect {
-	-re "100%" 				{ send_user "DONE" }
-	-re "scp"  				{ send_user "ERROR\n" ; 
-				 			send_user "\n*** Installation ERROR\n" ; 
-							exit -1 }
-	-re "Permission denied"         { send_user "ERROR: Invalid password\n" ; exit -1 }
-	-re "No such file or directory" { send_user "ERROR: Invalid file\n" ; exit -1 }
-}
-#
-send_user "\n"
-send_user "Copy syslogd.conf to Module                     "
-send "scp /etc/syslog.conf  $USERNAME@$SERVER:/etc/.\n"
-expect -re "word: "
-# send the password
-send "$PASSWORD\n"
-expect {
-	-re "100%" 				{ send_user "DONE" }
-	-re "scp"  				{ send_user "ERROR\n" ; 
-				 			send_user "\n*** Installation ERROR\n" ; 
-							exit -1 }
-	-re "Permission denied"         { send_user "ERROR: Invalid password\n" ; exit -1 }
-	-re "No such file or directory" { send_user "ERROR: Invalid file\n" ; exit -1 }
-}
-#
-# chmod of mount file
-#
-send_user "\n"
-send_user "Run chmod on Mount File                         "
-send "ssh $USERNAME@$SERVER 'chmod 755 /mnt/$OAMHOSTNAME\_*mount'\n"
-expect -re "word: "
-# send the password
-send "$PASSWORD\n"
-expect {
-	-re "# " 				  { send_user "DONE" }
-	-re "Permission denied"   { send_user "ERROR: Invalid password\n" ; exit -1 }
-}
-#
-# Update External Module inittab
-#
-send_user "\n"
-send_user "Update inittab                                  "
-send "ssh $USERNAME@$SERVER 'cat /tmp/inittab.calpont >> /etc/inittab'\n"
-expect -re "word: "
-# send the password
-send "$PASSWORD\n"
-expect {
-	-re "# " 				  { send_user "DONE" }
-	-re "Permission denied"   { send_user "ERROR: Invalid password\n" ; exit -1 }
-}
-#
-# Restart External Module syslogd
-#
-send_user "\n"
-send_user "Restart syslogd                                 "
-send "ssh $USERNAME@$SERVER 'service syslog restart'\n"
-expect -re "word: "
-# send the password
-send "$PASSWORD\n"
-expect {
-	-re "# " 				  { send_user "DONE" }
-	-re "Permission denied"   { send_user "ERROR: Invalid password\n" ; exit -1 }
-}
-#
-# startup ProcMon
-#
-send_user "\n"
-send_user "Startup ProcMon                                 "
-send "ssh $USERNAME@$SERVER 'kill -HUP 1'\n"
-expect -re "word: "
-# send the password
-send "$PASSWORD\n"
-expect {
-	-re "# " 				  { send_user "DONE" }
-	-re "Permission denied"   { send_user "ERROR: Invalid password\n" ; exit -1 }
-}
-send_user "\n"
-#
-send_user "\nInstallation Successfully Completed on '$MODULE'\n"
-exit 0
-
diff --git a/oam/oamcpp/liboamcpp.cpp b/oam/oamcpp/liboamcpp.cpp
index 9c5c80eab..a8a9bfd3d 100644
--- a/oam/oamcpp/liboamcpp.cpp
+++ b/oam/oamcpp/liboamcpp.cpp
@@ -82,6 +82,8 @@ using namespace oam;
 using namespace logging;
 using namespace BRM;
 
+string tmpdir;
+
 namespace oam
 {
 // flag to tell us ctrl-c was hit
@@ -148,6 +150,21 @@ Oam::Oam()
         }
         catch (...) {} // defaulted to false
     }
+
+    //get user
+    string USER = "root";
+    char* p = getenv("USER");
+
+    if (p && *p)
+	USER = p;
+
+    userDir = USER;
+
+    if ( USER != "root")
+	userDir = "home/" + USER;
+
+	tmpdir = startup::StartUp::tmpDir();
+
 }
 
 Oam::~Oam()
@@ -3558,19 +3575,19 @@ void Oam::getLogFile(const std::string moduleName, const std::string loglevel, c
 
     logFile = path + logFile;
 
-    string tempLogFile = "/tmp/logs";
+    string tempLogFile = tmpdir +"/logs";
 
     //make 1 log file made up of archive and current *.log
-    (void)system("touch /tmp/logs");
+    (void)system(tempLogFile.c_str());
 
     string logdir("/var/log/mariadb/columnstore");
 
-    if (access(logdir.c_str(), W_OK) != 0) logdir = "/tmp";
+    if (access(logdir.c_str(), W_OK) != 0) logdir = tmpdir;
 
-    string cmd = "ls " + path + logdir + "/archive | grep '" + logFileName + "' > /tmp/logfiles";
+    string cmd = "ls " + path + logdir + "/archive | grep '" + logFileName + "' > " + tmpdir + "/logfiles";
     (void)system(cmd.c_str());
 
-    string fileName = "/tmp/logfiles";
+    string fileName = tmpdir + "/logfiles";
 
     ifstream oldFile (fileName.c_str());
 
@@ -3582,7 +3599,7 @@ void Oam::getLogFile(const std::string moduleName, const std::string loglevel, c
         while (oldFile.getline(line, 400))
         {
             buf = line;
-            cmd = "cat " + path + logdir + "/archive/" + buf + " >> /tmp/logs";
+            cmd = "cat " + path + logdir + "/archive/" + buf + " >> " + tempLogFile;
             (void)system(cmd.c_str());
         }
 
@@ -3590,7 +3607,7 @@ void Oam::getLogFile(const std::string moduleName, const std::string loglevel, c
         unlink (fileName.c_str());
     }
 
-    cmd = "cat " + logFile + " >> /tmp/logs";
+    cmd = "cat " + logFile + " >> " + tempLogFile;
     (void)system(cmd.c_str());
 
     //validate and get mm / dd from incoming date
@@ -3708,7 +3725,7 @@ void Oam::getLogFile(const std::string moduleName, const std::string loglevel, c
         unlink (tempLogFile.c_str());
     }
 
-    fileName = "/tmp/logsByDate";
+    fileName = tmpdir + "/logsByDate";
     ofstream newFile (fileName.c_str());
 
     //create new file
@@ -5641,7 +5658,6 @@ void Oam::manualMovePmDbroot(std::string residePM, std::string dbrootIDs, std::s
                         cout << endl << "ERROR: umountDBRoot api failure" << endl;
                         exceptionControl("manualMovePmDbroot", API_FAILURE);
                     }
-
                 }
 
                 //check for amazon moving required
@@ -6488,10 +6504,10 @@ void Oam::addUMdisk(const int moduleID, std::string& volumeName, std::string& de
     int user;
     user = getuid();
 
-    if (user == 0)
-        cmd = "mkfs.ext2 -F " + device + " > /dev/null 2>&1";
-    else
-        cmd = "sudo mkfs.ext2 -F " + device + " > /dev/null 2>&1";
+	if ( user == 0 )
+    	cmd = "mkfs.ext2 -F " + device + " > " + tmpdir + "/format.log 2>&1";
+	else
+        cmd = "sudo mkfs.ext2 -F " + device + " > " + tmpdir + "/format.log 2>&1";
 
     system(cmd.c_str());
 
@@ -6738,10 +6754,10 @@ void Oam::addDbroot(const int dbrootNumber, DBRootConfigList& dbrootlist, string
             int user;
             user = getuid();
 
-            if (user == 0)
-                cmd = "mkfs.ext2 -F " + amazonDeviceName + " > /tmp/format.log 2>&1";
-            else
-                cmd = "sudo mkfs.ext2 -F " + amazonDeviceName + " > /tmp/format.log 2>&1";
+			if (user == 0 )
+            	cmd = "mkfs.ext2 -F " + amazonDeviceName + " > " + tmpdir + "/format.log 2>&1";
+			else
+                cmd = "sudo mkfs.ext2 -F " + amazonDeviceName + " > " + tmpdir + "/format.log 2>&1";
 
             writeLog("addDbroot format cmd: " + cmd, LOG_TYPE_DEBUG );
 
@@ -7795,17 +7811,19 @@ void Oam::actionMysqlCalpont(MYSQLCALPONT_ACTION action)
 
     string command;
 
+    string pidtmp = tmpdir + "/mysql.pid";
+
     switch (action)
     {
         case MYSQL_START:
         {
-            command = "start > /tmp/actionMysqlCalpont.log 2>&1";
+            command = "start > " + tmpdir + "/actionMysqlCalpont.log 2>&1";
             break;
         }
 
         case MYSQL_STOP:
         {
-            command = "stop > /tmp/actionMysqlCalpont.log 2>&1";
+            command = "stop > " + tmpdir + "/actionMysqlCalpont.log 2>&1";
 
             //set process status
             try
@@ -7820,25 +7838,25 @@ void Oam::actionMysqlCalpont(MYSQLCALPONT_ACTION action)
 
         case MYSQL_RESTART:
         {
-            command = "restart > /tmp/actionMysqlCalpont.log 2>&1";
+            command = "restart > " + tmpdir + "/actionMysqlCalpont.log 2>&1";
             break;
         }
 
         case MYSQL_RELOAD:
         {
-            command = "reload > /tmp/actionMysqlCalpont.log 2>&1";
+            command = "reload > " + tmpdir + "/actionMysqlCalpont.log 2>&1";
             break;
         }
 
         case MYSQL_FORCE_RELOAD:
         {
-            command = "force-reload > /tmp/actionMysqlCalpont.log 2>&1";
+            command = "force-reload > " + tmpdir + "/actionMysqlCalpont.log 2>&1";
             break;
         }
 
         case MYSQL_STATUS:
         {
-            command = "status > /tmp/mysql.status";
+            command = "status > " + tmpdir + "/mysql.status";
             break;
         }
 
@@ -7856,9 +7874,9 @@ void Oam::actionMysqlCalpont(MYSQLCALPONT_ACTION action)
     if (action == MYSQL_START || action == MYSQL_RESTART)
     {
         //get pid
-        cmd = "cat " + InstallDir + "/mysql/db/*.pid > /tmp/mysql.pid";
+        cmd = "cat " + InstallDir + "/mysql/db/*.pid > " + pidtmp;
         system(cmd.c_str());
-        ifstream oldFile ("/tmp/mysql.pid");
+        ifstream oldFile(pidtmp.c_str());
 
         //fail if file size 0
         oldFile.seekg(0, std::ios::end);
@@ -7909,14 +7927,15 @@ void Oam::actionMysqlCalpont(MYSQLCALPONT_ACTION action)
         int state = procstat.ProcessOpState;
         pid_t pidStatus = procstat.ProcessID;
 
-        if (checkLogStatus("/tmp/mysql.status", "MySQL running"))
+		string mysqlStatus = tmpdir + "/mysql.status";
+        if (checkLogStatus(mysqlStatus, "MySQL running"))
         {
             if ( state != ACTIVE )
             {
                 //get pid
-                cmd = "cat " + InstallDir + "/mysql/db/*.pid > /tmp/mysql.pid";
+                cmd = "cat " + InstallDir + "/mysql/db/*.pid > " + pidtmp;
                 system(cmd.c_str());
-                ifstream oldFile ("/tmp/mysql.pid");
+                ifstream oldFile(pidtmp.c_str());
                 char line[400];
                 string pid;
 
@@ -7941,9 +7960,9 @@ void Oam::actionMysqlCalpont(MYSQLCALPONT_ACTION action)
             else
             {
                 //check if pid has changed
-                cmd = "cat " + InstallDir + "/mysql/db/*.pid > /tmp/mysql.pid";
+                cmd = "cat " + InstallDir + "/mysql/db/*.pid > " + pidtmp;
                 system(cmd.c_str());
-                ifstream oldFile ("/tmp/mysql.pid");
+                ifstream oldFile(pidtmp.c_str());
                 char line[400];
                 string pid;
 
@@ -8218,19 +8237,19 @@ int Oam::validateModule(const std::string name)
 std::string Oam::getEC2InstanceIpAddress(std::string instanceName)
 {
     // run script to get Instance status and IP Address
-    string cmd = InstallDir + "/bin/MCSInstanceCmds.sh getPrivateIP " + instanceName + " > /tmp/getCloudIP_" + instanceName;
+    string tmplog = tmpdir + "/getCloudIP_" + instanceName;
+    string cmd = InstallDir + "/bin/MCSInstanceCmds.sh getPrivateIP " + instanceName + " > " + tmplog;
     system(cmd.c_str());
 
-    if (checkLogStatus("/tmp/getCloudIP_" + instanceName, "stopped") )
+    if (checkLogStatus(tmplog, "stopped") )
         return "stopped";
 
-    if (checkLogStatus("/tmp/getCloudIP_" + instanceName, "terminated") )
+    if (checkLogStatus(tmplog, "terminated") )
         return "terminated";
 
     // get IP Address
     string IPAddr;
-    string file = "/tmp/getCloudIP_" + instanceName;
-    ifstream oldFile (file.c_str());
+    ifstream oldFile (tmplog.c_str());
     char line[400];
 
     while (oldFile.getline(line, 400))
@@ -8257,14 +8276,14 @@ std::string Oam::getEC2InstanceIpAddress(std::string instanceName)
 std::string Oam::getEC2LocalInstance(std::string name)
 {
     // run script to get Instance status and IP Address
-    string cmd = InstallDir + "/bin/MCSInstanceCmds.sh getInstance  > /tmp/getInstanceInfo_" + name;
+    string file = tmpdir + "/getInstanceInfo_" + name;
+    string cmd = InstallDir + "/bin/MCSInstanceCmds.sh getInstance  > " + file;
     int status = system(cmd.c_str());
 		if (WEXITSTATUS(status) == 1 )
         return "failed";
 
     // get Instance Name
     string instanceName;
-    string file = "/tmp/getInstanceInfo_" + name;
     ifstream oldFile (file.c_str());
     char line[400];
 
@@ -8290,14 +8309,14 @@ std::string Oam::getEC2LocalInstance(std::string name)
 std::string Oam::getEC2LocalInstanceType(std::string name)
 {
     // run script to get Instance status and IP Address
-    string cmd = InstallDir + "/bin/MCSInstanceCmds.sh getType  > /tmp/getInstanceType_" + name;
+    string file = tmpdir + "/getInstanceType_" + name;
+    string cmd = InstallDir + "/bin/MCSInstanceCmds.sh getType  > " + file;
     int status = system(cmd.c_str());
 		if (WEXITSTATUS(status) == 1 )
         return "failed";
 
     // get Instance Name
     string instanceType;
-    string file = "/tmp/getInstanceType_" + name;
     ifstream oldFile (file.c_str());
     char line[400];
 
@@ -8323,14 +8342,14 @@ std::string Oam::getEC2LocalInstanceType(std::string name)
 std::string Oam::getEC2LocalInstanceSubnet(std::string name)
 {
     // run script to get Instance Subnet
-    string cmd = InstallDir + "/bin/MCSInstanceCmds.sh getSubnet  > /tmp/getInstanceSubnet_" + name;
+    string file = tmpdir + "/getInstanceSubnet_" + name;
+    string cmd = InstallDir + "/bin/MCSInstanceCmds.sh getSubnet  > " + file;
     int status = system(cmd.c_str());
 		if (WEXITSTATUS(status) == 1 )
         return "failed";
 
     // get Instance Name
     string instanceSubnet;
-    string file = "/tmp/getInstanceSubnet_" + name;
     ifstream oldFile (file.c_str());
     char line[400];
 
@@ -8357,17 +8376,17 @@ std::string Oam::getEC2LocalInstanceSubnet(std::string name)
 std::string Oam::launchEC2Instance( const std::string name, const std::string IPAddress, const std::string type, const std::string group)
 {
     // run script to get Instance status and IP Address
-    string cmd = InstallDir + "/bin/MCSInstanceCmds.sh launchInstance " + IPAddress + " " + type + " " + group + " > /tmp/getInstance_" + name;
+    string file = tmpdir + "/getInstance_" + name;
+    string cmd = InstallDir + "/bin/MCSInstanceCmds.sh launchInstance " + IPAddress + " " + type + " " + group + " > " + file;
     int status = system(cmd.c_str());
 		if (WEXITSTATUS(status) == 1 )
         return "failed";
 
-    if (checkLogStatus("/tmp/getInstance", "Required") )
+    if (checkLogStatus(file, "Required") )
         return "failed";
 
     // get Instance ID
     string instance;
-    string file = "/tmp/getInstance_" + name;
     ifstream oldFile (file.c_str());
     char line[400];
 
@@ -8401,7 +8420,7 @@ std::string Oam::launchEC2Instance( const std::string name, const std::string IP
 void Oam::terminateEC2Instance(std::string instanceName)
 {
     // run script to get Instance status and IP Address
-    string cmd = InstallDir + "/bin/MCSInstanceCmds.sh terminateInstance " + instanceName + " > /tmp/terminateEC2Instance_" + instanceName;
+    string cmd = InstallDir + "/bin/MCSInstanceCmds.sh terminateInstance " + instanceName + " > " + tmpdir + "/terminateEC2Instance_" + instanceName;
     system(cmd.c_str());
 
     return;
@@ -8418,7 +8437,7 @@ void Oam::terminateEC2Instance(std::string instanceName)
 void Oam::stopEC2Instance(std::string instanceName)
 {
     // run script to get Instance status and IP Address
-    string cmd = InstallDir + "/bin/MCSInstanceCmds.sh stopInstance " + instanceName + " > /tmp/stopEC2Instance_" + instanceName;
+    string cmd = InstallDir + "/bin/MCSInstanceCmds.sh stopInstance " + instanceName + " > " + tmpdir + "/stopEC2Instance_" + instanceName;
     system(cmd.c_str());
 
     return;
@@ -8435,7 +8454,7 @@ void Oam::stopEC2Instance(std::string instanceName)
 bool Oam::startEC2Instance(std::string instanceName)
 {
     // run script to get Instance status and IP Address
-    string cmd = InstallDir + "/bin/MCSInstanceCmds.sh startInstance " + instanceName + " > /tmp/startEC2Instance_" + instanceName;
+    string cmd = InstallDir + "/bin/MCSInstanceCmds.sh startInstance " + instanceName + " > " + tmpdir + "/startEC2Instance_" + instanceName;
     int ret = system(cmd.c_str());
 		if (WEXITSTATUS(ret) == 1 )
         return false;
@@ -8454,7 +8473,7 @@ bool Oam::startEC2Instance(std::string instanceName)
 bool Oam::assignElasticIP(std::string instanceName, std::string IpAddress)
 {
     // run script to get Instance status and IP Address
-    string cmd = InstallDir + "/bin/MCSInstanceCmds.sh assignElasticIP " + instanceName + " " + IpAddress + " > /tmp/assignElasticIP_" + instanceName;
+    string cmd = InstallDir + "/bin/MCSInstanceCmds.sh assignElasticIP " + instanceName + " " + IpAddress + " > " + tmpdir + "/assignElasticIP_" + instanceName;
     int ret = system(cmd.c_str());
 		if (WEXITSTATUS(ret) == 1 )
         exceptionControl("assignElasticIP", oam::API_FAILURE);
@@ -8473,7 +8492,7 @@ bool Oam::assignElasticIP(std::string instanceName, std::string IpAddress)
 bool Oam::deassignElasticIP(std::string IpAddress)
 {
     // run script to get Instance status and IP Address
-    string cmd = InstallDir + "/bin/MCSInstanceCmds.sh deassignElasticIP " + IpAddress + " > /tmp/deassignElasticIP_" + IpAddress;
+    string cmd = InstallDir + "/bin/MCSInstanceCmds.sh deassignElasticIP " + IpAddress + " > " + tmpdir + "/deassignElasticIP_" + IpAddress;
     int ret = system(cmd.c_str());
 		if (WEXITSTATUS(ret) == 1 )
         exceptionControl("deassignElasticIP", oam::API_FAILURE);
@@ -8492,7 +8511,7 @@ bool Oam::deassignElasticIP(std::string IpAddress)
 std::string Oam::getEC2VolumeStatus(std::string volumeName)
 {
     // run script to get Volume Status
-    string cmd = InstallDir + "/bin/MCSVolumeCmds.sh describe " + volumeName + " > /tmp/getVolumeStatus_" + volumeName;
+    string cmd = InstallDir + "/bin/MCSVolumeCmds.sh describe " + volumeName + " > " + tmpdir + "/getVolumeStatus_" + volumeName;
     int ret = system(cmd.c_str());
 		if (WEXITSTATUS(ret) == 1 ){
         return "failed";
@@ -8500,7 +8519,7 @@ std::string Oam::getEC2VolumeStatus(std::string volumeName)
 
     // get status
     string status;
-    string file = "/tmp/getVolumeStatus_" + volumeName;
+    string file = tmpdir + "/getVolumeStatus_" + volumeName;
     ifstream oldFile (file.c_str());
     char line[400];
 
@@ -8526,14 +8545,14 @@ std::string Oam::getEC2VolumeStatus(std::string volumeName)
 std::string Oam::createEC2Volume(std::string size, std::string name)
 {
     // run script to get Volume Status
-    string cmd = InstallDir + "/bin/MCSVolumeCmds.sh create " + size + " " + name + " > /tmp/createVolumeStatus_" + name;
+    string file = tmpdir + "/createVolumeStatus_" + name;
+    string cmd = InstallDir + "/bin/MCSVolumeCmds.sh create " + size + " " + name + " > " + file;
     int ret = system(cmd.c_str());
 		if (WEXITSTATUS(ret) == 1 )
         return "failed";
 
     // get status
     string volumeName;
-    string file = "/tmp/createVolumeStatus_" + name;
     ifstream oldFile (file.c_str());
     char line[400];
 
@@ -8573,7 +8592,7 @@ bool Oam::attachEC2Volume(std::string volumeName, std::string deviceName, std::s
     for ( int retry = 0 ; retry < 2 ; retry++ )
     {
         // run script to attach Volume
-        string cmd = InstallDir + "/bin/MCSVolumeCmds.sh attach " + volumeName + " " + instanceName + " " + deviceName + " > /tmp/attachVolumeStatus_" + volumeName;
+        string cmd = InstallDir + "/bin/MCSVolumeCmds.sh attach " + volumeName + " " + instanceName + " " + deviceName + " > " + tmpdir +  "/attachVolumeStatus_" + volumeName;
         ret = system(cmd.c_str());
 
 			if (WEXITSTATUS(ret) == 1 )
@@ -8604,7 +8623,7 @@ bool Oam::attachEC2Volume(std::string volumeName, std::string deviceName, std::s
 bool Oam::detachEC2Volume(std::string volumeName)
 {
     // run script to attach Volume
-    string cmd = InstallDir + "/bin/MCSVolumeCmds.sh detach " + volumeName + " > /tmp/detachVolumeStatus_" + volumeName;
+    string cmd = InstallDir + "/bin/MCSVolumeCmds.sh detach " + volumeName + " > " + tmpdir +  "/detachVolumeStatus_" + volumeName;
     int ret = system(cmd.c_str());
 		if (WEXITSTATUS(ret) == 1 )
         return false;
@@ -8623,7 +8642,7 @@ bool Oam::detachEC2Volume(std::string volumeName)
 bool Oam::deleteEC2Volume(std::string volumeName)
 {
     // run script to delete Volume
-    string cmd = InstallDir + "/bin/MCSVolumeCmds.sh delete " + volumeName + " > /tmp/deleteVolumeStatus_" + volumeName;
+    string cmd = InstallDir + "/bin/MCSVolumeCmds.sh delete " + volumeName + " > " + tmpdir +  "/deleteVolumeStatus_" + volumeName;
     int ret = system(cmd.c_str());
 		if (WEXITSTATUS(ret) == 1 )
         return false;
@@ -8642,7 +8661,7 @@ bool Oam::deleteEC2Volume(std::string volumeName)
 bool Oam::createEC2tag(std::string resourceName, std::string tagName, std::string tagValue)
 {
     // run script to create a tag
-    string cmd = InstallDir + "/bin/MCSVolumeCmds.sh createTag " + resourceName + " " + tagName + " " + tagValue + " > /tmp/createTagStatus_" + resourceName;
+    string cmd = InstallDir + "/bin/MCSVolumeCmds.sh createTag " + resourceName + " " + tagName + " " + tagValue + " > " + tmpdir +  "createTagStatus_" + resourceName;
     int ret = system(cmd.c_str());
 		if (WEXITSTATUS(ret) == 1 )
         return false;
@@ -8694,21 +8713,11 @@ void Oam::syslogAction( std::string action)
     }
     else
     {
-        int user;
-        user = getuid();
+         cmd = "systemctl " + action + " " + systemlog + ".service > /dev/null 2>&1";
+         system(cmd.c_str());
 
-        if (user == 0)
-            cmd = "systemctl " + action + " " + systemlog + ".service > /dev/null 2>&1";
-        else
-            cmd = "sudo systemctl " + action + " " + systemlog + ".service > /dev/null 2>&1";
-
-        system(cmd.c_str());
-
-        if (user == 0)
-            cmd = "/service " + systemlog + " " + action + " > /dev/null 2>&1";
-        else
-            cmd = "sudo service" + systemlog + " " + action + " > /dev/null 2>&1";
-    }
+         cmd = "service " + systemlog + " " + action + " > /dev/null 2>&1";
+     }
 
     // take action on syslog service
     writeLog("syslogAction cmd: " + cmd, LOG_TYPE_DEBUG );
@@ -9311,7 +9320,7 @@ int Oam::checkGlusterLog(std::string logFile, std::string& msg)
 {
     if (checkLogStatus(logFile, "OK"))
     {
-        if ( logFile == "/tmp/gluster_howhas.log" )
+        if ( logFile == tmpdir + "/gluster_howhas.log" )
         {
             ifstream File(logFile.c_str());
 
@@ -9366,7 +9375,7 @@ int Oam::checkGlusterLog(std::string logFile, std::string& msg)
 
         writeLog("checkGlusterLog: FAILURE", LOG_TYPE_ERROR);
 
-        if ( logFile == "/tmp/gluster_howhas.log" )
+        if ( logFile == tmpdir + "/gluster_howhas.log" )
             return 2;
         else
             exceptionControl("glusterctl", API_FAILURE);
@@ -9387,9 +9396,6 @@ int Oam::checkGlusterLog(std::string logFile, std::string& msg)
 ******************************************************************************************/
 std::string Oam::getMySQLPassword()
 {
-
-    return oam::UnassignedName;
-
     string mysqlUser = "root";
 
     string USER = "root";
@@ -9413,7 +9419,7 @@ std::string Oam::getMySQLPassword()
     if (!file)
     {
         writeLog("getMySQLPassword: doesn't exist: " + fileName, LOG_TYPE_DEBUG);
-        exceptionControl("getMySQLPassword", API_FILE_OPEN_ERROR);
+		return oam::UnassignedName;
     }
 
     char line[400];
@@ -9463,7 +9469,7 @@ std::string Oam::getMySQLPassword()
 /******************************************************************************************
 * @brief	updateFstab
 *
-* purpose:	check and get mysql user password
+* purpose:	Update Fstabs for Amazon EBS setup
 *
 ******************************************************************************************/
 std::string Oam::updateFstab(std::string device, std::string dbrootID)
@@ -9483,30 +9489,22 @@ std::string Oam::updateFstab(std::string device, std::string dbrootID)
 
     string cmd;
 
-    if (user == 0)
-        cmd = "grep /data" + dbrootID + " /etc/fstab > /dev/null 2>&1";
-    else
-        cmd = "sudo grep /data" + dbrootID + " /etc/fstab > /dev/null 2>&1";
+    cmd = "grep /data" + dbrootID + " /etc/fstab > /dev/null 2>&1";
 
     int status = system(cmd.c_str());
 
     if (WEXITSTATUS(status) != 0 )
     {
-        //update /etc/fstab with mount
+        //chmod before update, used on amazon ami EBS. not other systems
+		system("sudo chmod 666 /etc/fstab");
 
         //update local fstab
-        if (user == 0)
-            cmd = "echo " + entry + " >> /etc/fstab";
-        else
-            cmd = "sudo echo " + entry + " >> /etc/fstab";
+        cmd = "echo " + entry + " >> /etc/fstab";
 
         system(cmd.c_str());
     }
 
-    if (user == 0)
-        cmd = "grep /data" + dbrootID + " " + InstallDir + "/local/etc/pm1/fstab > /dev/null 2>&1";
-    else
-        cmd = "sudo grep /data" + dbrootID + " " + InstallDir + "/local/etc/pm1/fstab > /dev/null 2>&1";
+    cmd = "grep /data" + dbrootID + " " + InstallDir + "/local/etc/pm1/fstab > /dev/null 2>&1";
 
     status = system(cmd.c_str());
 
@@ -10886,13 +10884,23 @@ int Oam::readHdfsActiveAlarms(AlarmList& alarmList)
 
 bool Oam::checkSystemRunning()
 {
-    // string cmd = startup::StartUp::installDir() + "/bin/columnstore status > /tmp/status.log";
-    // system(cmd.c_str());
     struct stat st;
 
-    if (stat("/var/lock/subsys/columnstore", &st) == 0)
+    string lockFileDir = "/var/subsys/lock";
+
+    try
     {
-        return true;
+            Config* sysConfig = Config::makeConfig(CalpontConfigFile.c_str());
+            lockFileDir = sysConfig->getConfig("Installation", "LockFileDirectory");
+    }
+    catch (...)
+    {} // defaulted to false
+
+    string lockFile = lockFileDir + "/columnstore";
+
+    if (stat(lockFile.c_str(), &st) == 0)
+    {
+	return true;
     }
 
     if (geteuid() != 0)
diff --git a/oam/oamcpp/liboamcpp.h b/oam/oamcpp/liboamcpp.h
index 8575cd4d6..cc2f620ca 100644
--- a/oam/oamcpp/liboamcpp.h
+++ b/oam/oamcpp/liboamcpp.h
@@ -2526,6 +2526,7 @@ private:
     std::string ProcessConfigFile;
     std::string InstallDir;
     static int  UseHdfs;
+    std::string userDir;
 
 };	// end of class
 
diff --git a/oam/post/functions b/oam/post/functions
index 477b0d77a..4e9975eb4 100755
--- a/oam/post/functions
+++ b/oam/post/functions
@@ -2,8 +2,29 @@
 # $Id: functions 2937 2012-05-30 18:17:09Z rdempsey $
 #
 
-if [ -z "$COLUMNSTORE_INSTALL_DIR" ]; then
-	test -f /etc/default/columnstore && . /etc/default/columnstore
+prefix=/usr/local
+
+USER=`whoami 2>/dev/null`
+
+if [ $USER != "root" ]; then
+	prefix=$HOME
+fi
+
+if [ $USER != "root" ]; then
+	if [ -f $prefix/.bash_profile ]; then		
+		profileFile=$prefix/.bash_profile
+	elif [ -f $prefix/.profile ]; then		
+		profileFile=$prefix/.profile
+	else
+		profileFile=$prefix/.bashrc
+	fi
+		
+	. $profileFile
+fi
+
+# Source function library.
+if [ -f /etc/init.d/functions ]; then
+	. /etc/init.d/functions
 fi
 
 if [ -z "$COLUMNSTORE_INSTALL_DIR" ]; then
diff --git a/oam/post/test-001.sh b/oam/post/test-001.sh
index 030705ed2..2f0d0fcfb 100755
--- a/oam/post/test-001.sh
+++ b/oam/post/test-001.sh
@@ -2,8 +2,29 @@
 #
 # $Id: test-001.sh 3704 2013-08-07 03:33:20Z bwilkinson $
 
-if [ -z "$COLUMNSTORE_INSTALL_DIR" ]; then
-	test -f /etc/default/columnstore && . /etc/default/columnstore
+prefix=/usr/local
+
+USER=`whoami 2>/dev/null`
+
+if [ $USER != "root" ]; then
+	prefix=$HOME
+fi
+
+if [ $USER != "root" ]; then
+	if [ -f $prefix/.bash_profile ]; then		
+		profileFile=$prefix/.bash_profile
+	elif [ -f $prefix/.profile ]; then		
+		profileFile=$prefix/.profile
+	else
+		profileFile=$prefix/.bashrc
+	fi
+		
+	. $profileFile
+fi
+
+# Source function library.
+if [ -f /etc/init.d/functions ]; then
+	. /etc/init.d/functions
 fi
 
 if [ -z "$COLUMNSTORE_INSTALL_DIR" ]; then
diff --git a/oam/post/test-002.sh b/oam/post/test-002.sh
index ed0b6589f..7e4665672 100755
--- a/oam/post/test-002.sh
+++ b/oam/post/test-002.sh
@@ -2,8 +2,29 @@
 #
 # $Id: test-002.sh 2937 2012-05-30 18:17:09Z rdempsey $
 
-if [ -z "$COLUMNSTORE_INSTALL_DIR" ]; then
-	test -f /etc/default/columnstore && . /etc/default/columnstore
+prefix=/usr/local
+
+USER=`whoami 2>/dev/null`
+
+if [ $USER != "root" ]; then
+	prefix=$HOME
+fi
+
+if [ $USER != "root" ]; then
+	if [ -f $prefix/.bash_profile ]; then		
+		profileFile=$prefix/.bash_profile
+	elif [ -f $prefix/.profile ]; then		
+		profileFile=$prefix/.profile
+	else
+		profileFile=$prefix/.bashrc
+	fi
+		
+	. $profileFile
+fi
+
+# Source function library.
+if [ -f /etc/init.d/functions ]; then
+	. /etc/init.d/functions
 fi
 
 if [ -z "$COLUMNSTORE_INSTALL_DIR" ]; then
diff --git a/oam/post/test-003.sh b/oam/post/test-003.sh
index a01f3e933..7d733ef78 100755
--- a/oam/post/test-003.sh
+++ b/oam/post/test-003.sh
@@ -2,8 +2,29 @@
 #
 # $Id: test-003.sh 2937 2012-05-30 18:17:09Z rdempsey $
 
-if [ -z "$COLUMNSTORE_INSTALL_DIR" ]; then
-	test -f /etc/default/columnstore && . /etc/default/columnstore
+prefix=/usr/local
+
+USER=`whoami 2>/dev/null`
+
+if [ $USER != "root" ]; then
+	prefix=$HOME
+fi
+
+if [ $USER != "root" ]; then
+	if [ -f $prefix/.bash_profile ]; then		
+		profileFile=$prefix/.bash_profile
+	elif [ -f $prefix/.profile ]; then		
+		profileFile=$prefix/.profile
+	else
+		profileFile=$prefix/.bashrc
+	fi
+		
+	. $profileFile
+fi
+
+# Source function library.
+if [ -f /etc/init.d/functions ]; then
+	. /etc/init.d/functions
 fi
 
 if [ -z "$COLUMNSTORE_INSTALL_DIR" ]; then
diff --git a/oam/post/test-004.sh b/oam/post/test-004.sh
index dcabcbfbb..3da9255ac 100644
--- a/oam/post/test-004.sh
+++ b/oam/post/test-004.sh
@@ -6,14 +6,36 @@
 # Validates that FilesPerColumnPartition setting is not set lower than existing extents.
 #
 
-if [ -z "$COLUMNSTORE_INSTALL_DIR" ]; then
-	test -f /etc/default/columnstore && . /etc/default/columnstore
+prefix=/usr/local
+
+USER=`whoami 2>/dev/null`
+
+if [ $USER != "root" ]; then
+	prefix=$HOME
+fi
+
+if [ $USER != "root" ]; then
+	if [ -f $prefix/.bash_profile ]; then		
+		profileFile=$prefix/.bash_profile
+	elif [ -f $prefix/.profile ]; then		
+		profileFile=$prefix/.profile
+	else
+		profileFile=$prefix/.bashrc
+	fi
+		
+	. $profileFile
+fi
+
+# Source function library.
+if [ -f /etc/init.d/functions ]; then
+	. /etc/init.d/functions
 fi
 
 if [ -z "$COLUMNSTORE_INSTALL_DIR" ]; then
 	COLUMNSTORE_INSTALL_DIR=/usr/local/mariadb/columnstore
 fi
 
+export COLUMNSTORE_INSTALL_DIR=$COLUMNSTORE_INSTALL_DI
 export COLUMNSTORE_INSTALL_DIR=$COLUMNSTORE_INSTALL_DIR
 
 test -f $COLUMNSTORE_INSTALL_DIR/post/functions && . $COLUMNSTORE_INSTALL_DIR/post/functions
diff --git a/oamapps/alarmmanager/alarmmanager.cpp b/oamapps/alarmmanager/alarmmanager.cpp
index 37acc7c1e..10ca418d1 100644
--- a/oamapps/alarmmanager/alarmmanager.cpp
+++ b/oamapps/alarmmanager/alarmmanager.cpp
@@ -505,39 +505,8 @@ void ALARMManager::sendAlarmReport (const char* componentID, int alarmID, int st
         // shutdown connection
         procmgr.shutdown();
     }
-    catch (std::runtime_error& e)
-    {
-        LoggingID lid(11);
-        MessageLog ml(lid);
-        Message msg;
-        Message::Args args;
-        args.add("sendAlarmReport error:");
-        args.add(e.what());
-        msg.format(args);
-	      ml.logDebugMessage(msg);             
-    }
-    catch (std::exception& e)
-    {
-        LoggingID lid(11);
-        MessageLog ml(lid);
-        Message msg;
-        Message::Args args;
-        args.add("sendAlarmReport error:");
-        args.add(e.what());
-        msg.format(args);
-	      ml.logDebugMessage(msg);                                
-    }
     catch (...)
-    {
-        LoggingID lid(11);
-        MessageLog ml(lid);
-        Message msg;
-        Message::Args args;
-        args.add("sendAlarmReport error:");
-        args.add("general failure");
-        msg.format(args);
-	      ml.logDebugMessage(msg);             
-    }
+    {}
 
     return;
 #endif //SKIP_ALARM
@@ -652,15 +621,17 @@ void ALARMManager::getActiveAlarm(AlarmList& alarmList) const
 *****************************************************************************************/
 void ALARMManager::getAlarm(std::string date, AlarmList& alarmList) const
 {
-    string alarmFile = "/tmp/alarms";
+	
+    string alarmFile = startup::StartUp::tmpDir() + "/alarms";
 
     //make 1 alarm log file made up of archive and current alarm.log
-    (void)system("touch /tmp/alarms");
-
-    string cmd = ("ls " + ALARM_ARCHIVE_FILE + " | grep 'alarm.log' > /tmp/alarmlogfiles");
+    string cmd = "touch " + alarmFile;
     (void)system(cmd.c_str());
 
-    string fileName = "/tmp/alarmlogfiles";
+    cmd = "ls " + ALARM_ARCHIVE_FILE + " | grep 'alarm.log' > " + alarmFile;
+    (void)system(cmd.c_str());
+
+    string fileName = startup::StartUp::tmpDir() + "/alarmlogfiles";
 
     ifstream oldFile (fileName.c_str());
 
@@ -672,7 +643,7 @@ void ALARMManager::getAlarm(std::string date, AlarmList& alarmList) const
         while (oldFile.getline(line, 200))
         {
             buf = line;
-            string cmd = "cat " + ALARM_ARCHIVE_FILE + "/" + buf + " >> /tmp/alarms";
+            string cmd = "cat " + ALARM_ARCHIVE_FILE + "/" + buf + " >> " + alarmFile;
             (void)system(cmd.c_str());
         }
 
@@ -680,7 +651,7 @@ void ALARMManager::getAlarm(std::string date, AlarmList& alarmList) const
         unlink (fileName.c_str());
     }
 
-    cmd = "cat " + ALARM_FILE + " >> /tmp/alarms";
+    cmd = "cat " + ALARM_FILE + " >> " + alarmFile;
     (void)system(cmd.c_str());
 
     int fd = open(alarmFile.c_str(), O_RDONLY);
diff --git a/oamapps/calpont-console/calpont-console.vpj b/oamapps/calpont-console/calpont-console.vpj
deleted file mode 100644
index 3d9826aab..000000000
--- a/oamapps/calpont-console/calpont-console.vpj
+++ /dev/null
@@ -1,228 +0,0 @@
-<!DOCTYPE Project SYSTEM "http://www.slickedit.com/dtd/vse/10.0/vpj.dtd">
-<Project
-    Version="10.0"
-    VendorName="SlickEdit"
-    TemplateName="GNU C/C++"
-    WorkingDir=".">
-    <Config
-        Name="Debug"
-        Type="gnuc"
-        DebugCallbackName="gdb"
-        Version="1"
-        OutputFile="%bdcalpont-console"
-        CompilerConfigName="Latest Version"
-        ObjectDir="/home/dhall/genii/oamapps/calpont-console/">
-        <Menu>
-            <Target
-                Name="Compile"
-                MenuCaption="&amp;Compile"
-                Dialog="_gnuc_options_form Compile"
-                CaptureOutputWith="ProcessBuffer"
-                Deletable="0"
-                OutputExts="*.o"
-                SaveOption="SaveCurrent"
-                RunFromDir="%rw">
-                <Exec CmdLine='g++ -c %xup  %defd -g -o "%bd%n%oe" %i "%f"'/>
-            </Target>
-            <Target
-                Name="Link"
-                MenuCaption="&amp;Link"
-                ShowOnMenu="Never"
-                Dialog="_gnuc_options_form Link"
-                CaptureOutputWith="ProcessBuffer"
-                Deletable="0"
-                SaveOption="SaveCurrent"
-                RunFromDir="%rw">
-                <Exec CmdLine='g++ %xup -g -o "%o" %f %libs'/>
-            </Target>
-            <Target
-                Name="Build"
-                MenuCaption="&amp;Build"
-                CaptureOutputWith="ProcessBuffer"
-                Deletable="0"
-                SaveOption="SaveWorkspaceFiles"
-                RunFromDir="/home/dhall/genii/oamapps/calpont-console/"
-                ClearProcessBuffer="1">
-                <Exec CmdLine="make -fMakefile"/>
-            </Target>
-            <Target
-                Name="Rebuild"
-                MenuCaption="&amp;Rebuild"
-                CaptureOutputWith="ProcessBuffer"
-                Deletable="0"
-                SaveOption="SaveWorkspaceFiles"
-                RunFromDir="/home/dhall/genii/oamapps/calpont-console/"
-                ClearProcessBuffer="1">
-                <Exec CmdLine="make -fMakefile clean; make -fMakefile"/>
-            </Target>
-            <Target
-                Name="Debug"
-                MenuCaption="&amp;Debug"
-                Dialog="_gnuc_options_form Run/Debug"
-                CaptureOutputWith="ProcessBuffer"
-                Deletable="0"
-                SaveOption="SaveNone"
-                RunFromDir="/home/dhall/genii/oamapps/calpont-console/"
-                RunInXterm="1"
-                ClearProcessBuffer="1">
-                <Exec CmdLine='vsdebugio -prog "%o"'/>
-            </Target>
-            <Target
-                Name="Execute"
-                MenuCaption="E&amp;xecute"
-                Dialog="_gnuc_options_form Run/Debug"
-                CaptureOutputWith="ProcessBuffer"
-                Deletable="0"
-                SaveOption="SaveWorkspaceFiles"
-                RunFromDir="%rw"
-                ClearProcessBuffer="1"
-                RunInXterm="1">
-                <Exec CmdLine='"%o"'/>
-            </Target>
-            <Target
-                Name="dash"
-                MenuCaption="-"
-                Deletable="0">
-                <Exec/>
-            </Target>
-            <Target
-                Name="GNU C Options"
-                MenuCaption="GNU C &amp;Options..."
-                ShowOnMenu="HideIfNoCmdLine"
-                Deletable="0"
-                SaveOption="SaveNone">
-                <Exec
-                    CmdLine="gnucoptions"
-                    Type="Slick-C"/>
-            </Target>
-        </Menu>
-        <List Name="GNUC Options">
-            <Item
-                Name="LinkerOutputType"
-                Value="Executable"/>
-        </List>
-    </Config>
-    <Config
-        Name="Release"
-        Type="gnuc"
-        DebugCallbackName="gdb"
-        Version="1"
-        OutputFile="%bdcalpont-console"
-        CompilerConfigName="Latest Version">
-        <Menu>
-            <Target
-                Name="Compile"
-                MenuCaption="&amp;Compile"
-                Dialog="_gnuc_options_form Compile"
-                CaptureOutputWith="ProcessBuffer"
-                Deletable="0"
-                OutputExts="*.o"
-                SaveOption="SaveCurrent"
-                RunFromDir="%rw">
-                <Exec CmdLine='g++ -c %xup %defd -o "%bd%n%oe" %i "%f"'/>
-            </Target>
-            <Target
-                Name="Link"
-                MenuCaption="&amp;Link"
-                ShowOnMenu="Never"
-                Dialog="_gnuc_options_form Link"
-                CaptureOutputWith="ProcessBuffer"
-                Deletable="0"
-                SaveOption="SaveCurrent"
-                RunFromDir="%rw">
-                <Exec CmdLine='g++ %xup -o "%o" %f %libs'/>
-            </Target>
-            <Target
-                Name="Build"
-                MenuCaption="&amp;Build"
-                CaptureOutputWith="ProcessBuffer"
-                Deletable="0"
-                SaveOption="SaveWorkspaceFiles"
-                RunFromDir="/home/dhall/genii/oamapps/calpont-console/"
-                ClearProcessBuffer="1">
-                <Exec CmdLine="make -fMakefile"/>
-            </Target>
-            <Target
-                Name="Rebuild"
-                MenuCaption="&amp;Rebuild"
-                CaptureOutputWith="ProcessBuffer"
-                Deletable="0"
-                SaveOption="SaveWorkspaceFiles"
-                RunFromDir="/home/dhall/genii/oamapps/calpont-console/"
-                ClearProcessBuffer="1">
-                <Exec CmdLine="make -fMakefile clean; make -fMakefile"/>
-            </Target>
-            <Target
-                Name="Debug"
-                MenuCaption="&amp;Debug"
-                Dialog="_gnuc_options_form Run/Debug"
-                CaptureOutputWith="ProcessBuffer"
-                Deletable="0"
-                SaveOption="SaveNone"
-                RunFromDir="/home/dhall/genii/oamapps/calpont-console/"
-                RunInXterm="1"
-                ClearProcessBuffer="1">
-                <Exec CmdLine='vsdebugio -prog "%o"'/>
-            </Target>
-            <Target
-                Name="Execute"
-                MenuCaption="E&amp;xecute"
-                Dialog="_gnuc_options_form Run/Debug"
-                CaptureOutputWith="ProcessBuffer"
-                Deletable="0"
-                SaveOption="SaveWorkspaceFiles"
-                RunFromDir="%rw"
-                ClearProcessBuffer="1"
-                RunInXterm="1">
-                <Exec CmdLine='"%o"'/>
-            </Target>
-            <Target
-                Name="dash"
-                MenuCaption="-"
-                Deletable="0">
-                <Exec/>
-            </Target>
-            <Target
-                Name="GNU C Options"
-                MenuCaption="GNU C &amp;Options..."
-                ShowOnMenu="HideIfNoCmdLine"
-                Deletable="0"
-                SaveOption="SaveNone">
-                <Exec
-                    CmdLine="gnucoptions"
-                    Type="Slick-C"/>
-            </Target>
-        </Menu>
-        <List Name="GNUC Options">
-            <Item
-                Name="LinkerOutputType"
-                Value="Executable"/>
-        </List>
-    </Config>
-    <Files>
-        <Folder
-            Name="Source Files"
-            Filters="*.c;*.C;*.cc;*.cpp;*.cp;*.cxx;*.c++;*.prg;*.pas;*.dpr;*.asm;*.s;*.bas;*.java;*.cs;*.sc;*.e;*.cob;*.html;*.rc;*.tcl;*.py;*.pl;*.d">
-            <F N="calpontConsole.cpp"/>
-            <F N="tdriver.cpp"/>
-        </Folder>
-        <Folder
-            Name="Header Files"
-            Filters="*.h;*.H;*.hh;*.hpp;*.hxx;*.inc;*.sh;*.cpy;*.if">
-            <F N="calpontConsole.h"/>
-        </Folder>
-        <Folder
-            Name="Resource Files"
-            Filters="*.ico;*.cur;*.dlg"/>
-        <Folder
-            Name="Bitmaps"
-            Filters="*.bmp"/>
-        <Folder
-            Name="Other Files"
-            Filters="">
-            <F
-                N="Makefile"
-                Type="Makefile"/>
-        </Folder>
-    </Files>
-</Project>
diff --git a/oamapps/calpont-console/calpontConsole.vpj b/oamapps/calpont-console/calpontConsole.vpj
deleted file mode 100644
index 4cb8b0e2b..000000000
--- a/oamapps/calpont-console/calpontConsole.vpj
+++ /dev/null
@@ -1,224 +0,0 @@
-<!DOCTYPE Project SYSTEM "http://www.slickedit.com/dtd/vse/10.0/vpj.dtd">
-<Project
-    Version="10.0"
-    VendorName="SlickEdit"
-    TemplateName="GNU C/C++"
-    WorkingDir=".">
-    <Config
-        Name="Debug"
-        Type="gnuc"
-        DebugCallbackName="gdb"
-        Version="1"
-        OutputFile="%bdcalpontConsole"
-        CompilerConfigName="Latest Version"
-        ObjectDir="/home/dhall/genii/oamapps/calpont-console/">
-        <Menu>
-            <Target
-                Name="Compile"
-                MenuCaption="&amp;Compile"
-                Dialog="_gnuc_options_form Compile"
-                CaptureOutputWith="ProcessBuffer"
-                Deletable="0"
-                OutputExts="*.o"
-                SaveOption="SaveCurrent"
-                RunFromDir="%rw">
-                <Exec CmdLine='g++ -c %xup  %defd -g -o "%bd%n%oe" %i "%f"'/>
-            </Target>
-            <Target
-                Name="Link"
-                MenuCaption="&amp;Link"
-                ShowOnMenu="Never"
-                Dialog="_gnuc_options_form Link"
-                CaptureOutputWith="ProcessBuffer"
-                Deletable="0"
-                SaveOption="SaveCurrent"
-                RunFromDir="%rw">
-                <Exec CmdLine='g++ %xup -g -o "%o" %f %libs'/>
-            </Target>
-            <Target
-                Name="Build"
-                MenuCaption="&amp;Build"
-                CaptureOutputWith="ProcessBuffer"
-                Deletable="0"
-                SaveOption="SaveWorkspaceFiles"
-                RunFromDir="/home/dhall/genii/oamapps/calpont-console/"
-                ClearProcessBuffer="1">
-                <Exec CmdLine="make install"/>
-            </Target>
-            <Target
-                Name="Rebuild"
-                MenuCaption="&amp;Rebuild"
-                CaptureOutputWith="ProcessBuffer"
-                Deletable="0"
-                SaveOption="SaveWorkspaceFiles"
-                RunFromDir="/home/dhall/genii/oamapps/calpont-console/"
-                ClearProcessBuffer="1">
-                <Exec CmdLine="make -fMakefile clean; make -fMakefile"/>
-            </Target>
-            <Target
-                Name="Debug"
-                MenuCaption="&amp;Debug"
-                Dialog="_gnuc_options_form Run/Debug"
-                CaptureOutputWith="ProcessBuffer"
-                Deletable="0"
-                SaveOption="SaveNone"
-                RunFromDir="/home/dhall/genii/oamapps/calpont-console/"
-                ClearProcessBuffer="1">
-                <Exec CmdLine='vsdebugio -prog "%o"'/>
-            </Target>
-            <Target
-                Name="Execute"
-                MenuCaption="E&amp;xecute"
-                Dialog="_gnuc_options_form Run/Debug"
-                CaptureOutputWith="ProcessBuffer"
-                Deletable="0"
-                SaveOption="SaveWorkspaceFiles"
-                RunFromDir="%rw"
-                ClearProcessBuffer="1">
-                <Exec CmdLine='"%o"'/>
-            </Target>
-            <Target
-                Name="dash"
-                MenuCaption="-"
-                Deletable="0">
-                <Exec/>
-            </Target>
-            <Target
-                Name="GNU C Options"
-                MenuCaption="GNU C &amp;Options..."
-                ShowOnMenu="HideIfNoCmdLine"
-                Deletable="0"
-                SaveOption="SaveNone">
-                <Exec
-                    CmdLine="gnucoptions"
-                    Type="Slick-C"/>
-            </Target>
-        </Menu>
-        <List Name="GNUC Options">
-            <Item
-                Name="LinkerOutputType"
-                Value="Executable"/>
-        </List>
-    </Config>
-    <Config
-        Name="Release"
-        Type="gnuc"
-        DebugCallbackName="gdb"
-        Version="1"
-        OutputFile="%bdcalpontConsole"
-        CompilerConfigName="Latest Version">
-        <Menu>
-            <Target
-                Name="Compile"
-                MenuCaption="&amp;Compile"
-                Dialog="_gnuc_options_form Compile"
-                CaptureOutputWith="ProcessBuffer"
-                Deletable="0"
-                OutputExts="*.o"
-                SaveOption="SaveCurrent"
-                RunFromDir="%rw">
-                <Exec CmdLine='g++ -c %xup %defd -o "%bd%n%oe" %i "%f"'/>
-            </Target>
-            <Target
-                Name="Link"
-                MenuCaption="&amp;Link"
-                ShowOnMenu="Never"
-                Dialog="_gnuc_options_form Link"
-                CaptureOutputWith="ProcessBuffer"
-                Deletable="0"
-                SaveOption="SaveCurrent"
-                RunFromDir="%rw">
-                <Exec CmdLine='g++ %xup -o "%o" %f %libs'/>
-            </Target>
-            <Target
-                Name="Build"
-                MenuCaption="&amp;Build"
-                CaptureOutputWith="ProcessBuffer"
-                Deletable="0"
-                SaveOption="SaveWorkspaceFiles"
-                RunFromDir="/home/dhall/genii/oamapps/calpont-console/"
-                ClearProcessBuffer="1">
-                <Exec CmdLine="make install"/>
-            </Target>
-            <Target
-                Name="Rebuild"
-                MenuCaption="&amp;Rebuild"
-                CaptureOutputWith="ProcessBuffer"
-                Deletable="0"
-                SaveOption="SaveWorkspaceFiles"
-                RunFromDir="/home/dhall/genii/oamapps/calpont-console/"
-                ClearProcessBuffer="1">
-                <Exec CmdLine="make -fMakefile clean; make -fMakefile"/>
-            </Target>
-            <Target
-                Name="Debug"
-                MenuCaption="&amp;Debug"
-                Dialog="_gnuc_options_form Run/Debug"
-                CaptureOutputWith="ProcessBuffer"
-                Deletable="0"
-                SaveOption="SaveNone"
-                RunFromDir="/home/dhall/genii/oamapps/calpont-console/"
-                ClearProcessBuffer="1">
-                <Exec CmdLine='vsdebugio -prog "%o"'/>
-            </Target>
-            <Target
-                Name="Execute"
-                MenuCaption="E&amp;xecute"
-                Dialog="_gnuc_options_form Run/Debug"
-                CaptureOutputWith="ProcessBuffer"
-                Deletable="0"
-                SaveOption="SaveWorkspaceFiles"
-                RunFromDir="%rw"
-                ClearProcessBuffer="1">
-                <Exec CmdLine='"%o"'/>
-            </Target>
-            <Target
-                Name="dash"
-                MenuCaption="-"
-                Deletable="0">
-                <Exec/>
-            </Target>
-            <Target
-                Name="GNU C Options"
-                MenuCaption="GNU C &amp;Options..."
-                ShowOnMenu="HideIfNoCmdLine"
-                Deletable="0"
-                SaveOption="SaveNone">
-                <Exec
-                    CmdLine="gnucoptions"
-                    Type="Slick-C"/>
-            </Target>
-        </Menu>
-        <List Name="GNUC Options">
-            <Item
-                Name="LinkerOutputType"
-                Value="Executable"/>
-        </List>
-    </Config>
-    <Files>
-        <Folder
-            Name="Source Files"
-            Filters="*.c;*.C;*.cc;*.cpp;*.cp;*.cxx;*.c++;*.prg;*.pas;*.dpr;*.asm;*.s;*.bas;*.java;*.cs;*.sc;*.e;*.cob;*.html;*.rc;*.tcl;*.py;*.pl;*.d">
-            <F N="../calpontConsole/calpontConsole.cpp"/>
-            <F N="tdriver.cpp"/>
-        </Folder>
-        <Folder
-            Name="Header Files"
-            Filters="*.h;*.H;*.hh;*.hpp;*.hxx;*.inc;*.sh;*.cpy;*.if">
-            <F N="calpontConsole.h"/>
-        </Folder>
-        <Folder
-            Name="Resource Files"
-            Filters="*.ico;*.cur;*.dlg"/>
-        <Folder
-            Name="Bitmaps"
-            Filters="*.bmp"/>
-        <Folder
-            Name="Other Files"
-            Filters="">
-            <F
-                N="../calpontConsole/Makefile"
-                Type="Makefile"/>
-        </Folder>
-    </Files>
-</Project>
diff --git a/oamapps/calpontConsole/CMakeLists.txt b/oamapps/calpontConsole/CMakeLists.txt
deleted file mode 100644
index 6566529cc..000000000
--- a/oamapps/calpontConsole/CMakeLists.txt
+++ /dev/null
@@ -1,48 +0,0 @@
-
-#
-# Not used
-#
-#
-
-
-#original Makefile.am contents follow:
-
-## Copyright (C) 2014 InfiniDB, Inc.
-##
-## This program is free software; you can redistribute it and/or
-## modify it under the terms of the GNU General Public License
-## as published by the Free Software Foundation; version 2 of
-## the License.
-##
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-## GNU General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-## MA 02110-1301, USA.
-#
-## $Id: Makefile.am 333 2009-04-03 20:35:04Z rdempsey $
-### Process this file with automake to produce Makefile.in
-#
-#AM_CPPFLAGS = $(idb_cppflags)
-#AM_CFLAGS = $(idb_cflags)
-#AM_CXXFLAGS = $(idb_cxxflags)
-#AM_LDFLAGS = $(idb_ldflags)
-#bin_PROGRAMS = calpontConsole
-#calpontConsole_SOURCES = calpontConsole.cpp
-#calpontConsole_CPPFLAGS = $(idb_common_includes) $(AM_CPPFLAGS)
-#calpontConsole_LDFLAGS = $(idb_common_ldflags) $(idb_common_libs) $(idb_oam_libs) $(idb_exec_libs) -lreadline -lncurses $(AM_LDFLAGS)
-#
-#test:
-#
-#coverage:
-#
-#leakcheck:
-#
-#docs:
-#
-#bootstrap: install-data-am
-#
diff --git a/oamapps/calpontConsole/calpontConsole.cpp b/oamapps/calpontConsole/calpontConsole.cpp
deleted file mode 100644
index ac4d06b5b..000000000
--- a/oamapps/calpontConsole/calpontConsole.cpp
+++ /dev/null
@@ -1,9389 +0,0 @@
-/* Copyright (C) 2014 InfiniDB, Inc.
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License
-   as published by the Free Software Foundation; version 2 of
-   the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-   MA 02110-1301, USA. */
-
-
-/******************************************************************************************
- * $Id: calpontConsole.cpp 3110 2013-06-20 18:09:12Z dhill $
- *
- ******************************************************************************************/
-
-#include <clocale>
-#include <netdb.h>
-extern int h_errno;
-
-#include "columnstoreversion.h"
-#include "calpontConsole.h"
-#include "boost/filesystem/operations.hpp"
-#include "boost/filesystem/path.hpp"
-#include "boost/tokenizer.hpp"
-#include "sessionmanager.h"
-#include "dbrm.h"
-namespace fs = boost::filesystem;
-
-using namespace alarmmanager;
-using namespace std;
-using namespace oam;
-using namespace config;
-
-#include "installdir.h"
-
-// Variables shared in both main and functions
-
-Config* fConfig = 0;
-string Section;
-int CmdID = 0;
-string CmdList[cmdNum];
-int CmdListID[cmdNum];
-string cmdName;
-const string SECTION_NAME = "Cmd";
-int serverInstallType;
-string systemName;
-string parentOAMModule;
-string localModule;
-bool rootUser = true;
-string HOME = "/root";
-
-bool repeatStop;
-
-static void checkPromptThread();
-
-bool waitForActive()
-{
-    Oam oam;
-    SystemStatus systemstatus;
-    SystemProcessStatus systemprocessstatus;
-    bool bfirst = true;
-
-    for (int i = 0 ; i < 1200 ; i ++)
-    {
-        sleep (3);
-
-        try
-        {
-            oam.getSystemStatus(systemstatus);
-
-            if (systemstatus.SystemOpState == ACTIVE)
-            {
-                return true;
-            }
-
-            if (systemstatus.SystemOpState == FAILED)
-            {
-                return false;
-            }
-
-            if (systemstatus.SystemOpState == MAN_OFFLINE)
-            {
-                return false;
-            }
-
-            cout << "." << flush;
-
-            // Check DMLProc for a switch to BUSY_INIT.
-            // In such a case, we need to print a message that rollbacks
-            // are occurring and will take some time.
-            if (bfirst) // Once we've printed our message, no need to waste cpu looking
-            {
-                oam.getProcessStatus(systemprocessstatus);
-
-                for (unsigned int i = 0 ; i < systemprocessstatus.processstatus.size(); i++)
-                {
-                    if (systemprocessstatus.processstatus[i].ProcessName  == "DMLProc")
-                    {
-                        if (systemprocessstatus.processstatus[i].ProcessOpState == oam::ROLLBACK_INIT)
-                        {
-                            cout << endl << endl << "   System Not Ready, DMLProc is checking/processing rollback of abandoned transactions. Processing could take some time, please wait..." << flush;
-                            bfirst = false;
-                        }
-
-                        // At this point, we've found our DMLProc, so there's no need to spin the for loop
-                        // any further.
-                        break;
-                    }
-                }
-            }
-        }
-        catch (...)
-        {
-            // At some point, we need to give up, ProcMgr just isn't going to respond.
-            if (i > 60) // 3 minutes
-            {
-                cout << "ProcMgr not responding while waiting for system to start";
-                break;
-            }
-        }
-    }
-
-    return false;
-}
-
-bool waitForStop()
-{
-    Oam oam;
-    SystemStatus systemstatus;
-    SystemProcessStatus systemprocessstatus;
-
-    for (int i = 0 ; i < 1200 ; i ++)
-    {
-        sleep (3);
-
-        try
-        {
-            oam.getSystemStatus(systemstatus);
-
-            if (systemstatus.SystemOpState == MAN_OFFLINE)
-            {
-                return true;
-            }
-
-            if (systemstatus.SystemOpState == FAILED)
-            {
-                return false;
-            }
-
-            cout << "." << flush;
-        }
-        catch (...)
-        {
-            // At some point, we need to give up, ProcMgr just isn't going to respond.
-            if (i > 60) // 3 minutes
-            {
-                cout << "ProcMgr not responding while waiting for system to start";
-                break;
-            }
-        }
-    }
-
-    return false;
-}
-
-//------------------------------------------------------------------------------
-// Signal handler to catch SIGTERM signal to terminate the process
-//------------------------------------------------------------------------------
-void handleSigTerm(int i)
-{
-    std::cout << "Received SIGTERM to terminate Calpont Console..." << std::endl;
-
-}
-
-//------------------------------------------------------------------------------
-// Signal handler to catch Control-C signal to terminate the process
-//------------------------------------------------------------------------------
-void handleControlC(int i)
-{
-    std::cout << "Received Control-C to terminate the console..." << std::endl;
-    exit(0);
-}
-
-//------------------------------------------------------------------------------
-// Initialize signal handling
-//------------------------------------------------------------------------------
-void setupSignalHandlers()
-{
-#ifdef _MSC_VER
-    //FIXME
-#else
-    // Control-C signal to terminate a command
-    struct sigaction act;
-    memset(&act, 0, sizeof(act));
-    act.sa_handler = handleControlC;
-    sigaction(SIGINT, &act, 0);
-
-    // catch SIGTERM signal to terminate the program
-//    memset(&act, 0, sizeof(act));
-//    act.sa_handler = handleSigTerm;
-//    sigaction(SIGTERM, &act, 0);
-#endif
-}
-
-int main(int argc, char* argv[])
-{
-#ifndef _MSC_VER
-    setuid(0); // set effective ID to root; ignore return status
-#endif
-    setlocale(LC_ALL, "");
-
-    Oam oam;
-    char* pcommand = 0;
-    string arguments[ArgNum];
-
-    const char* p = getenv("HOME");
-
-    if (!p)
-        p = "";
-    else
-        HOME = p;
-
-    string ccHistoryFile = HOME + "/.cc_history";
-
-    string cf = startup::StartUp::installDir() + "/etc/" + ConsoleCmdsFile;
-    fConfig = Config::makeConfig(cf);
-
-//	setupSignalHandlers();
-
-    // Get System Name
-    try
-    {
-        oam.getSystemConfig("SystemName", systemName);
-    }
-    catch (...)
-    {
-        cout << endl << "**** Failed : Failed to read systemName Name" << endl;
-        exit(-1);
-    }
-
-    //get parentModule Name
-    parentOAMModule = getParentOAMModule();
-
-    // get Local Module Name and Single Server Install Indicator
-    oamModuleInfo_t st;
-
-    try
-    {
-        st = oam.getModuleInfo();
-        localModule = boost::get<0>(st);
-        serverInstallType = boost::get<5>(st);
-    }
-    catch (...)
-    {
-        cout << endl << "**** Failed : Failed to read Local Module Name" << endl;
-        exit(-1);
-    }
-
-    //check if root-user
-    int user;
-    user = getuid();
-
-    if (user != 0)
-        rootUser = false;
-
-    // create/open command log file if not created
-
-    logFile.open(DEFAULT_LOG_FILE.c_str(), ios::app);
-
-    if (geteuid() == 0 && !logFile)
-    {
-        cerr << "UI Command log file cannot be opened" << endl;
-    }
-
-    writeLog("Start of a command session!!!");
-
-    // get and sort command list for future help display
-
-    for (int i = 0; i < cmdNum ; i++)
-    {
-        // get cmd name
-
-        Section = SECTION_NAME + oam.itoa(i);
-
-        cmdName = fConfig->getConfig(Section, "Name");
-
-        if (cmdName.empty())
-            // no command skip
-            continue;
-
-        CmdList[i] = cmdName;
-        CmdListID[i] = i;
-
-        // sort
-
-        for (int j = 0; j < i ; j++)
-        {
-            if ( CmdList[i] < CmdList[j] )
-            {
-                cmdName = CmdList[i];
-                CmdList[i] = CmdList[j];
-                CmdList[j] = cmdName;
-                CmdID = CmdListID[i];
-                CmdListID[i] = CmdListID[j];
-                CmdListID[j] = CmdID;
-            }
-        }
-    }
-
-    if ( localModule != parentOAMModule )
-    {
-        // issue message informing user they aren't logged into Active OAm Parent
-        cout << endl;
-        cout << "WARNING: running on non Parent OAM Module, can't make configuration changes in this session." << endl;
-        cout << "         Access Console from '" << parentOAMModule << "' if you need to make changes." << endl << endl;
-    }
-
-    // check for arguments passed in as a request
-
-    if (argc > 1)
-    {
-        int j = 0;
-        string command;
-
-        for (; argc > 1; j++, argc--)
-        {
-            arguments[j] = argv[j + 1];
-            command.append(arguments[j]);
-            command.append(" ");
-        }
-
-        // add to history and UI command log file
-        read_history(ccHistoryFile.c_str());
-        add_history (command.c_str());
-        writeLog(command.c_str());
-        write_history(ccHistoryFile.c_str());
-
-        checkRepeat(arguments, j);
-    }
-    else
-    {
-        cout << endl << "Calpont InfiniDB Command Console" << endl;
-        cout << "   enter 'help' for list of commands" << endl;
-        cout << "   enter 'exit' to exit the Calpont InfiniDB Command Console" << endl;
-        cout << "   use up/down arrows to recall commands" << endl << endl;
-
-        // output current active alarm stats
-        printAlarmSummary();
-        printCriticalAlarms();
-
-        //read readline history file
-        read_history(ccHistoryFile.c_str());
-
-        while (true)
-        {
-            //get parentModule Name
-            parentOAMModule = getParentOAMModule();
-
-            // flush agument list
-            for (int j = 0; j < ArgNum; j++)
-            {
-                arguments[j].clear();
-            }
-
-            // read input
-            pcommand = readline("InfiniDB> ");
-
-            if (!pcommand)                        // user hit <Ctrl>-D
-                pcommand = strdup("exit");
-
-            else if (!*pcommand)
-            {
-                // just an enter-key was entered, ignore and reprompt
-                continue;
-            }
-
-            // add to history and UI command log file
-            add_history (pcommand);
-            writeLog(pcommand);
-            write_history(ccHistoryFile.c_str());
-
-            string command = pcommand;
-
-            //check if a argument was entered as a set of char with quotes around them
-            int commandLoc = 0;
-            int numberArgs = 0;
-            bool validCMD = true;
-
-            for (int i = 0; i < ArgNum; i++)
-            {
-                string::size_type pos = command.find(" ", commandLoc);
-                string::size_type pos1 = command.find("\"", commandLoc);
-                string::size_type pos3 = command.find("\'", commandLoc);
-
-                if ( (pos == string::npos && pos1 == string::npos) ||
-                        (pos == string::npos && pos3 == string::npos) )
-                {
-                    //end of the command
-                    string argtemp = command.substr(commandLoc, 80);
-
-                    if ( argtemp != "" )
-                    {
-                        arguments[numberArgs] = argtemp;
-                        numberArgs++;
-                    }
-
-                    break;
-                }
-
-                if (pos < pos1 && pos < pos3)
-                {
-                    // hit ' ' first
-                    string argtemp = command.substr(commandLoc, pos - commandLoc);
-
-                    if ( argtemp != "" )
-                    {
-                        arguments[numberArgs] = argtemp;
-                        numberArgs++;
-                    }
-
-                    commandLoc = pos + 1;
-                }
-                else
-                {
-                    if ( pos >= pos1 )
-                    {
-                        //hit " first
-                        string::size_type pos2 = command.find("\"", pos1 + 1);
-
-                        if (pos2 != string::npos)
-                        {
-                            arguments[numberArgs] = command.substr(pos1 + 1, pos2 - pos1 - 1);
-                            numberArgs++;
-                            commandLoc = pos2 + 1;
-                        }
-                        else
-                        {
-                            cout << "Invalid Command, mismatching use of quotes" << endl;
-                            validCMD = false;
-                            break;
-                        }
-                    }
-                    else
-                    {
-                        //hit ' first
-                        string::size_type pos2 = command.find("\'", pos3 + 1);
-
-                        if (pos2 != string::npos)
-                        {
-                            arguments[numberArgs] = command.substr(pos3 + 1, pos2 - pos3 - 1);
-                            numberArgs++;
-                            commandLoc = pos2 + 1;
-                        }
-                        else
-                        {
-                            cout << "Invalid Command, mismatching use of quotes" << endl;
-                            validCMD = false;
-                            break;
-                        }
-                    }
-                }
-            }
-
-            if (validCMD)
-                checkRepeat(arguments, numberArgs);
-
-            free (pcommand);
-        }
-    }
-}
-
-void checkRepeat(string* arguments, int argNumber)
-{
-    Oam oam;
-    bool repeat = false;
-    int repeatCount = 5;
-
-    for ( int i = 0; i < argNumber ; i++)
-    {
-        if ( arguments[i].find("-r") == 0)
-        {
-            // entered
-            if ( arguments[i] != "-r")
-            {
-                //strip report count off
-                repeatCount = atoi(arguments[i].substr(2, 10).c_str());
-
-                if ( repeatCount < 1 || repeatCount > 60 )
-                {
-                    cout << "Failed: incorrect repeat count entered, valid range is 1-60, set to default of 5" << endl;
-                    repeatCount = 5;
-                }
-            }
-
-            repeat = true;
-            arguments[i].clear();
-            cout << "repeating the command '" << arguments[0] << "' every " << repeatCount << " seconds, enter CTRL-D to stop" << endl;
-            sleep(5);
-            break;
-        }
-    }
-
-    bool threadCreate = false;
-
-    if (repeat)
-    {
-        while (true)
-        {
-            system("clear");
-
-            if ( processCommand(arguments) )
-                return;
-            else
-            {
-                if ( !threadCreate )
-                {
-                    threadCreate = true;
-                    repeatStop = false;
-                    pthread_t PromptThread;
-                    pthread_create (&PromptThread, NULL, (void* (*)(void*)) &checkPromptThread, NULL);
-                }
-
-                for ( int i = 0 ; i < repeatCount ; i ++ )
-                {
-                    if (repeatStop)
-                        break;
-
-                    sleep(1);
-                }
-
-                if (repeatStop)
-                    break;
-            }
-        }
-    }
-    else
-        processCommand(arguments);
-}
-
-int processCommand(string* arguments)
-{
-    Oam oam;
-    // Possible command line arguments
-    GRACEFUL_FLAG gracefulTemp = GRACEFUL;
-    ACK_FLAG ackTemp = ACK_YES;
-    CC_SUSPEND_ANSWER suspendAnswer = CANCEL;
-    bool bNeedsConfirm = true;
-    string password;
-
-    // get command info from Command config file
-    CmdID = -1;
-
-    // put inputted command into lowercase
-    string inputCmd = arguments[0];
-    transform (inputCmd.begin(), inputCmd.end(), inputCmd.begin(), to_lower());
-
-    for (int i = 0; i < cmdNum; i++)
-    {
-        // put table command into lowercase
-        string cmdName_LC = CmdList[i];
-        transform (cmdName_LC.begin(), cmdName_LC.end(), cmdName_LC.begin(), to_lower());
-
-        if (cmdName_LC.find(inputCmd) == 0)
-        {
-            // command found, ECHO command
-            cout << cmdName_LC << "   " << oam.getCurrentTime() << endl;
-            CmdID = CmdListID[i];
-            break;
-        }
-    }
-
-    if (CmdID == -1)
-    {
-        // get is command in the Support Command list
-        for (int i = 0;; i++)
-        {
-            if (supportCmds[i] == "")
-                // end of list
-                break;
-
-            if (supportCmds[i].find(inputCmd) == 0)
-            {
-                // match found, go process it
-                cout << supportCmds[i] << "   " << oam.getCurrentTime() << endl;
-                int status = ProcessSupportCommand(i, arguments);
-
-                if ( status == -1 )
-                    // didn't process it for some reason
-                    break;
-
-                return 1;
-            }
-        }
-
-        // command not valid
-        cout << arguments[0] << ": Unknown Command, type help for list of commands" << endl << endl;
-        return 1;
-    }
-
-    switch ( CmdID )
-    {
-        case 0: // help
-        case 1: // ?
-        {
-            const string DESC_NAME = "Desc";
-            string desc;
-            string descName;
-            const string ARG_NAME = "Arg";
-            string arg;
-            string argName;
-
-            string argument1_LC = arguments[1];
-            transform (argument1_LC.begin(), argument1_LC.end(), argument1_LC.begin(), to_lower());
-
-            if (argument1_LC.find("-a") == 0 || argument1_LC == "")
-            {
-                // list commands and brief description (Desc1)
-                cout << endl << "List of commands:" << endl;
-                cout << "Note: the command must be the first entry entered on the command line" << endl << endl;
-                cout.setf(ios::left);
-                cout.width(34);
-                cout << "Command" << "Description" << endl;
-                cout.setf(ios::left);
-                cout.width(34);
-                cout << "------------------------------" << "--------------------------------------------------------" << endl;
-
-                for (int i = 0; i < cmdNum ; i++)
-                {
-                    // get cmd name
-
-                    Section = SECTION_NAME + oam.itoa(CmdListID[i]);
-
-                    cmdName = fConfig->getConfig(Section, "Name");
-
-                    if (cmdName.empty()  || cmdName == "AVAILABLE")
-                        // no command skip
-                        continue;
-
-                    cout.setf(ios::left);
-                    cout.width(34);
-                    cout << cmdName << fConfig->getConfig(Section, "Desc1") << endl;
-                }
-
-                cout << endl << "For help on a command, enter 'help' followed by command name" << endl;
-            }
-            else
-            {
-                if (argument1_LC.find("-v") == 0)
-                {
-                    // list of commands with their descriptions
-                    cout << endl << "List of commands and descriptions:" << endl << endl;
-
-                    for (int k = 0 ; k < cmdNum ; k++)
-                    {
-                        Section = SECTION_NAME + oam.itoa(CmdListID[k]);
-                        cmdName = fConfig->getConfig(Section, "Name");
-
-                        if (cmdName.empty()  || cmdName == "AVAILABLE")
-                            //no command skip
-                            continue;
-
-                        cout << "Command: " << cmdName << endl << endl;
-                        int i = 2;
-                        cout << "   Description: " << fConfig->getConfig(Section, "Desc1") << endl;
-
-                        while (true)
-                        {
-                            desc = DESC_NAME + oam.itoa(i);
-                            descName = fConfig->getConfig(Section, desc);
-
-                            if (descName.empty())
-                                //end of Desc list
-                                break;
-
-                            cout << "                " << descName << endl;
-                            i++;
-                        }
-
-                        i = 2;
-                        cout << endl << "   Arguments:   " << fConfig->getConfig(Section, "Arg1") << endl;
-
-                        while (true)
-                        {
-                            arg = ARG_NAME + oam.itoa(i);
-                            argName = fConfig->getConfig(Section, arg);
-
-                            if (argName.empty())
-                                //end of arg list
-                                break;
-
-                            cout << "                " << argName << endl;
-                            i++;
-                        }
-
-                        cout << endl;
-                    }
-                }
-                else
-                {
-                    // description for a single command
-                    int j = 0;
-
-                    for (j = 0; j < cmdNum; j++)
-                    {
-                        // get cmd description
-
-                        Section = SECTION_NAME + oam.itoa(j);
-
-                        cmdName = fConfig->getConfig(Section, "Name");
-
-                        string cmdName_LC = cmdName;
-                        transform (cmdName_LC.begin(), cmdName_LC.end(), cmdName_LC.begin(), to_lower());
-
-                        if (cmdName_LC == argument1_LC)
-                        {
-                            // command found, output description
-                            cout << endl << "   Command:     " << cmdName << endl << endl;
-                            int i = 2;
-                            cout << "   Description: " << fConfig->getConfig(Section, "Desc1") << endl;
-
-                            while (true)
-                            {
-                                desc = DESC_NAME + oam.itoa(i);
-                                descName = fConfig->getConfig(Section, desc);
-
-                                if (descName.empty())
-                                    //end of Desc list
-                                    break;
-
-                                cout << "                " << descName << endl;
-                                i++;
-                            }
-
-                            i = 2;
-                            cout << endl << "   Arguments:   " << fConfig->getConfig(Section, "Arg1") << endl;
-
-                            while (true)
-                            {
-                                arg = ARG_NAME + oam.itoa(i);
-                                argName = fConfig->getConfig(Section, arg);
-
-                                if (argName.empty())
-                                    //end of arg list
-                                    break;
-
-                                cout << "                " << argName << endl;
-                                i++;
-                            }
-
-                            break;
-                        }
-                    }
-
-                    if (j == cmdNum)
-                    {
-                        // command not valid
-                        cout << arguments[1] << ": Unknown Command, type help for list of commands" << endl << endl;
-                        break;
-                    }
-                }
-            }
-
-            cout << endl;
-        }
-        break;
-
-        case 2: // exit
-        case 3: // quit
-        {
-            // close the log file
-            writeLog("End of a command session!!!");
-            logFile.close();
-            cout << "Exiting the Calpont Command Console" << endl;
-
-            exit (0);
-        }
-        break;
-
-        case 4: // getSystemConfig
-        {
-            SystemConfig systemconfig;
-            string returnValue;
-
-            if (arguments[1] == "all" || arguments[1] == "")
-            {
-
-                // get and all display System config parameters
-
-                try
-                {
-                    oam.getSystemConfig(systemconfig);
-
-                    cout << endl << "System Configuration" << endl << endl;
-
-                    cout << "SystemName = " << systemconfig.SystemName << endl;
-                    cout << "SoftwareVersion = " << columnstore_version << endl;
-                    cout << "SoftwareRelease = " << columnstore_release << endl;
-
-                    cout << "ParentOAMModuleName = " << systemconfig.ParentOAMModule << endl;
-                    cout << "StandbyOAMModuleName = " << systemconfig.StandbyOAMModule << endl;
-                    cout << "NMSIPAddr = " << systemconfig.NMSIPAddr << endl;
-                    cout << "ModuleHeartbeatPeriod = " << systemconfig.ModuleHeartbeatPeriod << endl;
-                    cout << "ModuleHeartbeatCount = " << systemconfig.ModuleHeartbeatCount << endl;
-//                    cout << "ProcessHeartbeatPeriod = " << systemconfig.ProcessHeartbeatPeriod << endl;
-                    cout << "DBRootCount = " << systemconfig.DBRootCount << endl;
-
-                    std::vector<std::string>::iterator pt = systemconfig.DBRoot.begin();
-                    int id = 1;
-
-                    for ( ; pt != systemconfig.DBRoot.end() ; pt++)
-                    {
-                        string dbroot = *pt;
-                        cout << "DBRoot" + oam.itoa(id) + " = " + dbroot << endl;
-                        ++id;
-                    }
-
-                    cout << "DBRMRoot = " << systemconfig.DBRMRoot << endl;
-                    cout << "ExternalCriticalThreshold = " << systemconfig.ExternalCriticalThreshold << endl;
-                    cout << "ExternalMajorThreshold = " << systemconfig.ExternalMajorThreshold << endl;
-                    cout << "ExternalMinorThreshold = " << systemconfig.ExternalMinorThreshold << endl;
-                    cout << "MaxConcurrentTransactions = " << systemconfig.MaxConcurrentTransactions << endl;
-                    cout << "SharedMemoryTmpFile = " << systemconfig.SharedMemoryTmpFile << endl;
-                    cout << "NumVersionBufferFiles = " << systemconfig.NumVersionBufferFiles << endl;
-                    cout << "VersionBufferFileSize = " << systemconfig.VersionBufferFileSize << endl;
-                    cout << "OIDBitmapFile = " << systemconfig.OIDBitmapFile << endl;
-                    cout << "FirstOID = " << systemconfig.FirstOID << endl;
-                    cout << "TransactionArchivePeriod = " << systemconfig.TransactionArchivePeriod << endl;
-
-                }
-                catch (exception& e)
-                {
-                    cout << endl << "**** getSystemConfig Failed :  " << e.what() << endl;
-                }
-            }
-            else
-            {
-                // get a single parameter
-
-                try
-                {
-                    oam.getSystemConfig(arguments[1], returnValue);
-                    cout << endl << "   " << arguments[1] << " = " << returnValue << endl << endl;
-                }
-                catch (exception& e)
-                {
-                    cout << endl << "**** getSystemConfig Failed :  " << e.what() << endl;
-                }
-            }
-        }
-        break;
-
-        case 5: // setSystemConfig - parameters: Module name, Parameter name and value
-        {
-            parentOAMModule = getParentOAMModule();
-
-            if ( localModule != parentOAMModule )
-            {
-                // exit out since not on Parent OAM Module
-                cout << endl << "**** setSystemConfig Failed : only should be run on the Parent OAM Module, which is '" << parentOAMModule << "'" << endl;
-                break;
-            }
-
-            if (arguments[2] == "")
-            {
-                // need 2 arguments
-                cout << endl << "**** setSystemConfig Failed : Missing a required Parameter, enter 'help' for additional information" << endl;
-                break;
-            }
-
-            try
-            {
-                if ( arguments[2] == "=" )
-                {
-                    cout << endl << "**** setSystemConfig Failed : Invalid Value of '=', please re-enter" << endl;
-                    break;
-                }
-
-                oam.setSystemConfig(arguments[1], arguments[2]);
-                cout << endl << "   Successfully set " << arguments[1] << " = " << arguments[2] << endl << endl;
-            }
-            catch (exception& e)
-            {
-                cout << endl << "**** setSystemConfig Failed :  " << e.what() << endl;
-            }
-        }
-        break;
-
-        case 6: // getModuleTypeConfig
-        {
-            SystemModuleTypeConfig systemmoduletypeconfig;
-            ModuleTypeConfig moduletypeconfig;
-            ModuleConfig moduleconfig;
-            systemmoduletypeconfig.moduletypeconfig.clear();
-            string returnValue;
-            string Argument;
-
-            if (arguments[1] == "all" || arguments[1] == "")
-            {
-
-                // get and all display Module config parameters
-
-                try
-                {
-                    oam.getSystemConfig(systemmoduletypeconfig);
-
-                    cout << endl << "Module Type Configuration" << endl << endl;
-
-                    for ( unsigned int i = 0 ; i < systemmoduletypeconfig.moduletypeconfig.size(); i++)
-                    {
-                        if ( systemmoduletypeconfig.moduletypeconfig[i].ModuleType.empty() )
-                            // end of list
-                            break;
-
-                        int moduleCount = systemmoduletypeconfig.moduletypeconfig[i].ModuleCount;
-
-                        if ( moduleCount < 1 )
-                            continue;
-
-                        string moduletype = systemmoduletypeconfig.moduletypeconfig[i].ModuleType;
-                        cout << "ModuleType '" << moduletype	<< "' Configuration information" << endl << endl;
-
-                        cout << "ModuleDesc = " << systemmoduletypeconfig.moduletypeconfig[i].ModuleDesc << endl;
-                        cout << "RunType = " << systemmoduletypeconfig.moduletypeconfig[i].RunType << endl;
-                        cout << "ModuleCount = " << moduleCount << endl;
-
-                        if ( moduleCount > 0 )
-                        {
-                            DeviceNetworkList::iterator pt = systemmoduletypeconfig.moduletypeconfig[i].ModuleNetworkList.begin();
-
-                            for ( ; pt != systemmoduletypeconfig.moduletypeconfig[i].ModuleNetworkList.end() ; pt++)
-                            {
-                                string modulename = (*pt).DeviceName;
-                                HostConfigList::iterator pt1 = (*pt).hostConfigList.begin();
-
-                                for ( ; pt1 != (*pt).hostConfigList.end() ; pt1++)
-                                {
-                                    string ipAddr = (*pt1).IPAddr;
-                                    string servername = (*pt1).HostName;
-                                    cout << "ModuleHostName and ModuleIPAddr for NIC ID " + oam.itoa((*pt1).NicID) + " on  module '" << modulename << "' = " << servername  << " , " << ipAddr << endl;
-                                }
-                            }
-                        }
-
-                        DeviceDBRootList::iterator pt = systemmoduletypeconfig.moduletypeconfig[i].ModuleDBRootList.begin();
-
-                        for ( ; pt != systemmoduletypeconfig.moduletypeconfig[i].ModuleDBRootList.end() ; pt++)
-                        {
-                            if ( (*pt).dbrootConfigList.size() > 0 )
-                            {
-                                cout << "DBRootIDs assigned to module 'pm" << (*pt).DeviceID << "' = ";
-                                DBRootConfigList::iterator pt1 = (*pt).dbrootConfigList.begin();
-
-                                for ( ; pt1 != (*pt).dbrootConfigList.end() ; )
-                                {
-                                    cout << *pt1;
-                                    pt1++;
-
-                                    if (pt1 != (*pt).dbrootConfigList.end())
-                                        cout << ", ";
-                                }
-                            }
-
-                            cout << endl;
-                        }
-
-                        cout << "ModuleCPUCriticalThreshold % = " << systemmoduletypeconfig.moduletypeconfig[i].ModuleCPUCriticalThreshold << endl;
-                        cout << "ModuleCPUMajorThreshold % = " << systemmoduletypeconfig.moduletypeconfig[i].ModuleCPUMajorThreshold << endl;
-                        cout << "ModuleCPUMinorThreshold % = " << systemmoduletypeconfig.moduletypeconfig[i].ModuleCPUMinorThreshold << endl;
-                        cout << "ModuleCPUMinorClearThreshold % = " << systemmoduletypeconfig.moduletypeconfig[i].ModuleCPUMinorClearThreshold << endl;
-                        cout << "ModuleDiskCriticalThreshold % = " << systemmoduletypeconfig.moduletypeconfig[i].ModuleDiskCriticalThreshold << endl;
-                        cout << "ModuleDiskMajorThreshold % = " << systemmoduletypeconfig.moduletypeconfig[i].ModuleDiskMajorThreshold << endl;
-                        cout << "ModuleDiskMinorThreshold % = " << systemmoduletypeconfig.moduletypeconfig[i].ModuleDiskMinorThreshold << endl;
-                        cout << "ModuleMemCriticalThreshold % = " << systemmoduletypeconfig.moduletypeconfig[i].ModuleMemCriticalThreshold << endl;
-                        cout << "ModuleMemMajorThreshold % = " << systemmoduletypeconfig.moduletypeconfig[i].ModuleMemMajorThreshold << endl;
-                        cout << "ModuleMemMinorThreshold % = " << systemmoduletypeconfig.moduletypeconfig[i].ModuleMemMinorThreshold << endl;
-                        cout << "ModuleSwapCriticalThreshold % = " << systemmoduletypeconfig.moduletypeconfig[i].ModuleSwapCriticalThreshold << endl;
-                        cout << "ModuleSwapMajorThreshold % = " << systemmoduletypeconfig.moduletypeconfig[i].ModuleSwapMajorThreshold << endl;
-                        cout << "ModuleSwapMinorThreshold % = " << systemmoduletypeconfig.moduletypeconfig[i].ModuleSwapMinorThreshold << endl;
-
-                        DiskMonitorFileSystems::iterator pt2 = systemmoduletypeconfig.moduletypeconfig[i].FileSystems.begin();
-                        int id = 1;
-
-                        for ( ; pt2 != systemmoduletypeconfig.moduletypeconfig[i].FileSystems.end() ; pt2++)
-                        {
-                            string fs = *pt2;
-                            cout << "ModuleDiskMonitorFileSystem#" << id << " = " << fs << endl;
-                            ++id;
-                        }
-
-                        cout << endl;
-                    }
-                }
-                catch (exception& e)
-                {
-                    cout << endl << "**** getModuleTypeConfig Failed =  " << e.what() << endl;
-                }
-            }
-            else
-            {
-                // get a single module type config
-                if (arguments[2] == "")
-                {
-                    try
-                    {
-                        oam.getSystemConfig(arguments[1], moduletypeconfig);
-
-                        cout << endl << "Module Type Configuration for " << arguments[1] << endl << endl;
-
-                        int moduleCount = moduletypeconfig.ModuleCount;
-                        string moduletype = moduletypeconfig.ModuleType;
-
-                        cout << "ModuleDesc = " << moduletypeconfig.ModuleDesc << endl;
-                        cout << "ModuleCount = " << moduleCount << endl;
-                        cout << "RunType = " << moduletypeconfig.RunType << endl;
-
-                        if ( moduleCount > 0 )
-                        {
-                            DeviceNetworkList::iterator pt = moduletypeconfig.ModuleNetworkList.begin();
-
-                            for ( ; pt != moduletypeconfig.ModuleNetworkList.end() ; pt++)
-                            {
-                                string modulename = (*pt).DeviceName;
-                                HostConfigList::iterator pt1 = (*pt).hostConfigList.begin();
-
-                                for ( ; pt1 != (*pt).hostConfigList.end() ; pt1++)
-                                {
-                                    string ipAddr = (*pt1).IPAddr;
-                                    string servername = (*pt1).HostName;
-                                    cout << "ModuleHostName and ModuleIPAddr for NIC ID " + oam.itoa((*pt1).NicID) + " on  module " << modulename << " = " << servername  << " , " << ipAddr << endl;
-                                }
-                            }
-                        }
-
-                        int dbrootCount = moduletypeconfig.ModuleDBRootList.size();
-
-                        cout << "DBRootCount = " << dbrootCount << endl;
-
-                        if ( dbrootCount > 0 )
-                        {
-                            DeviceDBRootList::iterator pt = moduletypeconfig.ModuleDBRootList.begin();
-
-                            for ( ; pt != moduletypeconfig.ModuleDBRootList.end() ; pt++)
-                            {
-                                cout << "DBRoot IDs assigned to 'pm" + oam.itoa((*pt).DeviceID) + "' = ";
-
-                                DBRootConfigList::iterator pt1 = (*pt).dbrootConfigList.begin();
-
-                                for ( ; pt1 != (*pt).dbrootConfigList.end() ; )
-                                {
-                                    cout << *pt1;
-                                    pt1++;
-
-                                    if (pt1 != (*pt).dbrootConfigList.end())
-                                        cout << ", ";
-                                }
-
-                                cout << endl;
-                            }
-                        }
-
-                        cout << "ModuleCPUCriticalThreshold % = " << moduletypeconfig.ModuleCPUCriticalThreshold << endl;
-                        cout << "ModuleCPUMajorThreshold % = " << moduletypeconfig.ModuleCPUMajorThreshold << endl;
-                        cout << "ModuleCPUMinorThreshold % = " << moduletypeconfig.ModuleCPUMinorThreshold << endl;
-                        cout << "ModuleCPUMinorClearThreshold % = " << moduletypeconfig.ModuleCPUMinorClearThreshold << endl;
-                        cout << "ModuleDiskCriticalThreshold % = " << moduletypeconfig.ModuleDiskCriticalThreshold << endl;
-                        cout << "ModuleDiskMajorThreshold % = " << moduletypeconfig.ModuleDiskMajorThreshold << endl;
-                        cout << "ModuleDiskMinorThreshold % = " << moduletypeconfig.ModuleDiskMinorThreshold << endl;
-                        cout << "ModuleMemCriticalThreshold % = " << moduletypeconfig.ModuleMemCriticalThreshold << endl;
-                        cout << "ModuleMemMajorThreshold % = " << moduletypeconfig.ModuleMemMajorThreshold << endl;
-                        cout << "ModuleMemMinorThreshold % = " << moduletypeconfig.ModuleMemMinorThreshold << endl;
-                        cout << "ModuleSwapCriticalThreshold % = " << moduletypeconfig.ModuleSwapCriticalThreshold << endl;
-                        cout << "ModuleSwapMajorThreshold % = " << moduletypeconfig.ModuleSwapMajorThreshold << endl;
-                        cout << "ModuleSwapMinorThreshold % = " << moduletypeconfig.ModuleSwapMinorThreshold << endl;
-
-                        DiskMonitorFileSystems::iterator pt = moduletypeconfig.FileSystems.begin();
-                        int id = 1;
-
-                        for ( ; pt != moduletypeconfig.FileSystems.end() ; pt++)
-                        {
-                            string fs = *pt;
-                            cout << "ModuleDiskMonitorFileSystem#" << id << " = " << fs << endl;
-                            ++id;
-                        }
-
-                        cout << endl;
-                    }
-                    catch (exception& e)
-                    {
-                        cout << endl << "**** getModuleTypeConfig Failed =  " << e.what() << endl;
-                    }
-                }
-                else
-                {
-                    // get a parameter for a module type
-                    try
-                    {
-                        oam.getSystemConfig(systemmoduletypeconfig);
-                    }
-                    catch (...)
-                    {}
-
-                    unsigned int i = 0;
-
-                    for ( i = 0 ; i < systemmoduletypeconfig.moduletypeconfig.size(); i++)
-                    {
-                        if (systemmoduletypeconfig.moduletypeconfig[i].ModuleType == arguments[1])
-                        {
-                            string argument2 = arguments[2];
-                            string::size_type pos = arguments[2].rfind("#", 200);
-
-                            if (pos != string::npos)
-                            {
-                                string ID = arguments[2].substr(pos + 1, 5);
-                                arguments[2] = arguments[2].substr(0, pos);
-                                arguments[2] = arguments[2] + ID + "-";
-                            }
-
-                            Argument = arguments[2] + oam.itoa(i + 1);
-
-                            try
-                            {
-                                oam.getSystemConfig(Argument, returnValue);
-                                cout << endl << "   " << argument2 << " = " << returnValue << endl << endl;
-                                break;
-                            }
-                            catch (exception& e)
-                            {
-                                cout << endl << "**** getModuleTypeConfig Failed =  " << e.what() << endl;
-                                break;
-                            }
-                        }
-                    }
-
-                    if ( i == systemmoduletypeconfig.moduletypeconfig.size() )
-                    {
-                        // module type not found
-                        cout << endl << "**** getModuleTypeConfig Failed : Invalid Module Type" << endl;
-                        break;
-                    }
-                }
-            }
-        }
-        break;
-
-        case 7: // setModuleTypeConfig - parameters: Module type, Parameter name and value
-        {
-            SystemModuleTypeConfig systemmoduletypeconfig;
-            ModuleTypeConfig moduletypeconfig;
-            string Argument;
-
-            parentOAMModule = getParentOAMModule();
-
-            if ( localModule != parentOAMModule )
-            {
-                // exit out since not on Parent OAM Module
-                cout << endl << "**** setModuleTypeConfig Failed : only should be run on the Parent OAM Module, which is '" << parentOAMModule << "'" << endl;
-                break;
-            }
-
-            if (arguments[3] == "")
-            {
-                // need 3 arguments
-                cout << endl << "**** setModuleTypeConfig Failed : Missing a required Parameter, enter 'help' for additional information" << endl;
-                break;
-            }
-
-            if ( arguments[3] == "=" )
-            {
-                cout << endl << "**** setModuleTypeConfig Failed : Invalid Value of '=', please re-enter" << endl;
-                break;
-            }
-
-            try
-            {
-                oam.getSystemConfig(systemmoduletypeconfig);
-            }
-            catch (...)
-            {}
-
-            unsigned int i = 0;
-
-            for ( i = 0 ; i < systemmoduletypeconfig.moduletypeconfig.size(); i++)
-            {
-                if (systemmoduletypeconfig.moduletypeconfig[i].ModuleType == arguments[1])
-                {
-                    string argument2 = arguments[2];
-                    string::size_type pos = arguments[2].rfind("#", 200);
-
-                    if (pos != string::npos)
-                    {
-                        string ID = arguments[2].substr(pos + 1, 5);
-                        arguments[2] = arguments[2].substr(0, pos);
-                        arguments[2] = arguments[2] + ID + "-";
-                    }
-
-                    Argument = arguments[2] + oam.itoa(i + 1);
-
-                    try
-                    {
-                        oam.setSystemConfig(Argument, arguments[3]);
-                        cout << endl << "   Successfully set " << argument2 << " = " << arguments[3] << endl << endl;
-                        break;
-                    }
-                    catch (exception& e)
-                    {
-                        cout << endl << "**** setModuleTypeConfig Failed =  " << e.what() << endl;
-                        break;
-                    }
-                }
-            }
-
-            if ( i == systemmoduletypeconfig.moduletypeconfig.size() )
-            {
-                // module type not found
-                cout << endl << "**** setModuleTypeConfig Failed : Invalid Module Type" << endl;
-                break;
-            }
-        }
-        break;
-
-        case 8: // getProcessConfig
-        {
-            SystemProcessConfig systemprocessconfig;
-            ProcessConfig processconfig;
-            string returnValue;
-
-            if (arguments[1] == "all" || arguments[1] == "")
-            {
-                // get and all display Process config parameters
-
-                try
-                {
-                    oam.getProcessConfig(systemprocessconfig);
-
-                    cout << endl << "Process Configuration" << endl << endl;
-
-                    for ( unsigned int i = 0 ; i < systemprocessconfig.processconfig.size(); i++)
-                    {
-                        cout << "Process #" << i + 1 << " Configuration information" << endl;
-
-                        cout << "ProcessName = " << systemprocessconfig.processconfig[i].ProcessName  << endl;
-                        cout << "ModuleType = " << systemprocessconfig.processconfig[i].ModuleType << endl;
-                        cout << "ProcessLocation = " << systemprocessconfig.processconfig[i].ProcessLocation << endl;
-
-                        for ( int j = 0 ; j < oam::MAX_ARGUMENTS; j++)
-                        {
-                            if (systemprocessconfig.processconfig[i].ProcessArgs[j].empty())
-                                break;
-
-                            cout << "ProcessArg" << j + 1 << " = " << systemprocessconfig.processconfig[i].ProcessArgs[j] << endl;
-                        }
-
-                        cout << "BootLaunch = " << systemprocessconfig.processconfig[i].BootLaunch << endl;
-                        cout << "LaunchID = " << systemprocessconfig.processconfig[i].LaunchID << endl;
-
-                        for ( int j = 0 ; j < MAX_DEPENDANCY; j++)
-                        {
-                            if (systemprocessconfig.processconfig[i].DepProcessName[j].empty())
-                                break;
-
-                            cout << "DepModuleName" << j + 1 << " = " << systemprocessconfig.processconfig[i].DepModuleName[j] << endl;
-                            cout << "DepProcessName" << j + 1 << " = " << systemprocessconfig.processconfig[i].DepProcessName[j] << endl;
-                        }
-
-                        // display Process Group variables, if they exist
-
-                        cout << "RunType = " << systemprocessconfig.processconfig[i].RunType << endl;
-                        cout << "LogFile = " << systemprocessconfig.processconfig[i].LogFile << endl;
-
-                        cout << endl;
-                    }
-                }
-                catch (exception& e)
-                {
-                    cout << endl << "**** getProcessConfig Failed =  " << e.what() << endl;
-                }
-            }
-            else
-            {
-                // get a single process info - parameters: module-name, process-name
-                if (arguments[2] == "")
-                {
-                    cout << endl << "**** getProcessConfig Failed : Missing a required Parameter, enter 'help' for additional information" << endl;
-                    break;
-                }
-
-                if (arguments[3] == "")
-                {
-                    //**** Add API to get single process info
-                    try
-                    {
-                        oam.getProcessConfig(arguments[1], arguments[2], processconfig);
-
-                        cout << endl << "Process Configuration for " << arguments[1] << " on module " << arguments[2] << endl << endl;
-
-                        cout << "ProcessName = " << processconfig.ProcessName  << endl;
-                        cout << "ModuleType = " << processconfig.ModuleType << endl;
-                        cout << "ProcessLocation = " << processconfig.ProcessLocation  << endl;
-
-                        for ( int j = 0 ; j < oam::MAX_ARGUMENTS; j++)
-                        {
-                            if (processconfig.ProcessArgs[j].empty())
-                                break;
-
-                            cout << "ProcessArg" << j + 1 << " = " << processconfig.ProcessArgs[j] << endl;
-                        }
-
-                        cout << "BootLaunch = " << processconfig.BootLaunch << endl;
-                        cout << "LaunchID = " << processconfig.LaunchID << endl;
-
-                        for ( int j = 0 ; j < MAX_DEPENDANCY; j++)
-                        {
-                            if (processconfig.DepProcessName[j].empty())
-                                break;
-
-                            cout << "DepProcessName" << j + 1 << " = " << processconfig.DepProcessName[j] << endl;
-                            cout << "DepModuleName" << j + 1 << " = " << processconfig.DepModuleName[j] << endl;
-                        }
-
-                        cout << "RunType = " << processconfig.RunType << endl;
-                        cout << "LogFile = " << processconfig.LogFile << endl;
-
-                        cout << endl;
-                    }
-                    catch (exception& e)
-                    {
-                        cout << endl << "**** getProcessConfig Failed =  " << e.what() << endl;
-                    }
-                }
-                else
-                {
-                    // get a parameter for a process - parameters: module-name, process-name,
-                    // parameter-name
-                    // get module ID from module name entered, then get parameter
-                    try
-                    {
-                        oam.getProcessConfig(arguments[1], arguments[2], arguments[3], returnValue);
-                        cout << endl << "   " << arguments[3] << " = " << returnValue << endl << endl;
-                        break;
-                    }
-                    catch (exception& e)
-                    {
-                        cout << endl << "**** getProcessConfig Failed =  " << e.what() << endl;
-                        break;
-                    }
-                }
-            }
-        }
-        break;
-
-        case 9: // setProcessConfig - parameters: Module name, Process Name, Parameter name and value
-        {
-            parentOAMModule = getParentOAMModule();
-
-            if ( localModule != parentOAMModule )
-            {
-                // exit out since not on Parent OAM Module
-                cout << endl << "**** setProcessConfig Failed : only should be run on the Parent OAM Module, which is '" << parentOAMModule << "'" << endl;
-                break;
-            }
-
-            if (arguments[4] == "")
-            {
-                cout << endl << "**** setProcessConfig Failed : Missing a required Parameter, enter 'help' for additional information" << endl;
-                break;
-            }
-
-            try
-            {
-                if ( arguments[4] == "=" )
-                {
-                    cout << endl << "**** setProcessConfig Failed : Invalid Value of '=', please re-enter" << endl;
-                    break;
-                }
-
-                oam.setProcessConfig(arguments[1], arguments[2], arguments[3], arguments[4]);
-                cout << endl << "   Successfully set " << arguments[3] << " = " << arguments[4] << endl << endl;
-                break;
-            }
-            catch (exception& e)
-            {
-                cout << endl << "**** setProcessConfig Failed =  " << e.what() << endl;
-                break;
-            }
-        }
-        break;
-
-        case 10: // getAlarmConfig- parameters: all or AlarmID
-        {
-            AlarmConfig alarmconfig;
-
-            if (arguments[1] == "all" || arguments[1] == "")
-            {
-
-                // get and all display Alarm config parameters
-
-                cout << endl << "Alarm Configuration" << endl << endl;
-
-                for ( int alarmID = 1 ; alarmID < MAX_ALARM_ID; alarmID++)
-                {
-                    try
-                    {
-                        oam.getAlarmConfig(alarmID, alarmconfig);
-
-                        cout << "Alarm ID #" << alarmID << " Configuration information" << endl;
-
-                        cout << "BriefDesc = " << alarmconfig.BriefDesc  << endl;
-                        cout << "DetailedDesc = " << alarmconfig.DetailedDesc << endl;
-
-                        //	cout << "EmailAddr = " << alarmconfig.EmailAddr  << endl;
-                        //	cout << "PagerNum = " << alarmconfig.PagerNum << endl;
-
-                        switch (alarmconfig.Severity)
-                        {
-                            case CRITICAL:
-                                cout << "Severity = CRITICAL" << endl;
-                                break;
-
-                            case MAJOR:
-                                cout << "Severity = MAJOR" << endl;
-                                break;
-
-                            case MINOR:
-                                cout << "Severity = MINOR" << endl;
-                                break;
-
-                            case WARNING:
-                                cout << "Severity = WARNING" << endl;
-                                break;
-
-                            default:
-                                cout << "Severity = INFORMATIONAL" << endl;
-                                break;
-                        }
-
-                        cout << "Threshold = " << alarmconfig.Threshold   << endl;
-                        //	cout << "Occurrences = " << alarmconfig.Occurrences << endl;
-                        //	cout << "LastIssueTime = " << alarmconfig.LastIssueTime  << endl << endl;
-                        cout << endl;
-                    }
-                    catch (exception& e)
-                    {
-                        cout << endl << "**** getAlarmConfig Failed =  " << e.what() << endl;
-                        break;
-                    }
-                }
-
-                break;
-            }
-            else
-            {
-                // get a single Alarm info
-                try
-                {
-                    oam.getAlarmConfig(atoi(arguments[1].c_str()), alarmconfig);
-
-                    cout << endl << "Alarm ID #" << arguments[1] << " Configuration information" << endl;
-
-                    cout << "BriefDesc = " << alarmconfig.BriefDesc  << endl;
-                    cout << "DetailedDesc = " << alarmconfig.DetailedDesc << endl;
-
-                    //	cout << "EmailAddr = " << alarmconfig.EmailAddr  << endl;
-                    //	cout << "PagerNum = " << alarmconfig.PagerNum << endl;
-
-                    switch (alarmconfig.Severity)
-                    {
-                        case CRITICAL:
-                            cout << "Severity = CRITICAL" << endl;
-                            break;
-
-                        case MAJOR:
-                            cout << "Severity = MAJOR" << endl;
-                            break;
-
-                        case MINOR:
-                            cout << "Severity = MINOR" << endl;
-                            break;
-
-                        case WARNING:
-                            cout << "Severity = WARNING" << endl;
-                            break;
-
-                        default:
-                            cout << "Severity = INFORMATIONAL" << endl;
-                            break;
-                    }
-
-                    cout << "Threshold = " << alarmconfig.Threshold   << endl;
-                    //	cout << "Occurrences = " << alarmconfig.Occurrences << endl;
-                    //	cout << "LastIssueTime = " << alarmconfig.LastIssueTime  << endl << endl;
-                    cout << endl;
-                    break;
-                }
-                catch (exception& e)
-                {
-                    cout << endl << "**** getAlarmConfig Failed =  " << e.what() << endl;
-                    break;
-                }
-            }
-        }
-        break;
-
-        case 11: // setAlarmConfig - parameters: AlarmID, Parameter name and value
-        {
-            parentOAMModule = getParentOAMModule();
-
-            if ( localModule != parentOAMModule )
-            {
-                // exit out since not on Parent OAM Module
-                cout << endl << "**** setAlarmConfig Failed : only should be run on the Parent OAM Module, which is '" << parentOAMModule << "'" << endl;
-                break;
-            }
-
-            if (arguments[3] == "")
-            {
-                // need 3 arguments
-                cout << endl << "**** setAlarmConfig Failed : Missing a required Parameter, enter 'help' for additional information" << endl;
-                break;
-            }
-
-            try
-            {
-                if ( arguments[3] == "=" )
-                {
-                    cout << endl << "**** setAlarmConfig Failed : Invalid Value of '=', please re-enter" << endl;
-                    break;
-                }
-
-                if ( arguments[2] == "Threshold" && arguments[3] != "0" && atoi(arguments[3].c_str()) == 0 )
-                {
-                    cout << endl << "**** setAlarmConfig Failed : New value must be a number" << endl;
-                    break;
-                }
-
-                oam.setAlarmConfig(atoi(arguments[1].c_str()), arguments[2], atoi(arguments[3].c_str()));
-                cout << endl << "   Successfully set " << arguments[2] << " = " << arguments[3] << endl << endl;
-                break;
-            }
-            catch (exception& e)
-            {
-                cout << endl << "**** setAlarmConfig Failed =  " << e.what() << endl;
-                break;
-            }
-        }
-        break;
-
-        case 12: // getActiveAlarms - parameters: none
-        {
-            AlarmList alarmList;
-
-            try
-            {
-                oam.getActiveAlarms(alarmList);
-            }
-            catch (...)
-            {
-                // need arguments
-                cout << endl << "**** getActiveAlarms Failed : Error in oam.getActiveAlarms" << endl;
-                break;
-            }
-
-            cout << endl << "Active Alarm List:" << endl << endl;
-
-            AlarmList :: iterator i;
-
-            for (i = alarmList.begin(); i != alarmList.end(); ++i)
-            {
-                cout << "AlarmID           = " << i->second.getAlarmID() << endl;
-                cout << "Brief Description = " << i->second.getDesc() << endl;
-                cout << "Alarm Severity    = ";
-
-                switch (i->second.getSeverity())
-                {
-                    case CRITICAL:
-                        cout << "CRITICAL" << endl;
-                        break;
-
-                    case MAJOR:
-                        cout << "MAJOR" << endl;
-                        break;
-
-                    case MINOR:
-                        cout << "MINOR" << endl;
-                        break;
-
-                    case WARNING:
-                        cout << "WARNING" << endl;
-                        break;
-
-                    case INFORMATIONAL:
-                        cout << "INFORMATIONAL" << endl;
-                        break;
-                }
-
-                cout << "Time Issued       = " << i->second.getTimestamp() << endl;
-                cout << "Reporting Module  = " << i->second.getSname() << endl;
-                cout << "Reporting Process = " << i->second.getPname() << endl;
-                cout << "Reported Device   = " << i->second.getComponentID() << endl << endl;
-            }
-        }
-        break;
-
-        case 13: // getStorageConfig
-        {
-            try
-            {
-                systemStorageInfo_t t;
-                t = oam.getStorageConfig();
-
-                string cloud;
-
-                try
-                {
-                    oam.getSystemConfig("Cloud", cloud);
-                }
-                catch (...) {}
-
-                string::size_type pos = cloud.find("amazon", 0);
-
-                if (pos != string::npos)
-                    cloud = "amazon";
-
-                cout << endl << "System Storage Configuration" << endl << endl;
-
-                cout << "Performance Module (DBRoot) Storage Type = " << boost::get<0>(t) << endl;
-
-                if ( cloud == "amazon" )
-                    cout << "User Module Storage Type = " << boost::get<3>(t) << endl;
-
-                cout << "System Assigned DBRoot Count = " << boost::get<1>(t) << endl;
-
-                DeviceDBRootList moduledbrootlist = boost::get<2>(t);
-
-                typedef std::vector<int> dbrootList;
-                dbrootList dbrootlist;
-
-                DeviceDBRootList::iterator pt = moduledbrootlist.begin();
-
-                for ( ; pt != moduledbrootlist.end() ; pt++)
-                {
-                    cout << "DBRoot IDs assigned to 'pm" + oam.itoa((*pt).DeviceID) + "' = ";
-                    DBRootConfigList::iterator pt1 = (*pt).dbrootConfigList.begin();
-
-                    for ( ; pt1 != (*pt).dbrootConfigList.end() ;)
-                    {
-                        cout << *pt1;
-                        dbrootlist.push_back(*pt1);
-                        pt1++;
-
-                        if (pt1 != (*pt).dbrootConfigList.end())
-                            cout << ", ";
-                    }
-
-                    cout << endl;
-                }
-
-                //get any unassigned DBRoots
-                DBRootConfigList undbrootlist;
-
-                try
-                {
-                    oam.getUnassignedDbroot(undbrootlist);
-                }
-                catch (...) {}
-
-                if ( !undbrootlist.empty() )
-                {
-                    cout << endl << "DBRoot IDs unassigned = ";
-                    DBRootConfigList::iterator pt1 = undbrootlist.begin();
-
-                    for ( ; pt1 != undbrootlist.end() ;)
-                    {
-                        cout << *pt1;
-                        pt1++;
-
-                        if (pt1 != undbrootlist.end())
-                            cout << ", ";
-                    }
-
-                    cout << endl;
-                }
-
-                cout << endl;
-
-                // um volumes
-                if (cloud == "amazon" && boost::get<3>(t) == "external")
-                {
-                    ModuleTypeConfig moduletypeconfig;
-                    oam.getSystemConfig("um", moduletypeconfig);
-
-                    for ( int id = 1; id < moduletypeconfig.ModuleCount + 1 ; id++)
-                    {
-                        string volumeNameID = "UMVolumeName" + oam.itoa(id);
-                        string volumeName = oam::UnassignedName;
-                        string deviceNameID = "UMVolumeDeviceName" + oam.itoa(id);
-                        string deviceName = oam::UnassignedName;
-
-                        try
-                        {
-                            oam.getSystemConfig( volumeNameID, volumeName);
-                            oam.getSystemConfig( deviceNameID, deviceName);
-                        }
-                        catch (...)
-                        {}
-
-                        cout << "Amazon EC2 Volume Name/Device Name for 'um" << id << "': " << volumeName << ", " << deviceName << endl;
-                    }
-                }
-
-                // pm volumes
-                if (cloud == "amazon" && boost::get<0>(t) == "external")
-                {
-                    cout << endl;
-
-                    DBRootConfigList dbrootConfigList;
-
-                    try
-                    {
-                        oam.getSystemDbrootConfig(dbrootConfigList);
-
-                        DBRootConfigList::iterator pt = dbrootConfigList.begin();
-
-                        for ( ; pt != dbrootConfigList.end() ; pt++)
-                        {
-                            string volumeNameID = "PMVolumeName" + oam.itoa(*pt);
-                            string volumeName = oam::UnassignedName;
-                            string deviceNameID = "PMVolumeDeviceName" + oam.itoa(*pt);
-                            string deviceName = oam::UnassignedName;
-                            string amazonDeviceNameID = "PMVolumeAmazonDeviceName" + oam.itoa(*pt);
-                            string amazondeviceName = oam::UnassignedName;
-
-                            try
-                            {
-                                oam.getSystemConfig( volumeNameID, volumeName);
-                                oam.getSystemConfig( deviceNameID, deviceName);
-                                oam.getSystemConfig( amazonDeviceNameID, amazondeviceName);
-                            }
-                            catch (...)
-                            {
-                                continue;
-                            }
-
-                            cout << "Amazon EC2 Volume Name/Device Name/Amazon Device Name for DBRoot" << oam.itoa(*pt) << ": " << volumeName << ", " << deviceName << ", " << amazondeviceName << endl;
-                        }
-                    }
-                    catch (exception& e)
-                    {
-                        cout << endl << "**** getSystemDbrootConfig Failed :  " << e.what() << endl;
-                    }
-
-                    // print un-assigned dbroots
-                    DBRootConfigList::iterator pt1 = undbrootlist.begin();
-
-                    for ( ; pt1 != undbrootlist.end() ; pt1++)
-                    {
-                        string volumeNameID = "PMVolumeName" + oam.itoa(*pt1);
-                        string volumeName = oam::UnassignedName;
-                        string deviceNameID = "PMVolumeDeviceName" + oam.itoa(*pt1);
-                        string deviceName = oam::UnassignedName;
-                        string amazonDeviceNameID = "PMVolumeAmazonDeviceName" + oam.itoa(*pt1);
-                        string amazondeviceName = oam::UnassignedName;
-
-                        try
-                        {
-                            oam.getSystemConfig( volumeNameID, volumeName);
-                            oam.getSystemConfig( deviceNameID, deviceName);
-                            oam.getSystemConfig( amazonDeviceNameID, amazondeviceName);
-                        }
-                        catch (...)
-                        {
-                            continue;
-                        }
-
-                        cout << "Amazon EC2 Volume Name/Device Name/Amazon Device Name for DBRoot" << oam.itoa(*pt1) << ": " << volumeName << ", " << deviceName << ", " << amazondeviceName << endl;
-                    }
-                }
-
-                string GlusterConfig;
-                string GlusterCopies;
-                string GlusterStorageType;
-
-                try
-                {
-                    oam.getSystemConfig("GlusterConfig", GlusterConfig);
-                    oam.getSystemConfig("GlusterCopies", GlusterCopies);
-                    oam.getSystemConfig("GlusterStorageType", GlusterStorageType);
-                }
-                catch (...) {}
-
-                if ( GlusterConfig == "y" )
-                {
-                    cout << endl << "Data Redundant Configuration" << endl << endl;
-                    cout << "Copies Per DBroot = " << GlusterCopies << endl;
-                    cout << "Storage Type = " << GlusterStorageType << endl;
-
-                    oamModuleInfo_t st;
-                    string moduleType;
-
-                    try
-                    {
-                        st = oam.getModuleInfo();
-                        moduleType = boost::get<1>(st);
-                    }
-                    catch (...) {}
-
-                    if ( moduleType != "pm")
-                        break;
-
-                    try
-                    {
-                        DBRootConfigList dbrootConfigList;
-                        oam.getSystemDbrootConfig(dbrootConfigList);
-
-                        DBRootConfigList::iterator pt = dbrootConfigList.begin();
-
-                        for ( ; pt != dbrootConfigList.end() ; pt++)
-                        {
-                            cout << "DBRoot #" << oam.itoa(*pt) << " has copies on PMs = ";
-
-                            string pmList = "";
-
-                            try
-                            {
-                                string errmsg;
-                                oam.glusterctl(oam::GLUSTER_WHOHAS, oam.itoa(*pt), pmList, errmsg);
-                            }
-                            catch (...)
-                            {}
-
-                            boost::char_separator<char> sep(" ");
-                            boost::tokenizer< boost::char_separator<char> > tokens(pmList, sep);
-
-                            for ( boost::tokenizer< boost::char_separator<char> >::iterator it = tokens.begin();
-                                    it != tokens.end();
-                                    ++it)
-                            {
-                                cout << *it << " ";
-                            }
-
-                            cout << endl;
-                        }
-
-                        cout << endl;
-                    }
-                    catch (exception& e)
-                    {
-                        cout << endl << "**** getSystemDbrootConfig Failed :  " << e.what() << endl;
-                    }
-                }
-            }
-            catch (exception& e)
-            {
-                cout << endl << "**** getStorageConfig Failed :  " << e.what() << endl;
-            }
-
-            cout << endl;
-
-            break;
-        }
-
-        case 14: // addDbroot parameters: dbroot-number
-        {
-            string GlusterConfig = "n";
-
-            try
-            {
-                oam.getSystemConfig( "GlusterConfig", GlusterConfig);
-            }
-            catch (...)
-            {}
-
-            if (GlusterConfig == "y")
-            {
-                cout << endl << "**** addDbroot Not Supported on Data Redundancy Configured System, use addModule command to expand your capacity" << endl;
-                break;
-            }
-
-            if ( localModule != parentOAMModule )
-            {
-                // exit out since not on active module
-                cout << endl << "**** addDbroot Failed : Can only run command on Active OAM Parent Module (" << parentOAMModule << ")." << endl;
-                break;
-            }
-
-            string cloud;
-            bool amazon = false;
-
-            try
-            {
-                oam.getSystemConfig("Cloud", cloud);
-            }
-            catch (...) {}
-
-            string::size_type pos = cloud.find("amazon", 0);
-
-            if (pos != string::npos)
-                amazon = true;
-
-            if (arguments[1] == "")
-            {
-                // need atleast 1 arguments
-                cout << endl << "**** addDbroot Failed : Missing a required Parameter, enter 'help' for additional information" << endl;
-                break;
-            }
-
-            int dbrootNumber = atoi(arguments[1].c_str());
-
-            string DBRootStorageType;
-
-            try
-            {
-                oam.getSystemConfig( "DBRootStorageType", DBRootStorageType);
-            }
-            catch (...) {}
-
-            string EBSsize = oam::UnassignedName;
-
-            if (amazon && DBRootStorageType == "external" )
-            {
-                if ( arguments[2] != "")
-                    EBSsize = arguments[2];
-                else
-                {
-                    cout << endl;
-                    oam.getSystemConfig("PMVolumeSize", EBSsize);
-
-                    string prompt = "Enter EBS storage size in GB, current setting is " + EBSsize + " : ";
-                    EBSsize = dataPrompt(prompt);
-                }
-            }
-
-            //get dbroots ids for reside PM
-            try
-            {
-                DBRootConfigList dbrootlist;
-                oam.addDbroot(dbrootNumber, dbrootlist, EBSsize);
-
-                cout << endl << " New DBRoot IDs added = ";
-
-                DBRootConfigList::iterator pt = dbrootlist.begin();
-
-                for ( ; pt != dbrootlist.end() ;)
-                {
-                    cout << oam.itoa(*pt);
-                    pt++;
-
-                    if (pt != dbrootlist.end())
-                        cout << ", ";
-                }
-
-                cout << endl;
-            }
-            catch (exception& e)
-            {
-                cout << endl << "**** addDbroot Failed: " << e.what() << endl;
-                break;
-            }
-
-            cout << endl;
-        }
-        break;
-
-        case 15: // removeDbroot parameters: dbroot-list
-        {
-            string GlusterConfig = "n";
-
-            try
-            {
-                oam.getSystemConfig( "GlusterConfig", GlusterConfig);
-            }
-            catch (...)
-            {}
-
-            if ( localModule != parentOAMModule )
-            {
-                // exit out since not on active module
-                cout << endl << "**** removeDbroot Failed : Can only run command on Active OAM Parent Module (" << parentOAMModule << ")." << endl;
-                break;
-            }
-
-            if (arguments[1] == "")
-            {
-                // need atleast 1 arguments
-                cout << endl << "**** removeDbroot Failed : Missing a required Parameter, enter 'help' for additional information" << endl;
-                break;
-            }
-
-            SystemStatus systemstatus;
-
-            try
-            {
-                oam.getSystemStatus(systemstatus);
-
-                if (systemstatus.SystemOpState != oam::ACTIVE )
-                {
-                    cout << endl << "**** removeDbroot Failed,  System has to be in a ACTIVE state" << endl;
-                    break;
-                }
-            }
-            catch (exception& e)
-            {
-                cout << endl << "**** removeDbroot Failed : " << e.what() << endl;
-                break;
-            }
-            catch (...)
-            {
-                cout << endl << "**** removeDbroot Failed,  Failed return from getSystemStatus API" << endl;
-                break;
-            }
-
-            systemStorageInfo_t t;
-
-            try
-            {
-                t = oam.getStorageConfig();
-            }
-            catch (...) {}
-
-            string dbrootIDs = arguments[1];
-
-            DBRootConfigList dbrootlist;
-
-            bool assign = false;
-            boost::char_separator<char> sep(", ");
-            boost::tokenizer< boost::char_separator<char> > tokens(dbrootIDs, sep);
-
-            for ( boost::tokenizer< boost::char_separator<char> >::iterator it = tokens.begin();
-                    it != tokens.end();
-                    ++it)
-            {
-                //check if dbroot is assigned to a pm
-                DeviceDBRootList moduledbrootlist = boost::get<2>(t);
-
-                DeviceDBRootList::iterator pt = moduledbrootlist.begin();
-
-                for ( ; pt != moduledbrootlist.end() ; pt++)
-                {
-                    DBRootConfigList::iterator pt1 = (*pt).dbrootConfigList.begin();
-
-                    for ( ; pt1 != (*pt).dbrootConfigList.end() ; pt1++)
-                    {
-                        if ( atoi((*it).c_str()) == *pt1 )
-                        {
-                            cout << endl << "**** removeDbroot Failed, dbroot " << *it << " is assigned to a module, unassign first before removing" << endl;
-                            assign = true;
-                            break;
-                        }
-                    }
-                }
-
-                if (assign)
-                    break;
-
-                dbrootlist.push_back(atoi((*it).c_str()));
-            }
-
-            if (assign)
-                break;
-
-            cout << endl;
-
-            try
-            {
-                oam.removeDbroot(dbrootlist);
-
-                cout << endl << "   Successful Removal of DBRoots " << endl << endl;
-            }
-            catch (exception& e)
-            {
-                cout << endl << "**** removeDbroot Failed: " << e.what() << endl;
-                break;
-            }
-        }
-        break;
-
-        case 16: // stopSystem - parameters: graceful flag, Ack flag
-        {
-            BRM::DBRM dbrm;
-            bool bDBRMReady = dbrm.isDBRMReady();
-            getFlags(arguments, gracefulTemp, ackTemp, suspendAnswer, bNeedsConfirm);
-
-            if ( gracefulTemp == INSTALL )
-            {
-                cout << endl << "Invalid Parameter, INSTALL option not supported. Please use shutdownSystem Command" << endl << endl;
-                break;
-            }
-
-            cout << endl << "This command stops the processing of applications on all Modules within the Calpont System" << endl;
-
-            try
-            {
-                cout << endl << "   Checking for active transactions" << endl;
-
-                if (gracefulTemp != GRACEFUL ||
-                        !bDBRMReady ||
-                        dbrm.isReadWrite())
-                {
-                    suspendAnswer = FORCE;
-                }
-
-                if (suspendAnswer == CANCEL)	// We don't have an answer from the command line or some other state.
-                {
-                    // If there are bulkloads, ddl or dml happening, Ask what to do.
-                    bool bIsDbrmUp = true;
-                    execplan::SessionManager sessionManager;
-                    BRM::SIDTIDEntry blockingsid;
-                    std::vector<BRM::TableLockInfo> tableLocks = dbrm.getAllTableLocks();
-                    bool bActiveTransactions = false;
-
-                    if (!tableLocks.empty())
-                    {
-                        oam.DisplayLockedTables(tableLocks, &dbrm);
-                        bActiveTransactions = true;
-                    }
-
-                    if (sessionManager.checkActiveTransaction(0, bIsDbrmUp, blockingsid))
-                    {
-                        cout << endl << "There are active transactions being processed" << endl;
-                        bActiveTransactions = true;
-                    }
-
-                    if (bActiveTransactions)
-                    {
-                        suspendAnswer = AskSuspendQuestion(CmdID);
-                        //					if (suspendAnswer == FORCE)
-                        //					{
-                        //						if (confirmPrompt("Force may cause data problems and should only be used in extreme circumstances"))
-                        //						{
-                        //							break;
-                        //						}
-                        //					}
-                        bNeedsConfirm = false;
-                    }
-                    else
-                    {
-                        suspendAnswer = FORCE;
-                    }
-                }
-
-                if (suspendAnswer == CANCEL)
-                {
-                    // We're outa here.
-                    break;
-                }
-
-                if (bNeedsConfirm)
-                {
-                    if (confirmPrompt(""))
-                        break;
-                }
-
-                switch (suspendAnswer)
-                {
-                    case WAIT:
-                        cout << endl << "   Waiting for all transactions to complete" << flush;
-                        dbrm.setSystemShutdownPending(true, false, false);
-                        gracefulTemp = GRACEFUL_WAIT;		// Causes procmgr to wait for all table locks to free and all transactions to finish before shutdown
-                        break;
-
-                    case ROLLBACK:
-                        cout << endl << "   Rollback of all transactions" << flush;
-                        dbrm.setSystemShutdownPending(true, true, false);
-                        gracefulTemp = GRACEFUL_WAIT;		// Causes procmgr to wait for all table locks to free and all transactions to finish before shutdown
-                        break;
-
-                    case FORCE:
-                        cout << endl << "   System being stopped now..." << flush;
-
-                        if (bDBRMReady)
-                        {
-                            dbrm.setSystemShutdownPending(true, false, true);
-                        }
-
-                        break;
-
-                    case CANCEL:
-                        break;
-                }
-
-                oam.stopSystem(gracefulTemp, ackTemp);
-
-                if ( waitForStop() )
-                    cout << endl << "   Successful stop of System " << endl << endl;
-                else
-                    cout << endl << "**** stopSystem Failed : check log files" << endl;
-
-                checkForDisabledModules();
-            }
-            catch (exception& e)
-            {
-                string Failed = e.what();
-
-                if (Failed.find("Connection refused") != string::npos)
-                {
-                    cout << endl << "**** stopSystem Failure : ProcessManager not Active" << endl;
-                    cout << "Retry or Run 'shutdownSystem FORCEFUL' command" << endl << endl;
-                }
-                else
-                {
-                    cout << endl << "**** stopSystem Failure : " << e.what() << endl;
-                    cout << "Retry or Run 'shutdownSystem FORCEFUL' command" << endl << endl;
-                }
-            }
-        }
-        break;
-
-        case 17: // shutdownSystem - parameters: graceful flag, Ack flag, suspendAnswer
-        {
-            BRM::DBRM dbrm;
-            bool bDBRMReady = dbrm.isDBRMReady();
-            getFlags(arguments, gracefulTemp, ackTemp, suspendAnswer, bNeedsConfirm);
-
-            cout << endl << "This command stops the processing of applications on all Modules within the Calpont System" << endl;
-
-            try
-            {
-                cout << endl << "   Checking for active transactions" << endl;
-
-                if (gracefulTemp != GRACEFUL ||
-                        !bDBRMReady ||
-                        dbrm.isReadWrite())
-                {
-                    suspendAnswer = FORCE;
-                }
-
-                if (suspendAnswer == CANCEL)	// We don't have an answer from the command line.
-                {
-                    // If there are bulkloads, ddl or dml happening, Ask what to do.
-                    bool bIsDbrmUp = true;
-                    execplan::SessionManager sessionManager;
-                    BRM::SIDTIDEntry blockingsid;
-                    std::vector<BRM::TableLockInfo> tableLocks = dbrm.getAllTableLocks();
-                    bool bActiveTransactions = false;
-
-                    if (!tableLocks.empty())
-                    {
-                        oam.DisplayLockedTables(tableLocks, &dbrm);
-                        bActiveTransactions = true;
-                    }
-
-                    if (sessionManager.checkActiveTransaction(0, bIsDbrmUp, blockingsid))
-                    {
-                        cout << endl << "   There are active transactions being processed" << endl;
-                        bActiveTransactions = true;
-                    }
-
-                    if (bActiveTransactions)
-                    {
-                        suspendAnswer = AskSuspendQuestion(CmdID);
-                        bNeedsConfirm = false;
-                    }
-                    else
-                    {
-                        suspendAnswer = FORCE;
-                    }
-                }
-
-                if (suspendAnswer == CANCEL)
-                {
-                    // We're outa here.
-                    break;
-                }
-
-                if (bNeedsConfirm)
-                {
-                    if (confirmPrompt(""))
-                        break;
-                }
-
-                switch (suspendAnswer)
-                {
-                    case WAIT:
-                        cout << endl << "   Waiting for all transactions to complete" << flush;
-                        dbrm.setSystemShutdownPending(true, false, false);
-                        gracefulTemp = GRACEFUL_WAIT;		// Causes procmgr to wait for all table locks to free and all transactions to finish before shutdown
-                        break;
-
-                    case ROLLBACK:
-                        cout << endl << "   Rollback of all transactions" << flush;
-                        dbrm.setSystemShutdownPending(true, true, false);
-                        gracefulTemp = GRACEFUL_WAIT;		// Causes procmgr to wait for all table locks to free and all transactions to finish before shutdown
-                        break;
-
-                    case FORCE:
-                        cout << endl << "   Stopping System..." << flush;
-
-                        if (bDBRMReady)
-                        {
-                            dbrm.setSystemShutdownPending(true, false, true);
-                        }
-
-                        break;
-
-                    case CANCEL:
-                        break;
-                }
-
-                // This won't return until the system is shutdown. It might take a while to finish what we're working on first.
-
-                oam.stopSystem(gracefulTemp, ackTemp);
-
-                if ( waitForStop() )
-                    cout << endl << "   Successful stop of System " << endl;
-                else
-                    cout << endl << "**** stopSystem Failed : check log files" << endl;
-
-                cout << endl << "   Shutting Down System..." << flush;
-
-                oam.shutdownSystem(gracefulTemp, ackTemp);
-
-                //hdfs / hadoop config
-                string DBRootStorageType;
-
-                try
-                {
-                    oam.getSystemConfig( "DBRootStorageType", DBRootStorageType);
-                }
-                catch (...) {}
-
-                if ( DBRootStorageType == "hdfs")
-                {
-                    string cmd = "pdsh -a '/" + startup::StartUp::installDir() + "/bin/infinidb stop' > /tmp/cc-stop.pdsh 2>&1";
-                    system(cmd.c_str());
-
-                    if (oam.checkLogStatus("/tmp/cc-stop.pdsh", "exit") )
-                    {
-                        cout << endl << "ERROR: Stopping InfiniDB Service failure, check /tmp/cc-stop.pdsh. exit..." << endl;
-                    }
-                }
-                else
-                {
-                    string cmd = startup::StartUp::installDir() + "/bin/infinidb stop > /tmp/status.log";
-                    system(cmd.c_str());
-                }
-            }
-            catch (exception& e)
-            {
-                string Failed = e.what();
-
-                if ( gracefulTemp == FORCEFUL )
-                {
-                    string cmd = startup::StartUp::installDir() + "/bin/infinidb stop > /tmp/status.log";
-                    system(cmd.c_str());
-                    cout << endl << "   Successful shutdown of System (stopped local infinidb service) " << endl << endl;
-                }
-
-                if (Failed.find("Connection refused") != string::npos)
-                {
-                    cout << endl << "**** shutdownSystem Error : ProcessManager not Active, stopping infinidb service" << endl;
-                    string cmd = startup::StartUp::installDir() + "/bin/infinidb stop > /tmp/status.log";
-                    system(cmd.c_str());
-                    cout << endl << "   Successful stop of local infinidb service " << endl << endl;
-                }
-                else
-                {
-                    cout << endl << "**** shutdownSystem Failure : " << e.what() << endl;
-                    cout << "Retry using FORCEFUL option" << endl << endl;
-                }
-
-                //hdfs / hadoop config
-                string DBRootStorageType;
-
-                try
-                {
-                    oam.getSystemConfig( "DBRootStorageType", DBRootStorageType);
-                }
-                catch (...) {}
-
-                if ( DBRootStorageType == "hdfs")
-                {
-                    string cmd = "pdsh -a '" + startup::StartUp::installDir() + "/bin/infinidb stop' > /tmp/cc-stop.pdsh 2>&1";
-                    system(cmd.c_str());
-
-                    if (oam.checkLogStatus("/tmp/cc-stop.pdsh", "exit") )
-                    {
-                        cout << endl << "ERROR: Stopping InfiniDB Service failure, check /tmp/cc-stop.pdsh. exit..." << endl;
-                        break;
-                    }
-                }
-            }
-
-            sleep(10);
-        }
-        break;
-
-        case 18: // startSystem - parameters: Ack flag
-        {
-            // startSystem Command
-
-            //don't start if a disable module has a dbroot assigned to it
-            if (!checkForDisabledModules())
-            {
-                cout << endl << "Error: startSystem command can't be performed: disabled module has a dbroot assigned to it" << endl;
-                break;
-            }
-
-            // if infinidb service is down, then start system by starting all of the infinidb services
-            // this would be used after a shutdownSystem command
-            // if infinidb service is up, send message to ProcMgr to start system (which starts all processes)
-
-            string cmd = startup::StartUp::installDir() + "/bin/infinidb status > /tmp/status.log";
-            system(cmd.c_str());
-
-            if (!oam.checkLogStatus("/tmp/status.log", "InfiniDB is running") )
-            {
-                cout << "startSystem command, 'infinidb' service is down, sending command to" << endl;
-                cout << "start the 'infinidb' service on all modules" << endl << endl;
-
-                SystemModuleTypeConfig systemmoduletypeconfig;
-                ModuleTypeConfig moduletypeconfig;
-                ModuleConfig moduleconfig;
-                systemmoduletypeconfig.moduletypeconfig.clear();
-                int systemModuleNumber = 0;
-
-                try
-                {
-                    oam.getSystemConfig(systemmoduletypeconfig);
-
-                    for ( unsigned int i = 0 ; i < systemmoduletypeconfig.moduletypeconfig.size(); i++)
-                    {
-                        if ( systemmoduletypeconfig.moduletypeconfig[i].ModuleType.empty() )
-                            // end of list
-                            break;
-
-                        systemModuleNumber = systemModuleNumber + systemmoduletypeconfig.moduletypeconfig[i].ModuleCount;
-                    }
-                }
-                catch (exception& e)
-                {
-                    cout << endl << "**** startSystem Failed =  " << e.what() << endl;
-                    break;
-                }
-
-                if ( systemModuleNumber > 1 )
-                {
-                    if (arguments[1] != "")
-                        password = arguments[1];
-                    else
-                        password = "ssh";
-
-                    //
-                    // perform start of InfiniDB of other servers in the system
-                    //
-
-                    DeviceNetworkList::iterator pt;
-                    string modulename;
-
-                    for ( unsigned int i = 0 ; i < systemmoduletypeconfig.moduletypeconfig.size(); i++)
-                    {
-                        for (pt = systemmoduletypeconfig.moduletypeconfig[i].ModuleNetworkList.begin();
-                                pt != systemmoduletypeconfig.moduletypeconfig[i].ModuleNetworkList.end();
-                                ++pt)
-                        {
-                            modulename = (*pt).DeviceName;
-
-                            if ( (*pt).DisableState == oam::MANDISABLEDSTATE ||
-                                    (*pt).DisableState == oam::AUTODISABLEDSTATE )
-                            {
-                                cout << "   Module '" << modulename << "' is disabled and will not be started" << endl;
-                            }
-                        }
-                    }
-
-                    cout << endl << "   System being started, please wait...";
-                    cout.flush();
-                    bool FAILED = false;
-
-                    //hdfs / hadoop config
-                    string DBRootStorageType;
-
-                    try
-                    {
-                        oam.getSystemConfig( "DBRootStorageType", DBRootStorageType);
-                    }
-                    catch (...) {}
-
-                    if ( DBRootStorageType == "hdfs")
-                    {
-                        string cmd = "pdsh -a '" + startup::StartUp::installDir() + "/bin/infinidb restart' > /tmp/cc-restart.pdsh 2>&1";
-                        system(cmd.c_str());
-
-                        if (oam.checkLogStatus("/tmp/cc-restart.pdsh", "exit") )
-                        {
-                            cout << endl << "ERROR: Restart InfiniDB Service failure, check /tmp/cc-restart.pdsh. exit..." << endl;
-                            break;
-                        }
-                    }
-                    else
-                    {
-                        for ( unsigned int i = 0 ; i < systemmoduletypeconfig.moduletypeconfig.size(); i++)
-                        {
-                            if ( systemmoduletypeconfig.moduletypeconfig[i].ModuleType.empty() )
-                                // end of list
-                                break;
-
-                            int moduleCount = systemmoduletypeconfig.moduletypeconfig[i].ModuleCount;
-
-                            if ( moduleCount == 0 )
-                                // skip if no modules
-                                continue;
-
-                            for (pt = systemmoduletypeconfig.moduletypeconfig[i].ModuleNetworkList.begin();
-                                    pt != systemmoduletypeconfig.moduletypeconfig[i].ModuleNetworkList.end();
-                                    ++pt)
-                            {
-                                modulename = (*pt).DeviceName;
-
-                                if ( (*pt).DisableState == oam::MANDISABLEDSTATE ||
-                                        (*pt).DisableState == oam::AUTODISABLEDSTATE )
-                                {
-                                    continue;
-                                }
-
-                                if ( modulename == localModule )
-                                {
-                                    cmd = startup::StartUp::installDir() + "/bin/infinidb restart > /tmp/start.log 2>&1";
-                                    int rtnCode = system(cmd.c_str());
-
-                                    if (geteuid() == 0 && WEXITSTATUS(rtnCode) != 0)
-                                    {
-                                        cout << endl << "error with running 'infinidb restart' on local module " << endl;
-                                        cout << endl << "**** startSystem Failed" << endl;
-                                        break;
-                                    }
-
-                                    continue;
-                                }
-
-                                HostConfigList::iterator pt1 = (*pt).hostConfigList.begin();
-
-                                for ( ; pt1 != (*pt).hostConfigList.end() ; pt1++)
-                                {
-                                    //run remote command script
-                                    cmd = startup::StartUp::installDir() + "/bin/remote_command.sh " + (*pt1).IPAddr + " " + password + " '" + startup::StartUp::installDir() + "/bin/infinidb restart' 0";
-                                    int rtnCode = system(cmd.c_str());
-
-                                    if (WEXITSTATUS(rtnCode) < 0)
-                                    {
-                                        cout << endl << "error with running 'infinidb start' on module " + modulename << endl;
-                                        cout << endl << "**** startSystem Failed" << endl;
-
-                                        // stop local infinidb service
-                                        cmd = startup::StartUp::installDir() + "/bin/infinidb stop > /tmp/stop.log 2>&1";
-                                        system(cmd.c_str());
-
-                                        FAILED = true;
-                                        break;
-                                    }
-                                    else
-                                    {
-                                        if (rtnCode > 0)
-                                        {
-                                            cout << endl << "Invalid Password when running 'infinidb start' on module " + modulename << ", can retry by providing password as the second argument" << endl;
-                                            cout << endl << "**** startSystem Failed" << endl;
-
-                                            // stop local infinidb service
-                                            cmd = startup::StartUp::installDir() + "/bin/infinidb stop > /tmp/stop.log 2>&1";
-                                            system(cmd.c_str());
-
-                                            FAILED = true;
-                                            break;
-                                        }
-                                    }
-                                }
-
-                                if (FAILED)
-                                    break;
-                            }
-                        }
-
-                        if (FAILED)
-                            break;
-                    }
-
-                    if (FAILED)
-                        break;
-                }
-                else
-                {
-                    //just kick off local server
-                    cout << "   System being started, please wait...";
-                    cout.flush();
-                    cmd = startup::StartUp::installDir() + "/bin/infinidb restart > /tmp/start.log 2>&1";
-                    int rtnCode = system(cmd.c_str());
-
-                    if (geteuid() == 0 && WEXITSTATUS(rtnCode) != 0)
-                    {
-                        cout << endl << "error with running 'infinidb restart' on local module " << endl;
-                        cout << endl << "**** startSystem Failed" << endl;
-                        break;
-                    }
-                }
-
-                if ( waitForActive() )
-                    cout << endl << "   Successful start of System " << endl << endl;
-                else
-                    cout << endl << "**** startSystem Failed : check log files" << endl;
-            }
-            else
-            {
-                getFlags(arguments, gracefulTemp, ackTemp, suspendAnswer, bNeedsConfirm);
-
-                try
-                {
-                    cout << "   System being started, please wait...";
-                    cout.flush();
-                    oam.startSystem(ackTemp);
-
-                    if ( waitForActive() )
-                        cout << endl << "   Successful start of System " << endl << endl;
-                    else
-                        cout << endl << "**** startSystem Failed : check log files" << endl;
-                }
-                catch (exception& e)
-                {
-                    cout << endl << "**** startSystem Failed :  " << e.what() << endl;
-                    string Failed = e.what();
-
-                    if (Failed.find("Database Test Error") != string::npos)
-                        cout << "Database Test Error occurred, check Alarm and Logs for addition Information" << endl;
-                }
-            }
-        }
-        break;
-
-        case 19: // restartSystem - parameters: graceful flag, Ack flag
-        {
-            getFlags(arguments, gracefulTemp, ackTemp, suspendAnswer, bNeedsConfirm, &password);
-
-            //don't start if a disable module has a dbroot assigned to it
-            if (!checkForDisabledModules())
-            {
-                cout << endl << "Error: restartSystem command can't be performed: disabled module has a dbroot assigned to it" << endl;
-                break;
-            }
-
-            // if infinidb service is down, then start system by starting all of the infinidb services
-            // this would be used after a shutdownSystem command
-            // if infinidb service is up, send message to ProcMgr to start system (which starts all processes)
-
-            string cmd = startup::StartUp::installDir() + "/bin/infinidb status > /tmp/status.log";
-            system(cmd.c_str());
-
-            if (!oam.checkLogStatus("/tmp/status.log", "InfiniDB is running") )
-            {
-                if (bNeedsConfirm)
-                {
-                    if (confirmPrompt("")) // returns true if user wants to quit.
-                        break;
-                }
-
-                cout << "restartSystem command, 'infinidb' service is down, sending command to" << endl;
-                cout << "start the 'infinidb' service on all modules" << endl << endl;
-
-                SystemModuleTypeConfig systemmoduletypeconfig;
-                ModuleTypeConfig moduletypeconfig;
-                ModuleConfig moduleconfig;
-                systemmoduletypeconfig.moduletypeconfig.clear();
-                int systemModuleNumber = 0;
-
-                try
-                {
-                    oam.getSystemConfig(systemmoduletypeconfig);
-
-                    for ( unsigned int i = 0 ; i < systemmoduletypeconfig.moduletypeconfig.size(); i++)
-                    {
-                        if ( systemmoduletypeconfig.moduletypeconfig[i].ModuleType.empty() )
-                            // end of list
-                            break;
-
-                        systemModuleNumber = systemModuleNumber + systemmoduletypeconfig.moduletypeconfig[i].ModuleCount;
-                    }
-                }
-                catch (exception& e)
-                {
-                    cout << endl << "**** restartSystem Failed =  " << e.what() << endl;
-                    break;
-                }
-
-                if ( systemModuleNumber > 1 )
-                {
-                    if (password.empty())
-                        password = "ssh";
-
-                    //
-                    // perform start of InfiniDB of other servers in the system
-                    //
-
-                    DeviceNetworkList::iterator pt;
-                    string modulename;
-
-                    for ( unsigned int i = 0 ; i < systemmoduletypeconfig.moduletypeconfig.size(); i++)
-                    {
-                        for (pt = systemmoduletypeconfig.moduletypeconfig[i].ModuleNetworkList.begin();
-                                pt != systemmoduletypeconfig.moduletypeconfig[i].ModuleNetworkList.end();
-                                ++pt)
-                        {
-                            modulename = (*pt).DeviceName;
-
-                            if ( (*pt).DisableState == oam::MANDISABLEDSTATE ||
-                                    (*pt).DisableState == oam::AUTODISABLEDSTATE )
-                            {
-                                cout << "   Module '" << modulename << "' is disabled and will not be started" << endl;
-                            }
-                        }
-                    }
-
-                    cout << endl << "   System being started, please wait...";
-                    cout.flush();
-                    bool FAILED = false;
-
-                    //hdfs / hadoop config
-                    string DBRootStorageType;
-
-                    try
-                    {
-                        oam.getSystemConfig( "DBRootStorageType", DBRootStorageType);
-                    }
-                    catch (...) {}
-
-                    if ( DBRootStorageType == "hdfs")
-                    {
-                        string cmd = "pdsh -a '" + startup::StartUp::installDir() + "/bin/infinidb restart' > /tmp/cc-restart.pdsh 2>&1";
-                        system(cmd.c_str());
-
-                        if (oam.checkLogStatus("/tmp/cc-restart.pdsh", "exit") )
-                        {
-                            cout << endl << "ERROR: Restart InfiniDB Service failue, check /tmp/cc-restart.pdsh. exit..." << endl;
-                            break;
-                        }
-                    }
-                    else
-                    {
-                        for ( unsigned int i = 0 ; i < systemmoduletypeconfig.moduletypeconfig.size(); i++)
-                        {
-                            if ( systemmoduletypeconfig.moduletypeconfig[i].ModuleType.empty() )
-                                // end of list
-                                break;
-
-                            int moduleCount = systemmoduletypeconfig.moduletypeconfig[i].ModuleCount;
-
-                            if ( moduleCount == 0 )
-                                // skip if no modules
-                                continue;
-
-                            for (pt = systemmoduletypeconfig.moduletypeconfig[i].ModuleNetworkList.begin();
-                                    pt != systemmoduletypeconfig.moduletypeconfig[i].ModuleNetworkList.end();
-                                    ++pt)
-                            {
-                                modulename = (*pt).DeviceName;
-
-                                if ( (*pt).DisableState == oam::MANDISABLEDSTATE ||
-                                        (*pt).DisableState == oam::AUTODISABLEDSTATE )
-                                {
-                                    continue;
-                                }
-
-                                if ( modulename == localModule )
-                                    continue; // do last
-
-                                HostConfigList::iterator pt1 = (*pt).hostConfigList.begin();
-
-                                for ( ; pt1 != (*pt).hostConfigList.end() ; pt1++)
-                                {
-                                    //run remote command script
-                                    cmd = startup::StartUp::installDir() + "/bin/remote_command.sh " + (*pt1).IPAddr + " " + password + " '" + startup::StartUp::installDir() + "/bin/infinidb restart' 0";
-
-                                    int rtnCode = system(cmd.c_str());
-
-                                    if (WEXITSTATUS(rtnCode) < 0)
-                                    {
-                                        cout << endl << "error with running 'infinidb start' on module " + modulename << endl;
-                                        cout << endl << "**** restartSystem Failed" << endl;
-
-                                        // stop local infinidb service
-                                        cmd = startup::StartUp::installDir() + "/bin/infinidb stop > /tmp/stop.log 2>&1";
-                                        system(cmd.c_str());
-
-                                        FAILED = true;
-                                        break;
-                                    }
-                                    else
-                                    {
-                                        if (rtnCode > 0)
-                                        {
-                                            cout << endl << "Invalid Password when running 'infinidb start' on module " + modulename << ", can retry by providing password as the second argument" << endl;
-                                            cout << endl << "**** restartSystem Failed" << endl;
-                                            FAILED = true;
-
-                                            // stop local infinidb service
-                                            cmd = startup::StartUp::installDir() + "/bin/infinidb stop > /tmp/stop.log 2>&1";
-                                            system(cmd.c_str());
-
-                                            break;
-                                        }
-                                    }
-                                }
-
-                                if (FAILED)
-                                    break;
-                            }
-
-                            if (FAILED)
-                                break;
-
-                            //RESTART LOCAL HOST
-                            cmd = startup::StartUp::installDir() + "/bin/infinidb restart > /tmp/start.log 2>&1";
-                            int rtnCode = system(cmd.c_str());
-
-                            if (geteuid() == 0 && WEXITSTATUS(rtnCode) != 0)
-                            {
-                                cout << endl << "error with running 'infinidb restart' on local module " << endl;
-                                cout << endl << "**** restartSystem Failed" << endl;
-                                break;
-                            }
-                        }
-
-                        if (FAILED)
-                            break;
-                    }
-                }
-                else
-                {
-                    //just kick off local server
-                    cout << "   System being restarted, please wait...";
-                    cout.flush();
-                    string cmd = startup::StartUp::installDir() + "/bin/infinidb restart > /tmp/start.log 2>&1";
-                    int rtnCode = system(cmd.c_str());
-
-                    if (WEXITSTATUS(rtnCode) != 0)
-                    {
-                        cout << endl << "error with running 'infinidb start' on local module " << endl;
-                        cout << endl << "**** restartSystem Failed" << endl;
-                        break;
-                    }
-                }
-
-                if ( waitForActive() )
-                    cout << endl << "   Successful restart of System " << endl << endl;
-                else
-                    cout << endl << "**** restartSystem Failed : check log files" << endl;
-            }
-            else
-            {
-                BRM::DBRM dbrm;
-                bool bDBRMReady = dbrm.isDBRMReady();
-
-                try
-                {
-                    if (gracefulTemp != GRACEFUL ||
-                            !bDBRMReady ||
-                            dbrm.isReadWrite())
-                    {
-                        suspendAnswer = FORCE;
-                    }
-
-                    if (suspendAnswer == CANCEL)	// We don't have an answer from the command line.
-                    {
-                        // If there are bulkloads, ddl or dml happening, Ask what to do.
-                        bool bIsDbrmUp = true;
-                        execplan::SessionManager sessionManager;
-                        BRM::SIDTIDEntry blockingsid;
-                        std::vector<BRM::TableLockInfo> tableLocks = dbrm.getAllTableLocks();
-                        bool bActiveTransactions = false;
-
-                        if (!tableLocks.empty())
-                        {
-                            oam.DisplayLockedTables(tableLocks, &dbrm);
-                            bActiveTransactions = true;
-                        }
-
-                        if (sessionManager.checkActiveTransaction(0, bIsDbrmUp, blockingsid))
-                        {
-                            cout << endl << "There are active transactions being processed" << endl;
-                            bActiveTransactions = true;
-                        }
-
-                        if (bActiveTransactions)
-                        {
-                            suspendAnswer = AskSuspendQuestion(CmdID);
-                            //						if (suspendAnswer == FORCE)
-                            //						{
-                            //							if (confirmPrompt("Force may cause data problems and should only be used in extreme circumstances"))
-                            //							{
-                            //								break;
-                            //							}
-                            //						}
-                            bNeedsConfirm = false;
-                        }
-                        else
-                        {
-                            suspendAnswer = FORCE;
-                        }
-                    }
-
-                    if (suspendAnswer == CANCEL)
-                    {
-                        // We're outa here.
-                        break;
-                    }
-
-                    if (bNeedsConfirm)
-                    {
-                        if (confirmPrompt(""))
-                            break;
-                    }
-
-                    switch (suspendAnswer)
-                    {
-                        case WAIT:
-                            cout << endl << "   Waiting for all transactions to complete" << flush;
-                            dbrm.setSystemShutdownPending(true, false, false);
-                            gracefulTemp = GRACEFUL_WAIT;		// Causes procmgr to wait for all table locks to free and all transactions to finish before shutdown
-                            break;
-
-                        case ROLLBACK:
-                            cout << endl << "   Rollback of all transactions" << flush;
-                            dbrm.setSystemShutdownPending(true, true, false);
-                            gracefulTemp = GRACEFUL_WAIT;		// Causes procmgr to wait for all table locks to free and all transactions to finish before shutdown
-                            break;
-
-                        case FORCE:
-                            cout << endl << "   System being restarted now ..." << flush;
-
-                            if (bDBRMReady)
-                            {
-                                dbrm.setSystemShutdownPending(true, false, true);
-                            }
-
-                            break;
-
-                        case CANCEL:
-                            break;
-                    }
-
-                    int returnStatus = oam.restartSystem(gracefulTemp, ackTemp);
-
-                    switch (returnStatus)
-                    {
-                        case API_SUCCESS:
-                            if ( waitForActive() )
-                                cout << endl << "   Successful restart of System " << endl << endl;
-                            else
-                                cout << endl << "**** restartSystem Failed : check log files" << endl;
-
-                            break;
-
-                        case API_CANCELLED:
-                            cout << endl << "   Restart of System canceled" << endl << endl;
-                            break;
-
-                        default:
-                            cout << endl << "**** restartSystem Failed : Check system logs" << endl;
-                            break;
-                    }
-                }
-                catch (exception& e)
-                {
-                    cout << endl << "**** restartSystem Failed :  " << e.what() << endl;
-                    string Failed = e.what();
-
-                    if (Failed.find("Database Test Error") != string::npos)
-                        cout << "Database Test Error occurred, check Alarm and Logs for additional Information" << endl;
-                }
-            }
-        }
-        break;
-
-        case 20: // getSystemStatus - parameters: NONE
-        {
-            try
-            {
-                printSystemStatus();
-            }
-            catch (...)
-            {
-                break;
-            }
-
-        }
-        break;
-
-        case 21: // getProcessStatus - parameters: NONE
-        {
-            try
-            {
-                printProcessStatus();
-            }
-            catch (...)
-            {
-                break;
-            }
-        }
-        break;
-
-        case 22: // system - UNIX system command
-        {
-            if (arguments[1] == "")
-            {
-                // need arguments
-                cout << endl << "**** system Failed : Missing a required Parameter, enter 'help' for additional information" << endl;
-                break;
-            }
-
-            for (int j = 2; j < ArgNum; j++)
-            {
-                arguments[1].append(" ");
-                arguments[1].append(arguments[j]);
-            }
-
-            system (arguments[1].c_str());
-        }
-        break;
-
-        case 23: // getAlarmHistory
-        {
-            if (arguments[1] == "")
-            {
-                // need arguments
-                cout << endl << "**** getAlarmHistory Failed : Missing a required Parameter, enter 'help' for additional information" << endl;
-                break;
-            }
-
-            if ( arguments[1].size() != 8 )
-            {
-                cout << "date not in correct format, enter MM/DD/YY" << endl;
-                break;
-            }
-
-            if ( !(arguments[1].substr(2, 1) == "/" && arguments[1].substr(5, 1) == "/") )
-            {
-                cout << "date not in correct format, enter MM/DD/YY" << endl;
-                break;
-            }
-
-            AlarmList alarmList;
-
-            try
-            {
-                oam.getAlarms(arguments[1], alarmList);
-            }
-            catch (exception& e)
-            {
-                cout << endl << "**** getAlarms Failed =  " << e.what() << endl;
-                break;
-            }
-
-            cout << endl << "Historical Alarm List for " + arguments[1] + " :" << endl << endl;
-
-            AlarmList :: iterator i;
-            int counter = 0;
-
-            for (i = alarmList.begin(); i != alarmList.end(); ++i)
-            {
-                switch (i->second.getState())
-                {
-                    case SET:
-                        cout << "SET" << endl;
-                        break;
-
-                    case CLEAR:
-                        cout << "CLEAR" << endl;
-                        break;
-                }
-
-                cout << "AlarmID           = " << i->second.getAlarmID() << endl;
-                cout << "Brief Description = " << i->second.getDesc() << endl;
-                cout << "Alarm Severity    = ";
-
-                switch (i->second.getSeverity())
-                {
-                    case CRITICAL:
-                        cout << "CRITICAL" << endl;
-                        break;
-
-                    case MAJOR:
-                        cout << "MAJOR" << endl;
-                        break;
-
-                    case MINOR:
-                        cout << "MINOR" << endl;
-                        break;
-
-                    case WARNING:
-                        cout << "WARNING" << endl;
-                        break;
-
-                    case INFORMATIONAL:
-                        cout << "INFORMATIONAL" << endl;
-                        break;
-                }
-
-                cout << "Time Issued       = " << i->second.getTimestamp() << endl;
-                cout << "Reporting Module  = " << i->second.getSname() << endl;
-                cout << "Reporting Process = " << i->second.getPname() << endl;
-                cout << "Reported Device   = " << i->second.getComponentID() << endl << endl;
-
-                counter++;
-
-                if ( counter > 4 )
-                {
-                    // continue prompt
-                    if (confirmPrompt("Displaying Alarm History"))
-                        break;
-
-                    counter = 0;
-                }
-            }
-        }
-        break;
-
-        case 24: // monitorAlarms
-        {
-            cout << endl << "Monitor for System Alarms" << endl;
-            cout << " Enter control-C to return to command line" << endl << endl;
-
-            string cmd = "tail -n 0 -f " + snmpmanager::ALARM_FILE;
-            system(cmd.c_str());
-        }
-        break;
-
-        case 25: // resetAlarm
-        {
-            if (arguments[1] == "")
-            {
-                // need 3 arguments
-                cout << endl << "**** resetAlarm Failed : Missing a required Parameter, enter 'help' for additional information" << endl;
-                break;
-            }
-
-            try
-            {
-                // check if requested alarm is Active
-                AlarmList alarmList;
-                Oam oam;
-
-                try
-                {
-                    oam.getActiveAlarms(alarmList);
-                }
-                catch (exception& e)
-                {
-                    cout << endl << "**** getActiveAlarm Failed =  " << e.what() << endl;
-                    break;
-                }
-
-                bool found = false;
-                AlarmList::iterator i;
-
-                for (i = alarmList.begin(); i != alarmList.end(); ++i)
-                {
-                    // check if matching ID
-                    if ( arguments[1] != "ALL" )
-                    {
-                        if (atoi(arguments[1].c_str()) != (i->second).getAlarmID() )
-                            continue;
-
-                        if ( arguments[2] != "ALL")
-                        {
-                            if (arguments[2].compare((i->second).getSname()) != 0)
-                                continue;
-
-                            if ( arguments[3] != "ALL")
-                            {
-                                if (arguments[3].compare((i->second).getComponentID()) != 0 )
-                                    continue;
-                            }
-                        }
-                    }
-
-                    ALARMManager aManager;
-                    aManager.sendAlarmReport((i->second).getComponentID().c_str(),
-                                             (i->second).getAlarmID(),
-                                             CLEAR,
-                                             (i->second).getSname(),
-                                             "calpontConsole");
-
-                    cout << endl << "   Alarm Successfully Reset: ";
-                    cout << "ID = " << oam.itoa((i->second).getAlarmID());
-                    cout << " / Module = " << (i->second).getSname();
-                    cout << " / Device = " << (i->second).getComponentID() << endl;
-                    found = true;
-                }
-
-                // check is a SET alarm was found, if not return
-                if (!found)
-                {
-                    cout << endl << "**** resetAlarm Failed : Requested Alarm is not Set" << endl;
-                    break;
-                }
-            }
-            catch (exception& e)
-            {
-                cout << endl << "**** resetAlarm Failed =  " << e.what() << endl;
-                break;
-            }
-        }
-        break;
-
-        case 26: // enableLog
-        {
-            if (arguments[2] == "")
-            {
-                // need 2 arguments
-                cout << endl << "**** Failed : enableLog Missing a required Parameter, enter 'help' for additional information" << endl;
-                break;
-            }
-
-            // covert second argument (level) into lowercase
-            transform (arguments[2].begin(), arguments[2].end(), arguments[2].begin(), to_lower());
-
-            try
-            {
-                oam.updateLog(ENABLEDSTATE, arguments[1], arguments[2]);
-                cout << endl << "   Successful Enabling of Logging " << endl << endl;
-            }
-            catch (exception& e)
-            {
-                cout << endl << "**** enableLog Failed :  " << e.what() << endl;
-            }
-        }
-        break;
-
-        case 27: // disableLog
-        {
-            if (arguments[2] == "")
-            {
-                // need 2 arguments
-                cout << endl << "**** disableLog Failed : Missing a required Parameter, enter 'help' for additional information" << endl;
-                break;
-            }
-
-            // covert second argument (level) into lowercase
-            transform (arguments[2].begin(), arguments[2].end(), arguments[2].begin(), to_lower());
-
-            try
-            {
-                oam.updateLog(MANDISABLEDSTATE, arguments[1], arguments[2]);
-                cout << endl << "   Successful Disabling of Logging " << endl << endl;
-            }
-            catch (exception& e)
-            {
-                cout << endl << "**** disableLog Failed :  " << e.what() << endl;
-            }
-        }
-        break;
-
-        case 28: // switchParentOAMModule
-        {
-            BRM::DBRM dbrm;
-            bool bDBRMReady = dbrm.isDBRMReady();
-            string module;
-            bool bUseHotStandby = true;
-            SystemStatus systemstatus;
-            Oam oam;
-
-            //first check that the system is in a ACTIVE OR MAN_OFFLINE STATE
-            try
-            {
-                oam.getSystemStatus(systemstatus);
-
-                if (systemstatus.SystemOpState == ACTIVE ||
-                        systemstatus.SystemOpState == MAN_OFFLINE)
-                {
-                    module = "";
-                }
-                else
-                {
-                    cout << endl << "**** switchParentOAMModule Failed : System Status needs to be ACTIVE or MAN_OFFLINE" << endl;
-                    break;
-                }
-            }
-            catch (...)
-            {}
-
-            // First get the values for the standard arguments
-            getFlags(arguments, gracefulTemp, ackTemp, suspendAnswer, bNeedsConfirm);
-
-            // Now check for arguments unique to this command. In this case, a valid
-            // module name.
-            for (int i = 1; i < ArgNum; i++)
-            {
-                if (arguments[i].size() > 0)
-                {
-                    if (oam.validateModule(arguments[i]) == API_SUCCESS)
-                    {
-                        module = arguments[i];
-                        bUseHotStandby = false;
-                        break;
-                    }
-                }
-            }
-
-            //check if there are more than 1 pm modules to start with
-            ModuleTypeConfig moduletypeconfig;
-            oam.getSystemConfig("pm", moduletypeconfig);
-
-            if ( moduletypeconfig.ModuleCount < 2 )
-            {
-                cout << endl << "**** switchParentOAMModule Failed : Command only support on systems with Multiple Performance Modules" << endl;
-//				break;
-            }
-
-            string DBRootStorageType;
-
-            try
-            {
-                oam.getSystemConfig("DBRootStorageType", DBRootStorageType);
-            }
-            catch (...) {}
-
-            string GlusterConfig = "n";
-
-            try
-            {
-                oam.getSystemConfig( "GlusterConfig", GlusterConfig);
-            }
-            catch (...)
-            {}
-
-            if (DBRootStorageType == "internal" && GlusterConfig == "n")
-            {
-                cout << endl << "**** switchParentOAMModule Failed : DBRoot Storage type =  internal/non-data-replication" << endl;
-                break;
-            }
-
-            string ParentOAMModuleName;
-
-            try
-            {
-                oam.getSystemConfig("ParentOAMModuleName", ParentOAMModuleName);
-            }
-            catch (...) {}
-
-            if (bUseHotStandby)
-            {
-                oam.getSystemConfig("StandbyOAMModuleName", module);
-
-                if ( module.empty() || module == oam::UnassignedName )
-                {
-                    cout << endl << "**** switchParentOAMModule Failed : There's no hot standby defined" << endl << "     enter a Performance Module" << endl;
-                    break;
-                }
-
-                cout << endl << "Switching to the Hot-Standby Parent OAM Module '" << module << "'" << endl;
-            }
-            else
-            {
-                parentOAMModule = getParentOAMModule();
-
-                if ( module == parentOAMModule )
-                {
-                    cout << endl << "**** switchParentOAMModule Failed : " << module << " is already the Active Parent OAM Module" << endl;
-                    break;
-                }
-
-                cout << endl << "Switching to the Performance Module '" << module << "'" << endl;
-            }
-
-            //check for gluster system is do-able
-            if (GlusterConfig == "y")
-            {
-                // get to-module assigned DBRoots and see if current active PM
-                // has a copy
-
-                DBRootConfigList toPMbrootConfigList;
-
-                try
-                {
-                    string moduleID = module.substr(MAX_MODULE_TYPE_SIZE, MAX_MODULE_ID_SIZE);
-                    oam.getPmDbrootConfig(atoi(moduleID.c_str()), toPMbrootConfigList);
-
-                    bool match = false;
-                    DBRootConfigList::iterator pt = toPMbrootConfigList.begin();
-
-                    for ( ; pt != toPMbrootConfigList.end() ; pt++)
-                    {
-                        // check if ACTIVE PM has a copy of Dbroot
-                        string pmList = "";
-
-                        try
-                        {
-                            string errmsg;
-                            int ret = oam.glusterctl(oam::GLUSTER_WHOHAS, oam.itoa(*pt), pmList, errmsg);
-
-                            if ( ret != 0 )
-                            {
-                                cout << endl << "**** switchParentOAMModule Failed : " << module << " glusterctl error" << endl;
-                                break;
-                            }
-                        }
-                        catch (...)
-                        {
-                            cout << endl << "**** switchParentOAMModule Failed : " << module << " glusterctl error" << endl;
-                            break;
-                        }
-
-                        boost::char_separator<char> sep(" ");
-                        boost::tokenizer< boost::char_separator<char> > tokens(pmList, sep);
-
-                        for ( boost::tokenizer< boost::char_separator<char> >::iterator it1 = tokens.begin();
-                                it1 != tokens.end();
-                                ++it1)
-                        {
-                            string pmModule = "pm" + *it1;
-
-                            if ( pmModule == ParentOAMModuleName )
-                            {
-                                match = true;
-                                break;
-                            }
-                        }
-                    }
-
-                    if (!match)
-                    {
-                        cout << endl << "**** switchParentOAMModule Failed : The Current Active PM doesn't have a copy of any DBROOTs that reside on the Siwtching PM " << endl;
-                        break;
-                    }
-
-                    //check if switching to PM has DBROOT 1
-                    string pmList = "";
-
-                    try
-                    {
-                        string errmsg;
-                        int ret = oam.glusterctl(oam::GLUSTER_WHOHAS, "1", pmList, errmsg);
-
-                        if ( ret != 0 )
-                        {
-                            cout << endl << "**** switchParentOAMModule Failed : " << module << " glusterctl error" << endl;
-                            break;
-                        }
-                    }
-                    catch (...)
-                    {
-                        cout << endl << "**** switchParentOAMModule Failed : " << module << " glusterctl error" << endl;
-                        break;
-                    }
-
-                    match = false;
-                    boost::char_separator<char> sep(" ");
-                    boost::tokenizer< boost::char_separator<char> > tokens(pmList, sep);
-
-                    for ( boost::tokenizer< boost::char_separator<char> >::iterator it1 = tokens.begin();
-                            it1 != tokens.end();
-                            ++it1)
-                    {
-                        string pmModule = "pm" + *it1;
-
-                        if ( pmModule == module )
-                        {
-                            match = true;
-                            break;
-                        }
-                    }
-
-                    if (!match)
-                    {
-                        cout << endl << "**** switchParentOAMModule Failed : The Switching to PM doesn't have a copy of the DBROOT #1" << endl;
-                        break;
-                    }
-                }
-                catch (exception& e)
-                {
-                    cout << endl << "**** getPmDbrootConfig Failed for '" << module << "' : " << e.what() << endl;
-                    break;
-                }
-            }
-
-
-            if (bNeedsConfirm)
-            {
-                // confirm request
-                if (confirmPrompt("This command switches the Active Parent OAM Module and should only be executed on an idle system."))
-                    break;
-            }
-
-            string MySQLRep;
-            string MySQLPasswordConfig;
-
-            try
-            {
-                oam.getSystemConfig("MySQLRep", MySQLRep);
-                oam.getSystemConfig("MySQLPasswordConfig", MySQLPasswordConfig);
-            }
-            catch (...) {}
-
-            if ( MySQLRep == "y" && MySQLPasswordConfig == oam::UnassignedName )
-            {
-                cout << endl;
-                string prompt = "MySQL Replication is enabled, is there a 'MySQL' Password configured in " + HOME + "/.my.cnf  (y,n): ";
-                MySQLPasswordConfig = dataPrompt(prompt);
-            }
-
-            if ( MySQLPasswordConfig != "y" )
-                MySQLPasswordConfig = "n";
-
-            try
-            {
-                oam.setSystemConfig("MySQLPasswordConfig", MySQLPasswordConfig);
-            }
-            catch (...) {}
-
-            try
-            {
-                cout << endl << "   Check for active transactions" << endl;
-
-                if (!bDBRMReady ||
-                        dbrm.isReadWrite() != 0)
-                {
-                    suspendAnswer = FORCE;
-                }
-
-                if (suspendAnswer == CANCEL)	// We don't have an answer from the command line.
-                {
-                    // If there are bulkloads, ddl or dml happening, Ask what to do.
-                    bool bIsDbrmUp = true;
-                    execplan::SessionManager sessionManager;
-                    BRM::SIDTIDEntry blockingsid;
-                    std::vector<BRM::TableLockInfo> tableLocks = dbrm.getAllTableLocks();
-                    bool bActiveTransactions = false;
-
-                    if (!tableLocks.empty())
-                    {
-                        oam.DisplayLockedTables(tableLocks, &dbrm);
-                        bActiveTransactions = true;
-                    }
-
-                    if (sessionManager.checkActiveTransaction(0, bIsDbrmUp, blockingsid))
-                    {
-                        cout << endl << "There are active transactions being processed" << endl;
-                        bActiveTransactions = true;
-                    }
-
-                    if (bActiveTransactions)
-                    {
-                        suspendAnswer = AskSuspendQuestion(CmdID);
-                        //					if (suspendAnswer == FORCE)
-                        //					{
-                        //						if (confirmPrompt("Force may cause data problems and should only be used in extreme circumstances"))
-                        //						{
-                        //							break;
-                        //						}
-                        //					}
-                    }
-                    else
-                    {
-                        suspendAnswer = FORCE;
-                    }
-                }
-
-                if (suspendAnswer == CANCEL)
-                {
-                    // We're outa here.
-                    break;
-                }
-
-                switch (suspendAnswer)
-                {
-                    case WAIT:
-                        cout << endl << "   Waiting for all transactions to complete" << flush;
-                        dbrm.setSystemShutdownPending(true, false, false);
-                        gracefulTemp = GRACEFUL_WAIT;		// Causes procmgr to wait for all table locks to free and all transactions to finish before shutdown
-                        break;
-
-                    case ROLLBACK:
-                        cout << endl << "   Rollback of all transactions" << flush;
-                        dbrm.setSystemShutdownPending(true, true, false);
-                        gracefulTemp = GRACEFUL_WAIT;		// Causes procmgr to wait for all table locks to free and all transactions to finish before shutdown
-                        break;
-
-                    case FORCE:
-                        cout << endl << "   Switch Active Parent OAM Module starting..." << endl;
-
-                        if (bDBRMReady)
-                        {
-                            dbrm.setSystemShutdownPending(true, false, true);
-                        }
-
-                        break;
-
-                    case CANCEL:
-                        break;
-                }
-
-                if (oam.switchParentOAMModule(module, gracefulTemp))
-                {
-                    if (waitForActive())
-                    {
-                        // give time for new ProcMgr to go active
-                        sleep (10);
-                        cout << endl << "   Successful Switch Active Parent OAM Module" << endl << endl;
-                    }
-                    else
-                        cout << endl << "**** Switch Active Parent OAM Module failed : check log files" << endl;
-                }
-                else
-                {
-                    // give time for new ProcMgr to go active
-                    sleep (10);
-                    cout << endl << "   Successful Switch Active Parent OAM Module" << endl << endl;
-                }
-            }
-            catch (exception& e)
-            {
-                cout << endl << "**** switchParentOAMModule Failed :  " << e.what() << endl;
-                break;
-            }
-        }
-        break;
-
-        case 29: // getStorageStatus
-        {
-            SystemStatus systemstatus;
-            Oam oam;
-
-            cout << "System External DBRoot Storage Statuses" << endl << endl;
-            cout << "Component     Status                       Last Status Change" << endl;
-            cout << "------------  --------------------------   ------------------------" << endl;
-
-            try
-            {
-                oam.getSystemStatus(systemstatus, false);
-
-                if ( systemstatus.systemdbrootstatus.dbrootstatus.size() == 0 )
-                {
-                    cout << " No External DBRoot Storage Configured" << endl;
-                    break;
-                }
-
-                for ( unsigned int i = 0 ; i < systemstatus.systemdbrootstatus.dbrootstatus.size(); i++)
-                {
-                    if ( systemstatus.systemdbrootstatus.dbrootstatus[i].Name.empty() )
-                        // end of list
-                        break;
-
-                    cout << "DBRoot #";
-                    cout.setf(ios::left);
-                    cout.width(6);
-                    cout << systemstatus.systemdbrootstatus.dbrootstatus[i].Name;
-                    cout.width(29);
-                    int state = systemstatus.systemdbrootstatus.dbrootstatus[i].OpState;
-                    printState(state, " ");
-                    cout.width(24);
-                    string stime = systemstatus.systemdbrootstatus.dbrootstatus[i].StateChangeDate ;
-                    stime = stime.substr (0, 24);
-                    cout << stime << endl;
-                }
-
-                cout << endl;
-            }
-            catch (exception& e)
-            {
-                cout << endl << "**** getSystemStatus Failed =  " << e.what() << endl;
-            }
-        }
-        break;
-
-        case 30: // getLogConfig
-        {
-            try
-            {
-                SystemLogConfigData systemconfigdata;
-                LogConfigData logconfigdata;
-
-                oam.getLogConfig(systemconfigdata);
-
-                string configFileName;
-                oam.getSystemConfig("SystemLogConfigFile", configFileName);
-
-                cout << endl << "Calpont System Log Configuration Data" << endl << endl;
-
-                cout << "System Logging Configuration File being used: " <<  configFileName << endl << endl;
-
-                cout << "Module    Configured Log Levels" << endl;
-                cout << "------    ---------------------------------------" << endl;
-
-                SystemLogConfigData::iterator pt = systemconfigdata.begin();
-
-                for (; pt != systemconfigdata.end() ; pt++)
-                {
-                    logconfigdata = *pt;
-                    string module = logconfigdata.moduleName;
-                    int data = logconfigdata.configData;
-
-                    if ( data < API_MAX )
-                    {
-                        // failure API status returned
-                        cout.setf(ios::left);
-                        cout.width(10);
-                        cout << logconfigdata.moduleName;
-                        cout << "getLogConfig Failed - Error : " << data << endl;
-                    }
-                    else
-                    {
-                        cout.setf(ios::left);
-                        cout.width(10);
-                        cout << logconfigdata.moduleName;
-
-                        data = data - API_MAX;
-
-                        if ( data == 0 )
-                            // no level configured
-                            cout << "None Configured" << endl;
-                        else
-                        {
-                            if ( ((data & LEVEL_CRITICAL) ? 1 : 0) == 1 )
-                                cout << "Critical ";
-
-                            if ( ((data & LEVEL_ERROR) ? 1 : 0) == 1 )
-                                cout << "Error ";
-
-                            if ( ((data & LEVEL_WARNING) ? 1 : 0) == 1 )
-                                cout << "Warning ";
-
-                            if ( ((data & LEVEL_INFO) ? 1 : 0) == 1 )
-                                cout << "Info ";
-
-                            if ( ((data & LEVEL_DEBUG) ? 1 : 0) == 1 )
-                                cout << "Debug ";
-
-                            if ( ((data & LEVEL_DATA) ? 1 : 0) == 1 )
-                                cout << "Data";
-
-                            cout << endl;
-                        }
-                    }
-                }
-            }
-            catch (exception& e)
-            {
-                cout << endl << "**** getLogConfig Failed :  " << e.what() << endl;
-                break;
-            }
-
-        }
-        break;
-
-        case 31: // movePmDbrootConfig parameters: pm-reside dbroot-list pm-to
-        {
-            if ( localModule != parentOAMModule )
-            {
-                // exit out since not on active module
-                cout << endl << "**** movePmDbrootConfig Failed : Can only run command on Active OAM Parent Module (" << parentOAMModule << ")." << endl;
-                break;
-            }
-
-            //check the system status / service status and only allow command when System is MAN_OFFLINE
-            string cmd = startup::StartUp::installDir() + "/bin/infinidb status > /tmp/status.log";
-            system(cmd.c_str());
-
-            if (oam.checkLogStatus("/tmp/status.log", "InfiniDB is running") )
-            {
-                SystemStatus systemstatus;
-
-                try
-                {
-                    oam.getSystemStatus(systemstatus);
-
-                    if (systemstatus.SystemOpState != oam::MAN_OFFLINE )
-                    {
-                        cout << endl << "**** movePmDbrootConfig Failed,  System has to be in a MAN_OFFLINE state, stop system first" << endl;
-                        break;
-                    }
-                }
-                catch (exception& e)
-                {
-                    cout << endl << "**** movePmDbrootConfig Failed : " << e.what() << endl;
-                    break;
-                }
-                catch (...)
-                {
-                    cout << endl << "**** movePmDbrootConfig Failed,  Failed return from getSystemStatus API" << endl;
-                    break;
-                }
-            }
-
-            if (arguments[3] == "")
-            {
-                // need arguments
-                cout << endl << "**** movePmDbrootConfig Failed : Missing a required Parameter, enter 'help' for additional information" << endl;
-                break;
-            }
-
-            string residePM = arguments[1];
-            string dbrootIDs = arguments[2];
-            string toPM = arguments[3];
-
-            string residePMID = residePM.substr(MAX_MODULE_TYPE_SIZE, MAX_MODULE_ID_SIZE);;
-            string toPMID = toPM.substr(MAX_MODULE_TYPE_SIZE, MAX_MODULE_ID_SIZE);;
-
-            // check module status
-            try
-            {
-                bool degraded;
-                int opState;
-                oam.getModuleStatus(toPM, opState, degraded);
-
-                if (opState == oam::AUTO_DISABLED ||
-                        opState == oam::MAN_DISABLED)
-                {
-                    cout << "**** movePmDbrootConfig Failed: " << toPM << " is DISABLED." << endl;
-                    cout << "Run alterSystem-EnableModule to enable module" << endl;
-                    break;
-                }
-
-                if (opState == oam::FAILED)
-                {
-                    cout << "**** movePmDbrootConfig Failed: " << toPM << " is in a FAILED state." << endl;
-                    break;
-                }
-            }
-            catch (exception& ex)
-            {}
-
-            bool moveDBRoot1 = false;
-            bool found = false;
-            boost::char_separator<char> sep(", ");
-            boost::tokenizer< boost::char_separator<char> > tokens(dbrootIDs, sep);
-
-            for ( boost::tokenizer< boost::char_separator<char> >::iterator it = tokens.begin();
-                    it != tokens.end();
-                    ++it)
-            {
-                if (*it == "1" )
-                {
-                    moveDBRoot1 = true;
-                    break;
-                }
-
-                //if gluster, check if toPM is has a copy
-                string GlusterConfig;
-
-                try
-                {
-                    oam.getSystemConfig("GlusterConfig", GlusterConfig);
-                }
-                catch (...) {}
-
-                if ( GlusterConfig == "y" )
-                {
-                    string pmList = "";
-
-                    try
-                    {
-                        string errmsg;
-                        oam.glusterctl(oam::GLUSTER_WHOHAS, *it, pmList, errmsg);
-                    }
-                    catch (...)
-                    {}
-
-                    boost::char_separator<char> sep(" ");
-                    boost::tokenizer< boost::char_separator<char> > tokens(pmList, sep);
-
-                    for ( boost::tokenizer< boost::char_separator<char> >::iterator it1 = tokens.begin();
-                            it1 != tokens.end();
-                            ++it1)
-                    {
-                        if ( *it1 == toPMID )
-                        {
-                            found = true;
-                            break;
-                        }
-                    }
-
-                    if (!found)
-                    {
-                        cout << endl << "**** movePmDbrootConfig Failed : Data Redundancy Configured, DBRoot #" << *it << " doesn't have a copy on " << toPM << endl;
-                        cout << "Run getStorageConfig to get copy information" << endl << endl;
-                        break;
-                    }
-                }
-                else
-                    found = true;
-            }
-
-            if (moveDBRoot1)
-            {
-                cout << endl << "**** movePmDbrootConfig Failed : Can't move dbroot #1" << endl << endl;
-                break;
-            }
-
-            if (!found)
-            {
-                break;
-            }
-
-
-            if (residePM.find("pm") == string::npos )
-            {
-                cout << endl << "**** movePmDbrootConfig Failed : Parmameter 1 is not a Performance Module name, enter 'help' for additional information" << endl;
-                break;
-            }
-
-            if (toPM.find("pm") == string::npos )
-            {
-                cout << endl << "**** movePmDbrootConfig Failed : Parmameter 3 is not a Performance Module name, enter 'help' for additional information" << endl;
-                break;
-            }
-
-            if (residePM == toPM )
-            {
-                cout << endl << "**** movePmDbrootConfig Failed : Reside and To Performance Modules are the same" << endl;
-                break;
-            }
-
-            //get dbroots ids for reside PM
-            DBRootConfigList residedbrootConfigList;
-
-            try
-            {
-                oam.getPmDbrootConfig(atoi(residePMID.c_str()), residedbrootConfigList);
-
-                cout << endl << "DBRoot IDs currently assigned to '" + residePM + "' = ";
-
-                DBRootConfigList::iterator pt = residedbrootConfigList.begin();
-
-                for ( ; pt != residedbrootConfigList.end() ;)
-                {
-                    cout << oam.itoa(*pt);
-                    pt++;
-
-                    if (pt != residedbrootConfigList.end())
-                        cout << ", ";
-                }
-
-                cout << endl;
-            }
-            catch (exception& e)
-            {
-                cout << endl << "**** getPmDbrootConfig Failed for '" << residePM << "' : " << e.what() << endl;
-                break;
-            }
-
-            //get dbroots ids for reside PM
-            DBRootConfigList todbrootConfigList;
-
-            try
-            {
-                oam.getPmDbrootConfig(atoi(toPMID.c_str()), todbrootConfigList);
-
-                cout << "DBRoot IDs currently assigned to '" + toPM + "' = ";
-
-                DBRootConfigList::iterator pt = todbrootConfigList.begin();
-
-                for ( ; pt != todbrootConfigList.end() ;)
-                {
-                    cout << oam.itoa(*pt);
-                    pt++;
-
-                    if (pt != todbrootConfigList.end())
-                        cout << ", ";
-                }
-
-                cout << endl;
-            }
-            catch (exception& e)
-            {
-                cout << endl << "**** getPmDbrootConfig Failed for '" << toPM << "' : " << e.what() << endl;
-                break;
-            }
-
-            cout << endl << "DBroot IDs being moved, please wait..." << endl << endl;
-
-            try
-            {
-                oam.manualMovePmDbroot(residePM, dbrootIDs, toPM);
-            }
-            catch (...)
-            {
-                cout << endl << "**** manualMovePmDbroot Failed : API Failure" << endl;
-                break;
-            }
-
-            //get dbroots ids for reside PM
-            try
-            {
-                residedbrootConfigList.clear();
-                oam.getPmDbrootConfig(atoi(residePMID.c_str()), residedbrootConfigList);
-
-                cout << "DBRoot IDs newly assigned to '" + residePM + "' = ";
-
-                DBRootConfigList::iterator pt = residedbrootConfigList.begin();
-
-                for ( ; pt != residedbrootConfigList.end() ;)
-                {
-                    cout << oam.itoa(*pt);
-                    pt++;
-
-                    if (pt != residedbrootConfigList.end())
-                        cout << ", ";
-                }
-
-                cout << endl;
-            }
-            catch (exception& e)
-            {
-                cout << endl << "**** getPmDbrootConfig Failed for '" << toPM << "' : " << e.what() << endl;
-                break;
-            }
-
-            try
-            {
-                todbrootConfigList.clear();
-                oam.getPmDbrootConfig(atoi(toPMID.c_str()), todbrootConfigList);
-
-                cout << "DBRoot IDs newly assigned to '" + toPM + "' = ";
-
-                DBRootConfigList::iterator pt = todbrootConfigList.begin();
-
-                for ( ; pt != todbrootConfigList.end() ;)
-                {
-                    cout << oam.itoa(*pt);
-                    pt++;
-
-                    if (pt != todbrootConfigList.end())
-                        cout << ", ";
-                }
-
-                cout << endl;
-            }
-            catch (exception& e)
-            {
-                cout << endl << "**** getPmDbrootConfig Failed for '" << toPM << "' : " << e.what() << endl;
-                break;
-            }
-
-        }
-        break;
-
-        case 32: // suspendDatabaseWrites
-        {
-            BRM::DBRM dbrm;
-            getFlags(arguments, gracefulTemp, ackTemp, suspendAnswer, bNeedsConfirm);
-
-            cout << endl << "This command suspends the DDL/DML writes to the Calpont Database" << endl;
-
-            try
-            {
-
-                if (!dbrm.isDBRMReady())
-                {
-                    cout << endl << "   The Controller Node is not responding.\n   The system can't be set into write suspend mode" << endl <<  flush;
-                    break;
-                }
-                else if (dbrm.isReadWrite() != 0)
-                {
-                    suspendAnswer = FORCE;
-                }
-
-                // If there are bulkloads, ddl or dml happening, refuse the request
-                if (suspendAnswer == CANCEL)	// We don't have an answer from the command line.
-                {
-                    // If there are bulkloads, ddl or dml happening, Ask what to do.
-                    bool bIsDbrmUp = true;
-                    execplan::SessionManager sessionManager;
-                    BRM::SIDTIDEntry blockingsid;
-                    std::vector<BRM::TableLockInfo> tableLocks = dbrm.getAllTableLocks();
-                    bool bActiveTransactions = false;
-
-                    if (!tableLocks.empty())
-                    {
-                        oam.DisplayLockedTables(tableLocks, &dbrm);
-                        bActiveTransactions = true;
-                    }
-
-                    if (sessionManager.checkActiveTransaction(0, bIsDbrmUp, blockingsid))
-                    {
-                        cout << endl << "There are active transactions being processed" << endl;
-                        bActiveTransactions = true;
-                    }
-
-                    if (bActiveTransactions)
-                    {
-                        suspendAnswer = AskSuspendQuestion(CmdID);
-                        //					if (suspendAnswer == FORCE)
-                        //					{
-                        //						if (confirmPrompt("Force may cause data problems and should only be used in extreme circumstances"))
-                        //						{
-                        //							break;
-                        //						}
-                        //					}
-                        bNeedsConfirm = false;
-                    }
-                    else
-                    {
-                        suspendAnswer = FORCE;
-                    }
-                }
-
-                if (suspendAnswer == CANCEL)
-                {
-                    // We're outa here.
-                    break;
-                }
-
-                if (bNeedsConfirm)
-                {
-                    if (confirmPrompt(""))
-                        break;
-                }
-
-                switch (suspendAnswer)
-                {
-                    case WAIT:
-                        cout << endl << "   Waiting for all transactions to complete" << flush;
-                        dbrm.setSystemSuspendPending(true, false);
-                        gracefulTemp = GRACEFUL_WAIT;		// Causes procmgr to wait for all table locks to free and all transactions to finish before shutdown
-                        break;
-
-                    case ROLLBACK:
-                        cout << endl << "   Rollback of all transactions" << flush;
-                        dbrm.setSystemSuspendPending(true, true);
-                        gracefulTemp = GRACEFUL_WAIT;		// Causes procmgr to wait for all table locks to free and all transactions to finish before shutdown
-                        break;
-
-                    case FORCE:
-                    case CANCEL:
-                    default:
-                        gracefulTemp = FORCEFUL;
-                        break;
-                }
-
-                // stop writes to Calpont Database
-                oam.SuspendWrites(gracefulTemp, ackTemp);
-            }
-            catch (exception& e)
-            {
-                cout << endl << "**** stopDatabaseWrites Failed: " << e.what() << endl;
-            }
-            catch (...)
-            {
-                cout << endl << "**** stopDatabaseWrites Failed" << endl;
-                break;
-            }
-
-            break;
-        }
-
-        case 33: // resumeDatabaseWrites
-        {
-            if ( arguments[1] != "y" )
-            {
-                if (confirmPrompt("This command resumes the DDL/DML writes to the Calpont Database"))
-                    break;
-            }
-
-            // resume writes to Calpont Database
-
-            try
-            {
-                SystemProcessStatus systemprocessstatus;
-                BRM::DBRM dbrm;
-
-                dbrm.setSystemSuspended(false);
-
-                oam.getProcessStatus(systemprocessstatus);
-
-                for ( unsigned int i = 0 ; i < systemprocessstatus.processstatus.size(); i++)
-                {
-                    if (systemprocessstatus.processstatus[i].ProcessName  == "DMLProc")
-                    {
-                        oam.setProcessStatus(systemprocessstatus.processstatus[i].ProcessName, systemprocessstatus.processstatus[i].Module, ACTIVE, 1);
-                    }
-
-                    if (systemprocessstatus.processstatus[i].ProcessName  == "DDLProc")
-                    {
-                        oam.setProcessStatus(systemprocessstatus.processstatus[i].ProcessName, systemprocessstatus.processstatus[i].Module, ACTIVE, 1);
-                    }
-
-                    if (systemprocessstatus.processstatus[i].ProcessName  == "WriteEngineServer")
-                    {
-                        oam.setProcessStatus(systemprocessstatus.processstatus[i].ProcessName, systemprocessstatus.processstatus[i].Module, ACTIVE, 1);
-                    }
-                }
-
-                oam.setSystemStatus(ACTIVE);
-                cout << endl << "Resume Calpont Database Writes Request successfully completed" << endl;
-            }
-            catch (exception& e)
-            {
-                cout << endl << "**** resumeDatabaseWrites Failed: " << e.what() << endl;
-            }
-            catch (...)
-            {
-                cout << endl << "**** resumeDatabaseWrites Failed" << endl;
-                break;
-            }
-
-            break;
-        }
-
-        case 34: // unassignDbrootPmConfig parameters: dbroot-list reside-pm
-        {
-            if ( localModule != parentOAMModule )
-            {
-                // exit out since not on active module
-                cout << endl << "**** unassignDbrootPmConfig Failed : Can only run command on Active OAM Parent Module (" << parentOAMModule << ")." << endl;
-                break;
-            }
-
-
-            if (arguments[2] == "")
-            {
-                // need atleast 2 arguments
-                cout << endl << "**** unassignDbrootPmConfig Failed : Missing a required Parameter, enter 'help' for additional information" << endl;
-                break;
-            }
-
-            string dbrootIDs = arguments[1];
-            string residePM = arguments[2];
-
-            if (arguments[2].find("pm") == string::npos )
-            {
-                cout << endl << "**** unassignDbrootPmConfig Failed : Parmameter 2 is not a Performance Module name, enter 'help' for additional information" << endl;
-                break;
-            }
-
-            // check module status
-            try
-            {
-                bool degraded;
-                int opState;
-                oam.getModuleStatus(residePM, opState, degraded);
-
-                if (opState != oam::MAN_OFFLINE)
-                {
-                    cout << endl << "**** unassignDbrootPmConfig Failed, " + residePM + " has to be in a MAN_OFFLINE state" << endl;
-                    break;
-                }
-
-            }
-            catch (exception& ex)
-            {}
-
-            DBRootConfigList dbrootlist;
-
-            boost::char_separator<char> sep(", ");
-            boost::tokenizer< boost::char_separator<char> > tokens(dbrootIDs, sep);
-
-            for ( boost::tokenizer< boost::char_separator<char> >::iterator it = tokens.begin();
-                    it != tokens.end();
-                    ++it)
-            {
-                dbrootlist.push_back(atoi((*it).c_str()));
-            }
-
-            cout << endl;
-
-            //get dbroots ids for reside PM
-            try
-            {
-                oam.unassignDbroot(residePM, dbrootlist);
-
-                cout << endl << "   Successfully Unassigned DBRoots " << endl << endl;
-
-            }
-            catch (exception& e)
-            {
-                cout << endl << "**** Failed Unassign of DBRoots: " << e.what() << endl;
-                break;
-            }
-        }
-        break;
-
-        case 35: // assignDbrootPmConfig parameters: pm dbroot-list
-        {
-            if ( localModule != parentOAMModule )
-            {
-                // exit out since not on active module
-                cout << endl << "**** assignDbrootPmConfig Failed : Can only run command on Active OAM Parent Module (" << parentOAMModule << ")." << endl;
-                break;
-            }
-
-            //check the system status / service status and only allow command when System is MAN_OFFLINE
-            string cmd = startup::StartUp::installDir() + "/bin/infinidb status > /tmp/status.log";
-            system(cmd.c_str());
-
-            if (!oam.checkLogStatus("/tmp/status.log", "InfiniDB is running") )
-            {
-                cout << endl << "**** assignDbrootPmConfig Failed,  System is down. Needs to be running" << endl;
-                break;
-            }
-
-            if (arguments[2] == "")
-            {
-                // need atleast 2 arguments
-                cout << endl << "**** assignDbrootPmConfig Failed : Missing a required Parameter, enter 'help' for additional information" << endl;
-                break;
-            }
-
-            string dbrootIDs = arguments[1];
-            string toPM = arguments[2];
-
-            if (arguments[2].find("pm") == string::npos )
-            {
-                cout << endl << "**** assignDbrootPmConfig Failed : Parmameter 2 is not a Performance Module name, enter 'help' for additional information" << endl;
-                break;
-            }
-
-            // check module status
-            try
-            {
-                bool degraded;
-                int opState;
-                oam.getModuleStatus(toPM, opState, degraded);
-
-                if (opState == oam::AUTO_DISABLED ||
-                        opState == oam::MAN_DISABLED)
-                {
-                    cout << "**** assignDbrootPmConfig Failed: " << toPM << " is DISABLED." << endl;
-                    cout << "Run alterSystem-EnableModule to enable module" << endl;
-                    break;
-                }
-
-                if (!opState == oam::MAN_OFFLINE)
-                {
-                    cout << "**** assignDbrootPmConfig Failed: " << toPM << " needs to be MAN_OFFLINE." << endl;
-                    break;
-                }
-            }
-            catch (exception& ex)
-            {}
-
-            DBRootConfigList dbrootlist;
-
-            boost::char_separator<char> sep(", ");
-            boost::tokenizer< boost::char_separator<char> > tokens(dbrootIDs, sep);
-
-            for ( boost::tokenizer< boost::char_separator<char> >::iterator it = tokens.begin();
-                    it != tokens.end();
-                    ++it)
-            {
-                dbrootlist.push_back(atoi((*it).c_str()));
-            }
-
-            cout << endl;
-
-            //get dbroots ids for reside PM
-            try
-            {
-                oam.assignDbroot(toPM, dbrootlist);
-
-                cout << endl << "   Successfully Assigned DBRoots " << endl << endl;
-
-                try
-                {
-                    string DBRootStorageType;
-                    oam.getSystemConfig("DBRootStorageType", DBRootStorageType);
-
-                    if (DBRootStorageType == "external" )
-                    {
-                        string GlusterConfig = "n";
-                        string cloud = oam::UnassignedName;
-
-                        try
-                        {
-                            oam.getSystemConfig("Cloud", cloud);
-                            oam.getSystemConfig( "GlusterConfig", GlusterConfig);
-                        }
-                        catch (...)
-                        {}
-
-                        if ( GlusterConfig == "n" && cloud == oam::UnassignedName)
-                            cout << "   REMINDER: Update the /etc/fstab on " << toPM << " to include these dbroot mounts" << endl << endl;
-
-                        break;
-
-                    }
-                }
-                catch (...) {}
-
-            }
-            catch (exception& e)
-            {
-                cout << endl << "**** Failed Assign of DBRoots: " << e.what() << endl;
-                break;
-            }
-        }
-        break;
-
-        case 36: // getAlarmSummary
-        {
-            printAlarmSummary();
-        }
-        break;
-
-        case 37: // getSystemInfo
-        {
-            try
-            {
-                printSystemStatus();
-            }
-            catch (...)
-            {
-                break;
-            }
-
-            try
-            {
-                printProcessStatus();
-            }
-            catch (...)
-            {
-                break;
-            }
-
-            printAlarmSummary();
-        }
-        break;
-
-        case 38: // getModuleConfig
-        {
-            SystemModuleTypeConfig systemmoduletypeconfig;
-            ModuleTypeConfig moduletypeconfig;
-            ModuleConfig moduleconfig;
-            systemmoduletypeconfig.moduletypeconfig.clear();
-            string returnValue;
-            string Argument;
-
-            if (arguments[1] == "all" || arguments[1] == "")
-            {
-
-                // get and all display Module Name config parameters
-
-                try
-                {
-                    oam.getSystemConfig(systemmoduletypeconfig);
-
-                    cout << endl << "Module Name Configuration" << endl;
-
-                    for ( unsigned int i = 0 ; i < systemmoduletypeconfig.moduletypeconfig.size(); i++)
-                    {
-                        if ( systemmoduletypeconfig.moduletypeconfig[i].ModuleType.empty() )
-                            // end of list
-                            break;
-
-                        int moduleCount = systemmoduletypeconfig.moduletypeconfig[i].ModuleCount;
-
-                        if ( moduleCount == 0 )
-                            // skip if no modules
-                            continue;
-
-                        string moduletype = systemmoduletypeconfig.moduletypeconfig[i].ModuleType;
-
-                        DeviceNetworkList::iterator pt = systemmoduletypeconfig.moduletypeconfig[i].ModuleNetworkList.begin();
-
-                        for ( ; pt != systemmoduletypeconfig.moduletypeconfig[i].ModuleNetworkList.end() ; pt++)
-                        {
-                            string modulename = (*pt).DeviceName;
-                            string moduleID = modulename.substr(MAX_MODULE_TYPE_SIZE, MAX_MODULE_ID_SIZE);
-                            cout << endl << "Module '" << modulename	<< "' Configuration information" << endl << endl;
-
-                            cout << "ModuleType = " << moduletype << endl;
-                            cout << "ModuleDesc = " << systemmoduletypeconfig.moduletypeconfig[i].ModuleDesc << " #" << moduleID << endl;
-
-                            HostConfigList::iterator pt1 = (*pt).hostConfigList.begin();
-
-                            for ( ; pt1 != (*pt).hostConfigList.end() ; pt1++)
-                            {
-                                cout << "ModuleIPAdd NIC ID " + oam.itoa((*pt1).NicID) + " = " << (*pt1).IPAddr << endl;
-                                cout << "ModuleHostName NIC ID " + oam.itoa((*pt1).NicID) + " = " << (*pt1).HostName << endl;
-                            }
-
-                            DeviceDBRootList::iterator pt3 = systemmoduletypeconfig.moduletypeconfig[i].ModuleDBRootList.begin();
-
-                            for ( ; pt3 != systemmoduletypeconfig.moduletypeconfig[i].ModuleDBRootList.end() ; pt3++)
-                            {
-                                if ( (*pt3).DeviceID == atoi(moduleID.c_str()) )
-                                {
-                                    cout << "DBRootIDs assigned  = ";
-                                    DBRootConfigList::iterator pt2 = (*pt3).dbrootConfigList.begin();
-
-                                    for ( ; pt2 != (*pt3).dbrootConfigList.end() ;)
-                                    {
-                                        cout << oam.itoa(*pt2);
-                                        pt2++;
-
-                                        if (pt2 != (*pt3).dbrootConfigList.end() )
-                                            cout << ", ";
-                                    }
-
-                                    cout << endl;
-                                }
-                            }
-                        }
-                    }
-                }
-                catch (exception& e)
-                {
-                    cout << endl << "**** getModuleConfig Failed =  " << e.what() << endl;
-                }
-            }
-            else
-            {
-                // get a single module name info
-                if (arguments[2] == "")
-                {
-                    try
-                    {
-                        oam.getSystemConfig(arguments[1], moduleconfig);
-
-                        cout << endl << "Module Name Configuration for " << arguments[1] << endl << endl;
-
-                        cout << "ModuleType = " << moduleconfig.ModuleType << endl;
-                        cout << "ModuleDesc = " << moduleconfig.ModuleDesc << endl;
-                        HostConfigList::iterator pt1 = moduleconfig.hostConfigList.begin();
-
-                        for ( ; pt1 != moduleconfig.hostConfigList.end() ; pt1++)
-                        {
-                            cout << "ModuleIPAdd NIC ID " + oam.itoa((*pt1).NicID) + " = " << (*pt1).IPAddr << endl;
-                            cout << "ModuleHostName NIC ID " + oam.itoa((*pt1).NicID) + " = " << (*pt1).HostName << endl;
-                        }
-
-                        if ( moduleconfig.ModuleType == "pm" )
-                        {
-
-                            cout << "DBRootIDs assigned  = ";
-
-                            DBRootConfigList::iterator pt2 = moduleconfig.dbrootConfigList.begin();
-
-                            for ( ; pt2 != moduleconfig.dbrootConfigList.end() ; )
-                            {
-                                cout << oam.itoa(*pt2);
-                                pt2++;
-
-                                if (pt2 != moduleconfig.dbrootConfigList.end())
-                                    cout << ", ";
-                            }
-
-                            cout << endl << endl;
-                        }
-                    }
-                    catch (exception& e)
-                    {
-                        cout << endl << "**** getModuleConfig Failed =  " << e.what() << endl;
-                    }
-                }
-                else
-                {
-                    // get a parameter for a module
-                    // get module ID from module name entered, then get parameter
-                    oam.getSystemConfig(systemmoduletypeconfig);
-
-                    cout << endl;
-                    bool found = false;
-
-                    for ( unsigned int i = 0 ; i < systemmoduletypeconfig.moduletypeconfig.size(); i++)
-                    {
-                        string moduleType = arguments[1].substr(0, MAX_MODULE_TYPE_SIZE);
-                        string moduleID = arguments[1].substr(MAX_MODULE_TYPE_SIZE, MAX_MODULE_ID_SIZE);
-
-                        int moduleCount = systemmoduletypeconfig.moduletypeconfig[i].ModuleCount;
-
-                        if ( moduleCount == 0 )
-                            // skip if no modules
-                            continue;
-
-                        if (systemmoduletypeconfig.moduletypeconfig[i].ModuleType == moduleType )
-                        {
-                            DeviceNetworkList::iterator pt = systemmoduletypeconfig.moduletypeconfig[i].ModuleNetworkList.begin();
-
-                            for ( ; pt != systemmoduletypeconfig.moduletypeconfig[i].ModuleNetworkList.end() ; pt++)
-                            {
-                                if ( (*pt).DeviceName != arguments[1] )
-                                    continue;
-
-                                found = true;
-
-                                if ( arguments[2] == "ModuleIPAdd" || arguments[2] == "ModuleHostName")
-                                {
-                                    HostConfigList::iterator pt1 = (*pt).hostConfigList.begin();
-
-                                    for ( ; pt1 != (*pt).hostConfigList.end() ; pt1++)
-                                    {
-                                        if ( arguments[2] == "ModuleIPAdd" )
-                                            cout << "ModuleIPAdd NIC ID " + oam.itoa((*pt1).NicID) + " = " << (*pt1).IPAddr << endl;
-                                        else
-                                            cout << "ModuleHostName NIC ID " + oam.itoa((*pt1).NicID) + " = " << (*pt1).HostName << endl;
-                                    }
-                                }
-                                else
-                                {
-                                    Argument = arguments[2] + oam.itoa(i + 1);
-
-                                    try
-                                    {
-                                        oam.getSystemConfig(Argument, returnValue);
-                                        cout << endl << "   " << arguments[2] << " = " << returnValue << endl << endl;
-                                        break;
-                                    }
-                                    catch (exception& e)
-                                    {
-                                        cout << endl << "**** getModuleConfig Failed =  " << e.what() << endl;
-                                        break;
-                                    }
-                                }
-                            }
-                        }
-                    }
-
-                    if ( !found )
-                    {
-                        // module name not found
-                        cout << endl << "**** getModuleConfig Failed : Invalid Module Name" << endl;
-                        break;
-                    }
-
-                    cout << endl;
-                }
-            }
-        }
-        break;
-
-        case 39:
-        {
-        }
-        break;
-
-        case 40:
-        {
-        }
-        break;
-
-        case 41:
-        {
-        }
-        break;
-
-        case 42:
-        {
-        }
-        break;
-
-        case 43: // assignElasticIPAddress
-        {
-            //get cloud configuration data
-            string cloud = oam::UnassignedName;
-
-            try
-            {
-                oam.getSystemConfig("Cloud", cloud);
-            }
-            catch (...) {}
-
-            if ( cloud == oam::UnassignedName )
-            {
-                cout << endl << "**** assignElasticIPAddress Not Supported : For Amazon Systems only" << endl;
-                break;
-            }
-
-            if (arguments[2] == "")
-            {
-                // need 2 arguments
-                cout << endl << "**** assignElasticIPAddress Failed : Missing a required Parameter, enter 'help' for additional information" << endl;
-                break;
-            }
-
-            parentOAMModule = getParentOAMModule();
-
-            if ( localModule != parentOAMModule )
-            {
-                // exit out since not on Parent OAM Module
-                cout << endl << "**** assignElasticIPAddress Failed : only should be run on the Parent OAM Module, which is '" << parentOAMModule << "'" << endl;
-                break;
-            }
-
-            string IPaddress = arguments[1];
-            string moduleName = arguments[2];
-
-            if ( oam.validateModule(moduleName) != API_SUCCESS)
-            {
-                cout << endl << "**** assignElasticIPAddress Failed : Invalid Module name" << endl;
-                break;
-            }
-
-            if ( moduleName == localModule )
-            {
-                if ( arguments[3] != "y")
-                {
-                    string warning = "Warning: Assigning Elastic IP Address to local module will lock up this terminal session.";
-
-                    // confirm request
-                    if (confirmPrompt(warning))
-                        break;
-                }
-            }
-
-            //check and add Elastic IP Address
-            int AmazonElasticIPCount = 0;
-
-            try
-            {
-                oam.getSystemConfig("AmazonElasticIPCount", AmazonElasticIPCount);
-            }
-            catch (...)
-            {
-                AmazonElasticIPCount = 0;
-            }
-
-            bool found = false;
-            int id = 1;
-
-            for (  ; id < AmazonElasticIPCount + 1 ; id++ )
-            {
-                string AmazonElasticModule = "AmazonElasticModule" + oam.itoa(id);
-                string ELmoduleName;
-                string AmazonElasticIPAddr = "AmazonElasticIPAddr" + oam.itoa(id);
-                string ELIPaddress;
-
-                try
-                {
-                    oam.getSystemConfig(AmazonElasticModule, ELmoduleName);
-                    oam.getSystemConfig(AmazonElasticIPAddr, ELIPaddress);
-                }
-                catch (...) {}
-
-                if ( ELmoduleName == moduleName &&
-                        ELIPaddress == IPaddress)
-                {
-                    //assign again incase it got unconnected
-                    //get instance id
-                    string instanceName = oam::UnassignedName;
-
-                    try
-                    {
-                        ModuleConfig moduleconfig;
-                        oam.getSystemConfig(moduleName, moduleconfig);
-                        HostConfigList::iterator pt1 = moduleconfig.hostConfigList.begin();
-                        instanceName = (*pt1).HostName;
-                    }
-                    catch (...)
-                    {}
-
-                    try
-                    {
-                        oam.assignElasticIP(instanceName, IPaddress);
-                        cout << endl << "   Successfully completed Assigning Elastic IP Address " << endl << endl;
-                    }
-                    catch (...) {}
-
-                    found = true;
-                    break;
-                }
-
-                if ( ELmoduleName == moduleName )
-                {
-                    cout << endl << "**** assignElasticIPAddress Failed : module already assigned IP Address " << ELIPaddress << endl;
-                    found = true;
-                    break;
-                }
-
-                if ( ELIPaddress == IPaddress )
-                {
-                    cout << endl << "**** assignElasticIPAddress Failed : IP Address already assigned to module " << ELmoduleName << endl;
-                    found = true;
-                    break;
-                }
-            }
-
-            if (found)
-                break;
-
-            AmazonElasticIPCount++;
-
-            //get instance id
-            string instanceName = oam::UnassignedName;
-
-            try
-            {
-                ModuleConfig moduleconfig;
-                oam.getSystemConfig(moduleName, moduleconfig);
-                HostConfigList::iterator pt1 = moduleconfig.hostConfigList.begin();
-                instanceName = (*pt1).HostName;
-            }
-            catch (...)
-            {}
-
-            try
-            {
-                oam.assignElasticIP(instanceName, IPaddress);
-            }
-            catch (...)
-            {
-                cout << endl << "**** assignElasticIPAddress Failed : assignElasticIP API Error" << endl;
-                break;
-            }
-
-            //add to configuration
-            string AmazonElasticModule = "AmazonElasticModule" + oam.itoa(id);
-            string AmazonElasticIPAddr = "AmazonElasticIPAddr" + oam.itoa(id);
-
-            Config* sysConfig = Config::makeConfig();
-
-            try
-            {
-                sysConfig->setConfig("Installation", "AmazonElasticIPCount", oam.itoa(AmazonElasticIPCount));
-                sysConfig->setConfig("Installation", AmazonElasticModule, moduleName);
-                sysConfig->setConfig("Installation", AmazonElasticIPAddr, IPaddress);
-                sysConfig->write();
-            }
-            catch (...)
-            {
-                cout << "ERROR: Problem setting AmazonElasticModule in the Calpont System Configuration file" << endl;
-                break;
-            }
-
-            cout << endl << "   Successfully completed Assigning Elastic IP Address " << endl << endl;
-        }
-        break;
-
-        case 44: // unassignElasticIPAddress
-        {
-            //get cloud configuration data
-            string cloud = oam::UnassignedName;
-
-            try
-            {
-                oam.getSystemConfig("Cloud", cloud);
-            }
-            catch (...) {}
-
-            if ( cloud == oam::UnassignedName )
-            {
-                cout << endl << "**** unassignElasticIPAddress Not Supported : For Amazon Systems only" << endl;
-                break;
-            }
-
-            if (arguments[1] == "")
-            {
-                // need 2 arguments
-                cout << endl << "**** unassignElasticIPAddress Failed : Missing a required Parameter, enter 'help' for additional information" << endl;
-                break;
-            }
-
-            parentOAMModule = getParentOAMModule();
-
-            if ( localModule != parentOAMModule )
-            {
-                // exit out since not on Parent OAM Module
-                cout << endl << "**** unassignElasticIPAddress Failed : only should be run on the Parent OAM Module, which is '" << parentOAMModule << "'" << endl;
-                break;
-            }
-
-            string IPaddress = arguments[1];
-
-            //check and add Elastic IP Address
-            int AmazonElasticIPCount = 0;
-
-            try
-            {
-                oam.getSystemConfig("AmazonElasticIPCount", AmazonElasticIPCount);
-            }
-            catch (...)
-            {
-                AmazonElasticIPCount = 0;
-            }
-
-            bool found = false;
-            int id = 1;
-
-            for (  ; id < AmazonElasticIPCount + 1 ; id++ )
-            {
-                string AmazonElasticModule = "AmazonElasticModule" + oam.itoa(id);
-                string ELmoduleName;
-                string AmazonElasticIPAddr = "AmazonElasticIPAddr" + oam.itoa(id);
-                string ELIPaddress;
-
-                try
-                {
-                    oam.getSystemConfig(AmazonElasticIPAddr, ELmoduleName);
-                    oam.getSystemConfig(AmazonElasticIPAddr, ELIPaddress);
-                }
-                catch (...) {}
-
-                if ( ELIPaddress == IPaddress )
-                {
-                    found = true;
-
-                    try
-                    {
-                        oam.deassignElasticIP(IPaddress);
-                    }
-                    catch (...)
-                    {
-                        cout << endl << "**** deassignElasticIPAddress Failed : deassignElasticIP API Error";
-                        break;
-                    }
-
-                    int oldAmazonElasticIPCount = AmazonElasticIPCount;
-
-                    Config* sysConfig = Config::makeConfig();
-
-                    //move up any others
-                    if ( oldAmazonElasticIPCount > id )
-                    {
-                        for ( int newid = id + 1 ; newid < oldAmazonElasticIPCount + 1 ; newid++ )
-                        {
-                            AmazonElasticModule = "AmazonElasticModule" + oam.itoa(newid);
-                            AmazonElasticIPAddr = "AmazonElasticIPAddr" + oam.itoa(newid);
-
-                            try
-                            {
-                                oam.getSystemConfig(AmazonElasticModule, ELmoduleName);
-                                oam.getSystemConfig(AmazonElasticIPAddr, ELIPaddress);
-                            }
-                            catch (...) {}
-
-                            AmazonElasticModule = "AmazonElasticModule" + oam.itoa(newid - 1);
-                            AmazonElasticIPAddr = "AmazonElasticIPAddr" + oam.itoa(newid - 1);
-
-                            try
-                            {
-                                oam.setSystemConfig(AmazonElasticModule, ELmoduleName);
-                                oam.setSystemConfig(AmazonElasticIPAddr, ELIPaddress);
-                            }
-                            catch (...) {}
-                        }
-                    }
-
-                    AmazonElasticModule = "AmazonElasticModule" + oam.itoa(oldAmazonElasticIPCount);
-                    AmazonElasticIPAddr = "AmazonElasticIPAddr" + oam.itoa(oldAmazonElasticIPCount);
-
-                    //delete last entry and update count
-                    AmazonElasticIPCount--;
-
-                    try
-                    {
-                        sysConfig->setConfig("Installation", "AmazonElasticIPCount", oam.itoa(AmazonElasticIPCount));
-                        sysConfig->delConfig("Installation", AmazonElasticModule);
-                        sysConfig->delConfig("Installation", AmazonElasticIPAddr);
-                        sysConfig->write();
-                    }
-                    catch (...)
-                    {
-                        cout << "ERROR: Problem setting AmazonElasticModule in the Calpont System Configuration file" << endl;
-                        break;
-                    }
-                }
-            }
-
-            if (!found)
-            {
-                cout << endl << "   Elastic IP Address " << IPaddress << " not assigned to a module" << endl << endl;
-                break;
-            }
-
-            cout << endl << "   Successfully completed Unassigning Elastic IP Address " << endl << endl;
-
-        }
-        break;
-
-        case 45: // getSystemNetworkConfig
-        {
-            // get and display Module Network Config
-            SystemModuleTypeConfig systemmoduletypeconfig;
-            systemmoduletypeconfig.moduletypeconfig.clear();
-
-            //check and add Elastic IP Address
-            int AmazonElasticIPCount = 0;
-
-            try
-            {
-                oam.getSystemConfig("AmazonElasticIPCount", AmazonElasticIPCount);
-            }
-            catch (...)
-            {
-                AmazonElasticIPCount = 0;
-            }
-
-            // get max length of a host name for header formatting
-
-            int maxSize = 9;
-
-            try
-            {
-                oam.getSystemConfig(systemmoduletypeconfig);
-
-                for ( unsigned int i = 0 ; i < systemmoduletypeconfig.moduletypeconfig.size(); i++)
-                {
-                    if ( systemmoduletypeconfig.moduletypeconfig[i].ModuleType.empty() )
-                        // end of list
-                        break;
-
-                    int moduleCount = systemmoduletypeconfig.moduletypeconfig[i].ModuleCount;
-                    string moduletype = systemmoduletypeconfig.moduletypeconfig[i].ModuleType;
-                    string moduletypedesc = systemmoduletypeconfig.moduletypeconfig[i].ModuleDesc;
-
-                    if ( moduleCount > 0 )
-                    {
-                        DeviceNetworkList::iterator pt = systemmoduletypeconfig.moduletypeconfig[i].ModuleNetworkList.begin();
-
-                        for ( ; pt != systemmoduletypeconfig.moduletypeconfig[i].ModuleNetworkList.end() ; pt++)
-                        {
-                            HostConfigList::iterator pt1 = (*pt).hostConfigList.begin();
-
-                            for ( ; pt1 != (*pt).hostConfigList.end() ; pt1++)
-                            {
-                                if ( maxSize < (int) (*pt1).HostName.size() )
-                                    maxSize = (*pt1).HostName.size();
-                            }
-                        }
-                    }
-                }
-            }
-            catch (exception& e)
-            {
-                cout << endl << "**** getSystemNetworkConfig Failed =  " << e.what() << endl;
-            }
-
-            cout << endl << "System Network Configuration" << endl << endl;
-
-            cout.setf(ios::left);
-            cout.width(15);
-            cout << "Module Name";
-            cout.width(30);
-            cout << "Module Description";
-            cout.width(10);
-            cout << "NIC ID";
-            cout.width(maxSize + 5);
-            cout << "Host Name";
-            cout.width(20);
-            cout << "IP Address";
-            cout.width(14);
-            cout << "Status";
-
-            if ( AmazonElasticIPCount > 0 )
-            {
-                cout.width(20);
-                cout << "Elastic IP Address";
-            }
-
-            cout << endl;
-            cout.width(15);
-            cout << "-----------";
-            cout.width(30);
-            cout << "-------------------------";
-            cout.width(10);
-            cout << "------";
-
-            for ( int i = 0 ; i < maxSize ; i++ )
-            {
-                cout << "-";
-            }
-
-            cout << "     ";
-            cout.width(20);
-            cout << "---------------";
-            cout.width(14);
-            cout << "------------";
-
-            if ( AmazonElasticIPCount > 0 )
-            {
-                cout.width(20);
-                cout << "------------------";
-            }
-
-            cout << endl;
-
-            try
-            {
-                oam.getSystemConfig(systemmoduletypeconfig);
-
-                for ( unsigned int i = 0 ; i < systemmoduletypeconfig.moduletypeconfig.size(); i++)
-                {
-                    if ( systemmoduletypeconfig.moduletypeconfig[i].ModuleType.empty() )
-                        // end of list
-                        break;
-
-                    int moduleCount = systemmoduletypeconfig.moduletypeconfig[i].ModuleCount;
-                    string moduletype = systemmoduletypeconfig.moduletypeconfig[i].ModuleType;
-                    string moduletypedesc = systemmoduletypeconfig.moduletypeconfig[i].ModuleDesc;
-
-                    if ( moduleCount > 0 )
-                    {
-                        DeviceNetworkList::iterator pt = systemmoduletypeconfig.moduletypeconfig[i].ModuleNetworkList.begin();
-
-                        for ( ; pt != systemmoduletypeconfig.moduletypeconfig[i].ModuleNetworkList.end() ; pt++)
-                        {
-                            string modulename = (*pt).DeviceName;
-                            string moduleID = modulename.substr(MAX_MODULE_TYPE_SIZE, MAX_MODULE_ID_SIZE);
-                            string modulenamedesc = moduletypedesc + " #" + moduleID;
-
-                            cout.setf(ios::left);
-                            cout.width(15);
-                            cout << modulename;
-                            cout.width(33);
-                            cout << modulenamedesc;
-
-                            HostConfigList::iterator pt1 = (*pt).hostConfigList.begin();
-
-                            for ( ; pt1 != (*pt).hostConfigList.end() ; pt1++)
-                            {
-                                string ipAddr = (*pt1).IPAddr;
-                                string hostname = (*pt1).HostName;
-                                string nicID = oam.itoa((*pt1).NicID);
-                                int state;
-
-                                if ( nicID != "1" )
-                                {
-                                    cout.width(48);
-                                    cout << " ";
-                                }
-
-                                cout.width(7);
-                                cout << nicID;
-                                cout.width(maxSize + 5);
-                                cout << hostname;
-                                cout.width(20);
-                                cout << ipAddr;
-                                cout.width(14);
-
-                                try
-                                {
-                                    oam.getNICStatus(hostname, state);
-
-                                    printState(state, " ");
-                                }
-                                catch (exception& e)
-                                {
-                                    cout << INITIALSTATE;
-                                }
-
-                                if ( nicID == "1" && AmazonElasticIPCount > 0 )
-                                {
-                                    int id = 1;
-
-                                    for (  ; id < AmazonElasticIPCount + 1 ; id++ )
-                                    {
-                                        string AmazonElasticModule = "AmazonElasticModule" + oam.itoa(id);
-                                        string ELmoduleName;
-                                        string AmazonElasticIPAddr = "AmazonElasticIPAddr" + oam.itoa(id);
-                                        string ELIPaddress;
-
-                                        try
-                                        {
-                                            oam.getSystemConfig(AmazonElasticModule, ELmoduleName);
-                                            oam.getSystemConfig(AmazonElasticIPAddr, ELIPaddress);
-                                        }
-                                        catch (...) {}
-
-                                        if ( modulename == ELmoduleName )
-                                        {
-                                            cout.width(20);
-                                            cout << ELIPaddress;
-                                            break;
-                                        }
-                                    }
-                                }
-
-                                cout << endl;
-                            }
-                        }
-                    }
-                }
-            }
-            catch (exception& e)
-            {
-                cout << endl << "**** getSystemNetworkConfig Failed =  " << e.what() << endl;
-            }
-
-            //get cloud configuration data
-            string cloud = oam::UnassignedName;
-
-            try
-            {
-                oam.getSystemConfig("Cloud", cloud);
-            }
-            catch (...) {}
-
-            if ( cloud == "amazon-ec2" ||  cloud == "amazon-vpc" )
-            {
-                cout << endl << "Amazon Instance Configuration" << endl << endl;
-
-                string PMInstanceType = oam::UnassignedName;
-                string UMInstanceType = oam::UnassignedName;
-
-                try
-                {
-                    oam.getSystemConfig("PMInstanceType", PMInstanceType);
-                    oam.getSystemConfig("UMInstanceType", UMInstanceType);
-
-                    cout << "PMInstanceType = " << PMInstanceType << endl;
-                    cout << "UMInstanceType = " << UMInstanceType << endl;
-                }
-                catch (...) {}
-
-                if ( cloud == "amazon-vpc" )
-                {
-                    string AmazonSubNetID = oam::UnassignedName;
-
-                    try
-                    {
-                        oam.getSystemConfig("AmazonSubNetID", AmazonSubNetID);
-
-                        cout << "AmazonSubNetID = " << AmazonSubNetID << endl;
-                    }
-                    catch (...) {}
-                }
-            }
-
-            cout << endl;
-
-            // get and all display Ext Devices Name config parameters
-
-            try
-            {
-                SystemExtDeviceConfig systemextdeviceconfig;
-                oam.getSystemConfig(systemextdeviceconfig);
-
-                if ( systemextdeviceconfig.Count == 0 )
-                    break;
-
-                cout << endl << "External Device Configuration" << endl << endl;
-
-                cout.setf(ios::left);
-                cout.width(30);
-                cout << "Device Name";
-                cout.width(20);
-                cout << "IP Address";
-                cout.width(10);
-                cout << "Status";
-                cout << endl;
-                cout.width(30);
-                cout << "---------------------";
-                cout.width(20);
-                cout << "---------------";
-                cout.width(12);
-                cout << "------------";
-                cout << endl;
-
-                for ( unsigned int i = 0 ; i < systemextdeviceconfig.Count ; i++ )
-                {
-                    cout.setf(ios::left);
-                    cout.width(30);
-                    cout << systemextdeviceconfig.extdeviceconfig[i].Name;
-                    cout.width(20);
-                    cout << systemextdeviceconfig.extdeviceconfig[i].IPAddr;
-                    cout.width(12);
-
-                    int state;
-
-                    try
-                    {
-                        oam.getExtDeviceStatus(systemextdeviceconfig.extdeviceconfig[i].Name, state);
-
-                        printState(state, " ");
-                    }
-                    catch (exception& e)
-                    {
-                        cout << INITIALSTATE;
-                    }
-
-                    cout << endl;
-                }
-
-                cout << endl;
-            }
-            catch (exception& e)
-            {
-                cout << endl << "**** getextdeviceconfig Failed =  " << e.what() << endl;
-            }
-
-            cout << endl;
-
-            break;
-        }
-
-        case 46: // enableMySQLReplication
-        {
-            string MySQLRep;
-
-            try
-            {
-                oam.getSystemConfig("MySQLRep", MySQLRep);
-            }
-            catch (...) {}
-
-            if ( MySQLRep == "y" )
-            {
-                string warning = "MySQL Replication Feature is already enabled";
-
-                // confirm request
-                if (confirmPrompt(warning))
-                    break;
-            }
-
-            string password;
-
-            if ( arguments[1] == "")
-            {
-                cout << endl;
-                string prompt = "Enter the 'User' Password or 'ssh' if configured with ssh-keys";
-                password = dataPrompt(prompt);
-            }
-            else
-                password = arguments[1];
-
-            if ( password == "")
-                password = oam::UnassignedName;
-
-            string MySQLPasswordConfig;
-
-            try
-            {
-                oam.getSystemConfig("MySQLPasswordConfig", MySQLPasswordConfig);
-            }
-            catch (...) {}
-
-            if ( MySQLPasswordConfig == oam::UnassignedName )
-            {
-                cout << endl;
-                string prompt = "Is there a 'MySQL' Password configured on the MySQL Front-end Modules in " + HOME + "/.my.cnf (y,n): ";
-                MySQLPasswordConfig = dataPrompt(prompt);
-            }
-
-            if ( MySQLPasswordConfig != "y" )
-                MySQLPasswordConfig = "n";
-
-            try
-            {
-                oam.setSystemConfig("MySQLPasswordConfig", MySQLPasswordConfig);
-            }
-            catch (...) {}
-
-            //set flag
-            try
-            {
-                oam.setSystemConfig("MySQLRep", "y");
-                sleep(2);
-            }
-            catch (...) {}
-
-            try
-            {
-                oam.enableMySQLRep(password);
-                cout << endl << "   Successful Enabling of MySQL Replication " << endl << endl;
-
-                //display Primary UM Module / Master Node
-                string PrimaryUMModuleName;
-
-                try
-                {
-                    oam.getSystemConfig("PrimaryUMModuleName", PrimaryUMModuleName);
-                }
-                catch (...) {}
-
-                cout << "   MySQL Replication Master Node is " << PrimaryUMModuleName << endl << endl;
-            }
-            catch (exception& e)
-            {
-                cout << endl << "**** enableMySQLRep Failed :  " << e.what() << endl;
-            }
-
-            break;
-        }
-
-        case 47: // getCalpontSoftwareInfo
-        {
-            cout << endl;
-
-            if ( rootUser)
-            {
-                system("rpm -qi infinidb-platform > /tmp/calpont.txt 2>&1");
-
-                if (oam.checkLogStatus("/tmp/calpont.txt", "Name"))
-                    system("cat /tmp/calpont.txt");
-                else
-                {
-                    system("dpkg -s calpont > /tmp/calpont.txt 2>&1");
-
-                    if (oam.checkLogStatus("/tmp/calpont.txt", "Status: install"))
-                        system("cat /tmp/calpont.txt");
-                    else
-                    {
-                        cout << "SoftwareVersion = " << columnstore_version << endl;
-                        cout << "SoftwareRelease = " << columnstore_release << endl;
-                    }
-                }
-            }
-            else
-            {
-                cout << "SoftwareVersion = " << columnstore_version << endl;
-                cout << "SoftwareRelease = " << columnstore_release << endl;
-            }
-
-            cout << endl;
-            break;
-        }
-
-        case 48: // addModule - parameters: Module type/Module Name, Number of Modules, Server Hostnames,
-            // Server root password optional
-        {
-            if (arguments[1] == "")
-            {
-                // need at least  arguments
-                cout << endl << "**** addModule Failed : Missing a required Parameter, enter 'help' for additional information" << endl;
-                break;
-            }
-
-            switch ( serverInstallType )
-            {
-                case (oam::INSTALL_COMBINE_DM_UM_PM):
-                {
-                    if (arguments[1].find("um") != string::npos )
-                    {
-                        cout << endl << "**** addModule Failed : User Module Types not supported on this Combined Server Installation" << endl;
-                        return (0);
-                    }
-
-                    break;
-                }
-            }
-
-            string GlusterConfig = "n";
-            int GlusterCopies;
-            string cloud = oam::UnassignedName;
-            string GlusterStorageType;
-            string AmazonVPCNextPrivateIP;
-
-            try
-            {
-                oam.getSystemConfig("Cloud", cloud);
-                oam.getSystemConfig("AmazonVPCNextPrivateIP", AmazonVPCNextPrivateIP);
-                oam.getSystemConfig("GlusterConfig", GlusterConfig);
-                oam.getSystemConfig("GlusterCopies", GlusterCopies);
-                oam.getSystemConfig("GlusterStorageType", GlusterStorageType);
-            }
-            catch (...) {}
-
-            ModuleTypeConfig moduletypeconfig;
-            DeviceNetworkConfig devicenetworkconfig;
-            DeviceNetworkList devicenetworklist;
-            DeviceNetworkList enabledevicenetworklist;
-            HostConfig hostconfig;
-
-            string moduleType;
-            string moduleName;
-            int moduleCount;
-            string password;
-            typedef std::vector<string> inputNames;
-            inputNames inputnames;
-            typedef std::vector<string> umStorageNames;
-            umStorageNames umstoragenames;
-            int hostArg;
-            int dbrootPerPM = 0;
-
-            //check if module type or module name was entered
-            if ( arguments[1].size() == 2 )
-            {
-                //Module Type was entered
-                if (arguments[3] == "" && cloud == oam::UnassignedName)
-                {
-                    // need at least  arguments
-                    cout << endl << "**** addModule Failed : Missing a required Parameter, enter 'help' for additional information" << endl;
-                    break;
-                }
-
-                //Module Type was entered
-                moduleType = arguments[1];
-                moduleCount = atoi(arguments[2].c_str());
-                hostArg = 3;
-
-                if (arguments[4] != "")
-                    password = arguments[4];
-                else
-                {
-                    cout << endl;
-                    string prompt = "Enter the 'User' Password or 'ssh' if configured with ssh-keys";
-                    password = dataPrompt(prompt);
-                }
-
-                if (arguments[5] != "")
-                    dbrootPerPM = atoi(arguments[5].c_str());
-            }
-            else
-            {
-                //Module Name was entered
-                if (arguments[2] == "" && cloud == oam::UnassignedName)
-                {
-                    // need at least  arguments
-                    cout << endl << "**** addModule Failed : Missing a required Parameter, enter 'help' for additional information" << endl;
-                    break;
-                }
-
-                moduleName = arguments[1];
-                moduleType = arguments[1].substr(0, MAX_MODULE_TYPE_SIZE);
-                moduleCount = 1;
-                hostArg = 2;
-
-                if (arguments[3] != "")
-                    password = arguments[3];
-                else
-                {
-                    cout << endl;
-                    string prompt = "Enter the 'User' Password or 'ssh' if configured with ssh-keys";
-                    password = dataPrompt(prompt);
-                }
-
-                if (arguments[4] != "")
-                    dbrootPerPM = atoi(arguments[4].c_str());
-            }
-
-//do we needed this check????
-            if ( moduleCount < 1 || moduleCount > 10  )
-            {
-                cout << endl << "**** addModule Failed : Failed to Add Module, invalid number-of-modules entered (1-10)" << endl;
-                break;
-            }
-
-            if ( GlusterConfig == "y" && moduleType == "pm" )
-            {
-                if ( localModule != parentOAMModule )
-                {
-                    // exit out since not on active module
-                    cout << endl << "**** addModule Failed : Can only run command on Active OAM Parent Module (" << parentOAMModule << ")." << endl;
-                    break;
-                }
-
-                if ( fmod((float) moduleCount, (float) GlusterCopies) != 0 )
-                {
-                    cout << endl << "**** addModule Failed : Failed to Add Module, invalid number-of-modules: must be multiple of Data Redundancy Copies, which is " << GlusterCopies << endl;
-                    break;
-                }
-            }
-
-            //check and parse input Hostname/VPC-IP Addresses
-            if (arguments[hostArg] != "")
-            {
-                boost::char_separator<char> sep(", ");
-                boost::tokenizer< boost::char_separator<char> > tokens(arguments[hostArg], sep);
-
-                for ( boost::tokenizer< boost::char_separator<char> >::iterator it = tokens.begin();
-                        it != tokens.end();
-                        ++it)
-                {
-                    inputnames.push_back(*it);
-                }
-            }
-
-            if ( inputnames.size() < (unsigned) moduleCount )
-            {
-                if ( cloud == oam::UnassignedName )
-                {
-                    cout << endl << "**** addModule Failed : Failed to Add Module, number of hostnames is less than Module Count" << endl;
-                    break;
-                }
-                else
-                {
-                    if ( cloud == "amazon-ec2" )
-                    {
-                        cout << endl << "Launching new Instance(s)" << endl;
-
-                        for ( int id = inputnames.size() ; id < moduleCount ; id++ )
-                        {
-                            inputnames.push_back(oam::UnassignedName);
-                        }
-                    }
-                    else
-                    {
-                        // amazon-vpc
-                        if ( inputnames.size() == 0 )
-                        {
-                            if ( AmazonVPCNextPrivateIP == oam::UnassignedName)
-                            {
-                                cout << endl << "**** addModule Failed : Failed to Add Module, enter VPC Private IP Address" << endl;
-                                break;
-                            }
-                            else
-                            {
-                                if ( AmazonVPCNextPrivateIP == "autoassign")
-                                {
-                                    for ( int id = inputnames.size() ; id < moduleCount ; id++ )
-                                    {
-                                        inputnames.push_back("autoassign");
-                                    }
-                                }
-                                else
-                                {
-                                    for ( int id = inputnames.size() ; id < moduleCount ; id++ )
-                                    {
-                                        inputnames.push_back(AmazonVPCNextPrivateIP);
-
-                                        try
-                                        {
-                                            AmazonVPCNextPrivateIP = oam.incrementIPAddress(AmazonVPCNextPrivateIP);
-                                        }
-                                        catch (...)
-                                        {
-                                            cout << endl << "ERROR: incrementIPAddress API error, check logs" << endl;
-                                            exit(1);
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-
-            //get configured moduleNames
-            try
-            {
-                oam.getSystemConfig(moduleType, moduletypeconfig);
-            }
-            catch (...)
-            {
-                cout << endl << "**** addModule Failed : Failed to Add Module, getSystemConfig API Failed" << endl;
-                break;
-            }
-
-            //get module names already in-use and Number of NIC IDs for module
-            typedef std::vector<string>	moduleNameList;
-            moduleNameList modulenamelist;
-            int nicNumber = 1;
-
-            DeviceNetworkList::iterator pt = moduletypeconfig.ModuleNetworkList.begin();
-
-            for ( ; pt != moduletypeconfig.ModuleNetworkList.end() ; pt++)
-            {
-                modulenamelist.push_back((*pt).DeviceName);
-                HostConfigList::iterator pt1 = (*pt).hostConfigList.begin();
-
-                for ( ; pt1 != (*pt).hostConfigList.end() ; pt1++)
-                {
-                    if ( (*pt1).HostName != oam::UnassignedName )
-                    {
-                        if ( nicNumber < (*pt1).NicID )
-                            nicNumber = (*pt1).NicID;
-                    }
-                }
-            }
-
-            if ( ((unsigned) nicNumber * moduleCount) != inputnames.size() && cloud == oam::UnassignedName )
-            {
-                cout << endl << "**** addModule Failed : Failed to Add Module, invalid number of hostNames entered. Enter " + oam.itoa(nicNumber * moduleCount) +  " hostname(s), which is the number of NICs times the number of modules" << endl;
-                break;
-            }
-
-            int moduleID = 1;
-            inputNames::const_iterator listPT1 = inputnames.begin();
-            umStorageNames::const_iterator listPT2 = umstoragenames.begin();
-
-            for ( int i = 0 ; i < moduleCount ; i++ )
-            {
-                //validate or determine module name
-                moduleNameList::const_iterator listPT = modulenamelist.begin();
-
-                for ( ; listPT != modulenamelist.end() ; listPT++)
-                {
-                    if ( !moduleName.empty() )
-                    {
-                        //add by moduleName, validate that Entered module name doesn't exist
-                        if ( moduleName == (*listPT) )
-                        {
-                            cout << endl << "**** addModule Failed : Module Name already exist" << endl;
-                            return 1;
-                        }
-                    }
-                    else
-                    {
-                        //add by moduleType, get available module name
-                        string newModuleName = moduleType + oam.itoa(moduleID);
-
-                        if ( newModuleName == (*listPT) )
-                            moduleID++;
-                        else
-                        {
-                            moduleName = newModuleName;
-                            moduleID++;
-                            break;
-                        }
-                    }
-                }
-
-                if ( moduleName.empty() )
-                {
-                    moduleName = moduleType + oam.itoa(moduleID);
-                    moduleID++;
-                }
-
-                // store module name
-                devicenetworkconfig.DeviceName = moduleName;
-                enabledevicenetworklist.push_back(devicenetworkconfig);
-
-                for ( int j = 0 ; j < nicNumber ; j ++ )
-                {
-                    //get/check Server Hostnames IP address
-                    string hostName;
-                    string IPAddress;
-
-                    if ( cloud == "amazon-ec2")
-                    {
-                        hostName = *listPT1;
-
-                        if ( hostName != oam::UnassignedName )
-                        {
-                            IPAddress = oam.getEC2InstanceIpAddress(hostName);
-
-                            if (IPAddress == "stopped" || IPAddress == "terminated")
-                            {
-                                cout << "ERROR: Instance " + hostName + " not running, please start and retry" << endl << endl;
-                                return 1;
-                            }
-                        }
-                        else
-                            IPAddress = oam::UnassignedName;
-                    }
-                    else
-                    {
-                        if ( cloud == "amazon-vpc")
-                        {
-                            if ( *listPT1 != "autoassign" )
-                            {
-                                if ( oam.isValidIP(*listPT1) )
-                                {
-                                    //ip address entered
-                                    hostName = oam::UnassignedName;
-                                    IPAddress = *listPT1;
-                                }
-                                else
-                                {
-                                    //instance id entered
-                                    hostName = *listPT1;
-                                    IPAddress = oam.getEC2InstanceIpAddress(hostName);
-
-                                    if (IPAddress == "stopped" || IPAddress == "terminated")
-                                    {
-                                        cout << "ERROR: Instance " + hostName + " not running, please start and retry" << endl << endl;
-                                        return 1;
-                                    }
-                                }
-                            }
-                            else
-                            {
-                                hostName = oam::UnassignedName;
-                                IPAddress = "autoassign";
-                            }
-                        }
-                        else
-                        {
-                            // non-amazon
-                            hostName = *listPT1;
-                            IPAddress = oam.getIPAddress(hostName);
-
-                            if ( IPAddress.empty() )
-                            {
-                                // prompt for IP Address
-                                string prompt = "IP Address of " + hostName + " not found, enter IP Address or enter 'abort'";
-                                IPAddress = dataPrompt(prompt);
-
-                                if ( IPAddress == "abort" || !oam.isValidIP(IPAddress))
-                                    return 1;
-                            }
-                        }
-                    }
-
-                    hostconfig.IPAddr = IPAddress;
-                    hostconfig.HostName = hostName;
-                    hostconfig.NicID = j + 1;
-                    devicenetworkconfig.hostConfigList.push_back(hostconfig);
-                    listPT1++;
-                }
-
-                devicenetworklist.push_back(devicenetworkconfig);
-                devicenetworkconfig.hostConfigList.clear();
-                moduleName.clear();
-            }
-
-            DBRootConfigList dbrootlist;
-            int dbrootNumber = -1;
-            typedef std::vector<string>	storageDeviceList;
-            storageDeviceList storagedevicelist;
-            string deviceType;
-
-            if ( GlusterConfig == "y" && moduleType == "pm")
-            {
-                cout << endl << "System is configured with Data Redundancy, DBRoot Storage will" << endl;
-                cout << "will be created with the Modules during this command." << endl;
-                cout << "The Data Redundancy Packages should already be installed on the" << endl;
-                cout << "Servers being installed." << endl;
-                cout << "Also the Servers should have either a password-less ssh configured" << endl;
-                cout << "for the local server or setup for a login via password." << endl;
-                cout << "If its setup for login via password, then you will be required to" << endl;
-                cout << "enter the password when prompted. You will be prompted 2 * the" << endl;
-                cout << "number of modules being added." << endl;
-
-                // confirm request
-                if (confirmPrompt(" "))
-                    break;
-
-                if ( dbrootPerPM == 0)
-                {
-                    cout << endl;
-                    // prompt for number of DBRoot
-                    string prompt = "Number of DBRoots Per Performance Module you want to add";
-                    dbrootPerPM = atoi(dataPrompt(prompt).c_str());
-                }
-                else
-                    cout << endl << "Number of DBRoots Per Performance Module to be added is " << oam.itoa(dbrootPerPM) << endl;
-
-                dbrootNumber = dbrootPerPM * moduleCount;
-
-                if ( GlusterStorageType == "storage" )
-                {
-                    cout << endl << "Data Redundancy Storage Type is configured for 'storage'" << endl;
-
-                    cout << "You will need " << oam.itoa(dbrootNumber * GlusterCopies);
-                    cout << " total storage locations and " << oam.itoa(dbrootPerPM * GlusterCopies) << " storage locations per PM. You will now " << endl;
-                    cout << "be asked to enter the device names for the storage locations. You will enter " << endl;
-                    cout << "them for each PM, on one line, separated by spaces (" << oam.itoa(dbrootPerPM * GlusterCopies) << " names on each line)." << endl;
-
-                    DeviceNetworkList::iterator pt = devicenetworklist.begin();
-                    string firstPM = (*pt).DeviceName.substr(MAX_MODULE_TYPE_SIZE, MAX_MODULE_ID_SIZE);
-
-                    for ( ; pt != devicenetworklist.end() ; pt++)
-                    {
-                        cout << endl;
-                        string prompt = "Storage Device Names for " + (*pt).DeviceName;
-                        string devices = dataPrompt(prompt);
-                        storagedevicelist.push_back(devices);
-                    }
-
-                    cout << endl;
-                    string prompt = "Filesystem type for these storage locations (ext2,ext3,xfs,etc)";
-                    deviceType = dataPrompt(prompt);
-                }
-
-            }
-
-            string mysqlpassword = oam::UnassignedName;
-
-            try
-            {
-                cout << endl << "Adding Modules ";
-                DeviceNetworkList::iterator pt = devicenetworklist.begin();
-                string firstPM = (*pt).DeviceName.substr(MAX_MODULE_TYPE_SIZE, MAX_MODULE_ID_SIZE);
-
-                for ( ; pt != devicenetworklist.end() ; pt++)
-                {
-                    cout << (*pt).DeviceName << ", ";
-                }
-
-                cout << "please wait..." << endl;
-
-                oam.addModule(devicenetworklist, password, mysqlpassword);
-
-                cout << "Add Module(s) successfully completed" << endl;
-
-                if ( GlusterConfig == "y" && moduleType == "pm" )
-                {
-
-                    if ( GlusterStorageType == "storage" )
-                    {
-                        //send messages to update fstab to new modules, if needed
-                        DeviceNetworkList::iterator pt2 = devicenetworklist.begin();
-                        storageDeviceList::iterator pt3 = storagedevicelist.begin();
-
-                        for ( ; pt2 != devicenetworklist.end() ; pt2++, pt3++)
-                        {
-                            string moduleName = (*pt2).DeviceName;
-                            string devices = *pt3;
-                            int brinkID = 1;
-                            boost::char_separator<char> sep(" ");
-                            boost::tokenizer< boost::char_separator<char> > tokens(devices, sep);
-
-                            for ( boost::tokenizer< boost::char_separator<char> >::iterator it = tokens.begin();
-                                    it != tokens.end();
-                                    ++it)
-                            {
-                                string deviceName = *it;
-                                string entry = deviceName + " " + startup::StartUp::installDir() + "/gluster/brick" + oam.itoa(brinkID)  + " " + deviceType + " defaults 1 2";
-
-                                //send update pm
-                                oam.distributeFstabUpdates(entry, moduleName);
-                                brinkID++;
-                            }
-                        }
-                    }
-
-                    //enable modules
-                    try
-                    {
-                        cout << endl << "Enabling Modules " << endl;
-                        oam.enableModule(enabledevicenetworklist);
-                        cout << "Successful Enable of Modules " << endl;
-                    }
-                    catch (exception& e)
-                    {
-                        cout << endl << "**** enableModule Failed :  " << e.what() << endl;
-                        break;
-                    }
-
-                    cout << endl << "Adding DBRoots" << endl;
-
-                    //add dbroots
-                    string firstDBroot;
-
-                    try
-                    {
-                        oam.addDbroot(dbrootNumber, dbrootlist);
-
-                        cout << "New DBRoot IDs added = ";
-                        DBRootConfigList::iterator pt1 = dbrootlist.begin();
-                        firstDBroot = oam.itoa(*pt1);
-
-                        for ( ; pt1 != dbrootlist.end() ;)
-                        {
-                            cout << oam.itoa(*pt1);
-                            pt1++;
-
-                            if (pt1 != dbrootlist.end())
-                                cout << ", ";
-                        }
-
-                        cout << endl;
-
-                    }
-                    catch (exception& e)
-                    {
-                        cout << endl << "**** addDbroot Failed: " << e.what() << endl;
-                        break;
-                    }
-
-                    cout << endl << "Assigning DBRoots" << endl << endl;
-
-                    DeviceNetworkList::iterator pt = devicenetworklist.begin();
-                    DBRootConfigList::iterator pt1 = dbrootlist.begin();
-
-                    for ( ; pt != devicenetworklist.end() ; pt++)
-                    {
-                        string moduleName = (*pt).DeviceName;
-
-                        DBRootConfigList dbrootlist;
-
-                        for ( int dbrootNum = 0; dbrootNum < dbrootPerPM ; dbrootNum++)
-                        {
-                            dbrootlist.push_back(*pt1);
-                            pt1++;
-                        }
-
-                        //assign dbroots to pm
-                        try
-                        {
-                            oam.assignDbroot(moduleName, dbrootlist);
-
-                            cout << endl << "Successfully Assigned DBRoots " << endl;
-
-                        }
-                        catch (exception& e)
-                        {
-                            cout << endl << "**** Failed Assign of DBRoots: " << e.what() << endl;
-                            break;
-                        }
-                    }
-
-                    cout << endl << "Run Data Redundancy Setup for DBRoots" << endl;
-
-                    try
-                    {
-                        string errmsg;
-                        int ret = oam.glusterctl(oam::GLUSTER_ADD, firstPM, firstDBroot, errmsg);
-
-                        if ( ret != 0 )
-                        {
-                            cout << endl << "**** Failed Data Redundancy Add of DBRoots: " << errmsg << endl;
-                            break;
-                        }
-
-                        cout << endl << "Successfully Completed Data Redundancy Add DBRoots " << endl;
-
-                    }
-                    catch (...)
-                    {
-                        cout << endl << "**** glusterctl GLUSTER_ADD Failed" << endl;
-                        break;
-                    }
-
-                    cout << endl << "addModule Command Successfully completed: Run startSystem command to Activate newly added Performance Modules" << endl << endl;
-                }
-                else
-                {
-                    cout << "addModule Command Successfully completed: Modules are Disabled, run alterSystem-enableModule command to enable them" << endl << endl;
-                }
-
-                try
-                {
-                    oam.setSystemConfig("AmazonVPCNextPrivateIP", AmazonVPCNextPrivateIP);
-                }
-                catch (...) {}
-
-            }
-            catch (exception& e)
-            {
-                cout << endl << "**** addModule Failed: " << e.what() << endl;
-            }
-            catch (...)
-            {
-                cout << endl << "**** addModule Failed : Failed to Add Module" << endl;
-            }
-
-            break;
-        }
-
-        case 49: // removeModule - parameters: Module name/type, number-of-modules
-        {
-            if (arguments[1] == "")
-            {
-                // need atleast 1 arguments
-                cout << endl << "**** removeModule Failed : Missing a required Parameter, enter 'help' for additional information" << endl;
-                break;
-            }
-
-            parentOAMModule = getParentOAMModule();
-
-            if ( arguments[1] == parentOAMModule )
-            {
-                // exit out since you can't manually remove OAM Parent Module
-                cout << endl << "**** removeModule Failed : can't manually remove the Active OAM Parent Module." << endl;
-                break;
-            }
-
-            switch ( serverInstallType )
-            {
-                case (oam::INSTALL_COMBINE_DM_UM_PM):
-                {
-                    if (arguments[1].find("um") != string::npos )
-                    {
-                        cout << endl << "**** removeModule Failed : User Modules not supported on the Combined  Server Installation" << endl;
-                        return 0;
-                    }
-                }
-            }
-
-            ModuleTypeConfig moduletypeconfig;
-            DeviceNetworkConfig devicenetworkconfig;
-            DeviceNetworkList devicenetworklist;
-            bool quit = false;
-
-            string moduleType;
-
-            //check if module type or module name was entered
-            if ( arguments[1].size() == 2 )
-            {
-                //Module Type was entered
-
-                if ( arguments[3] != "y")
-                {
-                    cout << endl << "!!!!! DESTRUCTIVE COMMAND !!!!!" << endl;
-                    string warning = "This command does a remove a module from the Calpont System";
-
-                    // confirm request
-                    if (confirmPrompt(warning))
-                        break;
-                }
-
-                int moduleCount = atoi(arguments[2].c_str());
-
-                if ( moduleCount < 1 || moduleCount > 10  )
-                {
-                    cout << endl << "**** removeModule Failed : Failed to Remove Module, invalid number-of-modules entered (1-10)" << endl;
-                    break;
-                }
-
-                cout << endl;
-
-                moduleType = arguments[1];
-
-                //store moduleNames
-                try
-                {
-                    oam.getSystemConfig(moduleType, moduletypeconfig);
-                }
-                catch (...)
-                {
-                    cout << endl << "**** removeModule Failed : Failed to Remove Module, getSystemConfig API Failed" << endl;
-                    break;
-                }
-
-                int currentModuleCount = moduletypeconfig.ModuleCount;
-
-                if ( moduleCount > currentModuleCount )
-                {
-                    cout << endl << "**** removeModule Failed : Failed to Remove Module, mount count entered to larger than configured" << endl;
-                    break;
-                }
-
-                if ( moduleCount == currentModuleCount )
-                {
-                    if ( moduleType == "pm" )
-                    {
-                        cout << endl << "**** removeModule Failed : Failed to Remove Module, you can't remove last Director Module" << endl;
-                        break;
-                    }
-                }
-
-                //get module names in-use
-                typedef std::vector<string>	moduleNameList;
-                moduleNameList modulenamelist;
-
-                DeviceNetworkList::iterator pt = moduletypeconfig.ModuleNetworkList.begin();
-
-                for ( ; pt != moduletypeconfig.ModuleNetworkList.end() ; pt++)
-                {
-                    HostConfigList::iterator pt1 = (*pt).hostConfigList.begin();
-
-                    if ( (*pt1).HostName != oam::UnassignedName )
-                        modulenamelist.push_back((*pt).DeviceName);
-                }
-
-                moduleNameList::reverse_iterator pt1 = modulenamelist.rbegin();
-
-                for ( int i = 0 ; i < moduleCount ; i++)
-                {
-                    devicenetworkconfig.DeviceName = *pt1;
-                    pt1++;
-                    devicenetworklist.push_back(devicenetworkconfig);
-                }
-            }
-            else
-            {
-                //Module Name was entered
-
-                if ( arguments[2] != "y")
-                {
-                    cout << endl << "!!!!! DESTRUCTIVE COMMAND !!!!!" << endl;
-                    string warning = "This command does a stop and remove a module from the Calpont System";
-
-                    // confirm request
-                    if (confirmPrompt(warning))
-                        break;
-                }
-
-                cout << endl;
-
-                //parse module names
-                boost::char_separator<char> sep(", ");
-                boost::tokenizer< boost::char_separator<char> > tokens(arguments[1], sep);
-
-                for ( boost::tokenizer< boost::char_separator<char> >::iterator it = tokens.begin();
-                        it != tokens.end();
-                        ++it)
-                {
-                    devicenetworkconfig.DeviceName = *it;
-                    devicenetworklist.push_back(devicenetworkconfig);
-
-                    moduleType = (*it).substr(0, MAX_MODULE_TYPE_SIZE);
-
-                    try
-                    {
-                        oam.getSystemConfig(moduleType, moduletypeconfig);
-                    }
-                    catch (...)
-                    {
-                        cout << endl << "**** removeModule Failed : Failed to Remove Module, getSystemConfig API Failed" << endl;
-                        quit = true;
-                        break;
-                    }
-
-                    int currentModuleCount = moduletypeconfig.ModuleCount;
-
-                    if ( moduleType == "pm" && currentModuleCount == 1)
-                    {
-                        cout << endl << "**** removeModule Failed : Failed to Remove Module, you can't remove last Performance Module" << endl;
-                        quit = true;
-                        break;
-                    }
-
-                    if ( moduleType == "um" && currentModuleCount == 1)
-                    {
-                        cout << endl << "**** removeModule Failed : Failed to Remove Module, you can't remove last User Module" << endl;
-                        quit = true;
-                        break;
-                    }
-                }
-            }
-
-            if (quit)
-                break;
-
-            DeviceNetworkList::iterator pt = devicenetworklist.begin();
-            DeviceNetworkList::iterator endpt = devicenetworklist.end();
-
-            // check for module status and if any dbroots still assigned
-            for ( ; pt != endpt ; pt++)
-            {
-                if ( moduleType == "pm" )
-                {
-                    // check for dbroots assigned
-                    DBRootConfigList dbrootConfigList;
-                    string moduleID = (*pt).DeviceName.substr(MAX_MODULE_TYPE_SIZE, MAX_MODULE_ID_SIZE);
-
-                    try
-                    {
-                        oam.getPmDbrootConfig(atoi(moduleID.c_str()), dbrootConfigList);
-                    }
-                    catch (...)
-                    {}
-
-                    if ( !dbrootConfigList.empty() )
-                    {
-                        cout << "**** removeModule Failed : " << (*pt).DeviceName << " has dbroots still assigned. Please run movePmDbrootConfig or unassignPmDbrootConfig.";
-                        quit = true;
-                        cout << endl;
-                        break;
-                    }
-                }
-
-                // check module status
-                try
-                {
-                    bool degraded;
-                    int opState;
-                    oam.getModuleStatus((*pt).DeviceName, opState, degraded);
-
-                    if (opState == oam::MAN_OFFLINE ||
-                            opState == oam::MAN_DISABLED ||
-                            opState == oam::FAILED)
-                        continue;
-                    else
-                    {
-                        cout << "**** removeModule Failed : " << (*pt).DeviceName << " is not MAN_OFFLINE, DISABLED, or FAILED state.";
-                        quit = true;
-                        cout << endl;
-                        break;
-                    }
-                }
-                catch (exception& ex)
-                {}
-            }
-
-            if (quit)
-            {
-                cout << endl;
-                break;
-            }
-
-            try
-            {
-                cout << endl << "Removing Module(s) ";
-                DeviceNetworkList::iterator pt = devicenetworklist.begin();
-
-                for ( ; pt != devicenetworklist.end() ; pt++)
-                {
-                    cout << (*pt).DeviceName << ", ";
-                }
-
-                cout << "please wait..." << endl;
-
-                oam.removeModule(devicenetworklist);
-                cout << endl << "Remove Module successfully completed" << endl << endl;
-            }
-            catch (exception& e)
-            {
-                cout << endl << "Failed to Remove Module: " << e.what() << endl << endl;
-            }
-            catch (...)
-            {
-                cout << endl << "**** removeModule Failed : Failed to Remove Module" << endl << endl;
-                break;
-            }
-
-            break;
-        }
-
-        case 50: // getModuleHostNames
-        {
-            SystemModuleTypeConfig systemmoduletypeconfig;
-            ModuleTypeConfig moduletypeconfig;
-            ModuleConfig moduleconfig;
-            systemmoduletypeconfig.moduletypeconfig.clear();
-            string returnValue;
-            string Argument;
-
-            // get and all display Module HostNames (NIC 1)
-            // No other data will be displayed, only the hostnames.
-            // This feature is designed for use by other processes.
-            // It was specifically installed for the sqoop import feature (version 4.5)
-            // If arguments[1] == PM, display only PMs, UM, display only UMs, else all.
-            try
-            {
-                oam.getSystemConfig(systemmoduletypeconfig);
-
-                for ( unsigned int i = 0 ; i < systemmoduletypeconfig.moduletypeconfig.size(); i++)
-                {
-                    if ( systemmoduletypeconfig.moduletypeconfig[i].ModuleType.empty() )
-                        // end of list
-                        break;
-
-                    int moduleCount = systemmoduletypeconfig.moduletypeconfig[i].ModuleCount;
-
-                    if ( moduleCount == 0 )
-                        // skip if no modules
-                        continue;
-
-                    string moduletype = systemmoduletypeconfig.moduletypeconfig[i].ModuleType;
-
-                    if (arguments[1] == "pm" && moduletype != "pm")
-                        continue;
-
-                    if (arguments[1] == "um" && moduletype != "um")
-                        continue;
-
-                    DeviceNetworkList::iterator pt = systemmoduletypeconfig.moduletypeconfig[i].ModuleNetworkList.begin();
-
-                    for ( ; pt != systemmoduletypeconfig.moduletypeconfig[i].ModuleNetworkList.end() ; pt++)
-                    {
-                        HostConfigList::iterator pt1 = (*pt).hostConfigList.begin();
-
-                        for ( ; pt1 != (*pt).hostConfigList.end() ; pt1++)
-                        {
-                            // Only print for NIC 1
-                            if ((*pt1).NicID == 1)
-                            {
-                                // We need the name with domain and everything.
-                                if ((*pt1).HostName == "localhost")
-                                {
-                                    char hostName[128] = {0};
-                                    gethostname(hostName, 128);
-                                    cout << hostName << endl;
-                                }
-                                else
-                                {
-                                    struct hostent* hentName = gethostbyname((*pt1).HostName.c_str());
-
-                                    if (hentName)
-                                    {
-                                        cout << hentName->h_name << endl;
-                                    }
-                                    else
-                                    {
-                                        cout << (*pt1).HostName.c_str() << endl;
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-            catch (exception& e)
-            {
-                cout << endl << "**** getModuleHostNames Failed =  " << e.what() << endl;
-            }
-
-            break;
-        }
-
-        case 51: // disableMySQLReplication
-        {
-            string MySQLRep;
-
-            try
-            {
-                oam.getSystemConfig("MySQLRep", MySQLRep);
-            }
-            catch (...) {}
-
-            if ( MySQLRep == "n" )
-            {
-                string warning = "MySQL Replication Feature is already disable";
-
-                // confirm request
-                if (confirmPrompt(warning))
-                    break;
-            }
-
-            string MySQLPasswordConfig;
-
-            try
-            {
-                oam.getSystemConfig("MySQLPasswordConfig", MySQLPasswordConfig);
-            }
-            catch (...) {}
-
-            if ( MySQLPasswordConfig == oam::UnassignedName )
-            {
-                cout << endl;
-                string prompt = "Is there a 'MySQL' Password configured on the MySQL Front-end Modules in " + HOME + "/.my.cnf (y,n): ";
-                MySQLPasswordConfig = dataPrompt(prompt);
-            }
-
-            if ( MySQLPasswordConfig != "y" )
-                MySQLPasswordConfig = "n";
-
-            try
-            {
-                oam.setSystemConfig("MySQLPasswordConfig", MySQLPasswordConfig);
-            }
-            catch (...) {}
-
-            //set flag
-            try
-            {
-                oam.setSystemConfig("MySQLRep", "n");
-                sleep(2);
-            }
-            catch (...) {}
-
-            try
-            {
-                oam.disableMySQLRep();
-                cout << endl << "   Successful Disable of MySQL Replication " << endl;
-            }
-            catch (exception& e)
-            {
-                cout << endl << "**** disableMySQLRep Failed :  " << e.what() << endl;
-            }
-
-            break;
-        }
-
-        case 52: // getModuleCpuUsers
-        {
-            if (arguments[1] == "")
-            {
-                // need 1 arguments
-                cout << endl << "**** getModuleCpuUsers Failed : Missing a required Parameter, enter 'help' for additional information" << endl;
-                break;
-            }
-
-            int topNumber = 5;
-
-            if (arguments[2] != "")
-            {
-                topNumber = atoi(arguments[2].c_str());
-
-                if ( topNumber < 1 || topNumber > 10 )
-                {
-                    cout << endl << "**** getModuleCpuUsers Failed : Invalid top Number entered" << endl;
-                    break;
-                }
-            }
-
-            TopProcessCpuUsers topprocesscpuusers;
-
-            try
-            {
-                oam.getTopProcessCpuUsers(arguments[1], topNumber, topprocesscpuusers);
-
-                printModuleCpuUsers(topprocesscpuusers);
-
-            }
-            catch (exception& e)
-            {
-                cout << endl << "Failed to get Top CPU Users: " << e.what() << endl << endl;
-            }
-            catch (...)
-            {
-                cout << endl << "**** getModuleCpuUsers Failed : Failed to get Top CPU Users" << endl << endl;
-                break;
-            }
-
-            break;
-        }
-
-        case 53: // getSystemCpuUsers
-        {
-            int topNumber = 5;
-
-            if (arguments[1] != "")
-            {
-                topNumber = atoi(arguments[1].c_str());
-
-                if ( topNumber < 1 || topNumber > 10 )
-                {
-                    cout << endl << "**** getSystemCpuUsers Failed : Invalid top Number entered" << endl;
-                    break;
-                }
-            }
-
-            cout << endl << "System Process Top CPU Users per Module" << endl << endl;
-
-            SystemTopProcessCpuUsers systemtopprocesscpuusers;
-            TopProcessCpuUsers topprocesscpuusers;
-
-            try
-            {
-                oam.getTopProcessCpuUsers(topNumber, systemtopprocesscpuusers);
-
-                for ( unsigned int i = 0 ; i < systemtopprocesscpuusers.topprocesscpuusers.size(); i++)
-                {
-                    printModuleCpuUsers(systemtopprocesscpuusers.topprocesscpuusers[i]);
-                }
-
-            }
-            catch (exception& e)
-            {
-                cout << endl << "Failed to get Top CPU Users: " << e.what() << endl << endl;
-            }
-            catch (...)
-            {
-                cout << endl << "**** getSystemCpuUsers Failed : Failed to get Top CPU Users" << endl << endl;
-                break;
-            }
-
-            break;
-        }
-
-        case 54: // getModuleCpu
-        {
-            if (arguments[1] == "")
-            {
-                // need 1 arguments
-                cout << endl << "**** getModuleCpu Failed : Missing a required Parameter, enter 'help' for additional information" << endl;
-                break;
-            }
-
-            ModuleCpu modulecpu;
-
-            try
-            {
-                oam.getModuleCpuUsage(arguments[1], modulecpu);
-
-                printModuleCpu(modulecpu);
-
-            }
-            catch (exception& e)
-            {
-                cout << endl << "Failed to get CPU Usage: " << e.what() << endl << endl;
-            }
-            catch (...)
-            {
-                cout << endl << "**** getModuleCpu Failed : Failed to get Module CPU Usage" << endl << endl;
-                break;
-            }
-
-            break;
-        }
-
-        case 55: // getSystemCpu
-        {
-            cout << endl << "System CPU Usage per Module" << endl << endl;
-
-            SystemCpu systemcpu;
-
-            try
-            {
-                oam.getSystemCpuUsage(systemcpu);
-
-                for ( unsigned int i = 0 ; i < systemcpu.modulecpu.size(); i++)
-                {
-                    printModuleCpu(systemcpu.modulecpu[i]);
-                }
-
-            }
-            catch (exception& e)
-            {
-                cout << endl << "Failed to get CPU Usage: " << e.what() << endl << endl;
-            }
-            catch (...)
-            {
-                cout << endl << "**** getSystemCpu Failed : Failed to get CPU Usage" << endl << endl;
-                break;
-            }
-
-            break;
-        }
-
-        case 56: // getModuleMemoryUsers
-        {
-            if (arguments[1] == "")
-            {
-                // need 1 arguments
-                cout << endl << "**** getModuleMemoryUsers Failed : Missing a required Parameter, enter 'help' for additional information" << endl;
-                break;
-            }
-
-            int topNumber = 5;
-
-            if (arguments[2] != "")
-            {
-                topNumber = atoi(arguments[2].c_str());
-
-                if ( topNumber < 1 || topNumber > 10 )
-                {
-                    cout << endl << "**** getModuleMemoryUsers Failed : Invalid top Number entered" << endl;
-                    break;
-                }
-            }
-
-            TopProcessMemoryUsers topprocessmemoryusers;
-
-            try
-            {
-                oam.getTopProcessMemoryUsers(arguments[1], topNumber, topprocessmemoryusers);
-
-                printModuleMemoryUsers(topprocessmemoryusers);
-
-            }
-            catch (exception& e)
-            {
-                cout << endl << "Failed to get Top Memory Users: " << e.what() << endl << endl;
-            }
-            catch (...)
-            {
-                cout << endl << "**** getModuleMemoryUsers Failed : Failed to get Top Memory Users" << endl << endl;
-                break;
-            }
-
-            break;
-        }
-
-        case 57: // getSystemMemoryUsers
-        {
-            int topNumber = 5;
-
-            if (arguments[1] != "")
-            {
-                topNumber = atoi(arguments[1].c_str());
-
-                if ( topNumber < 1 || topNumber > 10 )
-                {
-                    cout << endl << "**** getSystemMemoryUsers Failed : Invalid top Number entered" << endl;
-                    break;
-                }
-            }
-
-            cout << endl << "System Process Top Memory Users per Module" << endl << endl;
-
-            SystemTopProcessMemoryUsers systemtopprocessmemoryusers;
-            TopProcessMemoryUsers topprocessmemoryusers;
-
-            try
-            {
-                oam.getTopProcessMemoryUsers(topNumber, systemtopprocessmemoryusers);
-
-                for ( unsigned int i = 0 ; i < systemtopprocessmemoryusers.topprocessmemoryusers.size(); i++)
-                {
-                    printModuleMemoryUsers(systemtopprocessmemoryusers.topprocessmemoryusers[i]);
-                }
-
-            }
-            catch (exception& e)
-            {
-                cout << endl << "Failed to get Top CPU Users: " << e.what() << endl << endl;
-            }
-            catch (...)
-            {
-                cout << endl << "**** getSystemMemoryUsers Failed : Failed to get Top CPU Users" << endl << endl;
-                break;
-            }
-
-            break;
-        }
-
-        case 58: // getModuleMemory
-        {
-            if (arguments[1] == "")
-            {
-                // need 1 arguments
-                cout << endl << "**** getModuleMemory Failed : Missing a required Parameter, enter 'help' for additional information" << endl;
-                break;
-            }
-
-            ModuleMemory modulememory;
-
-            try
-            {
-                oam.getModuleMemoryUsage(arguments[1], modulememory);
-
-                cout << endl << "Module Memory Usage (in K bytes)" << endl << endl;
-
-                cout.setf(ios::left);
-                cout.width(8);
-                cout << "Module";
-                cout.width(11);
-                cout << "Mem Total";
-                cout.width(9);
-                cout << "Mem Used";
-                cout.width(9);
-                cout << "cache";
-                cout.width(12);
-                cout << "Mem Usage %";
-                cout.width(11);
-                cout << "Swap Total";
-                cout.width(10);
-                cout << "Swap Used";
-                cout.width(13);
-                cout << "Swap Usage %";
-                cout << endl;
-
-                cout.setf(ios::left);
-                cout.width(8);
-                cout << "------";
-                cout.width(11);
-                cout << "---------";
-                cout.width(9);
-                cout << "-------";
-                cout.width(9);
-                cout << "-------";
-                cout.width(12);
-                cout << "----------";
-                cout.width(11);
-                cout << "----------";
-                cout.width(10);
-                cout << "---------";
-                cout.width(13);
-                cout << "-----------";
-                cout << endl;
-
-                printModuleMemory(modulememory);
-            }
-            catch (exception& e)
-            {
-                cout << endl << "Failed to get Memory Usage: " << e.what() << endl << endl;
-            }
-            catch (...)
-            {
-                cout << endl << "**** getModuleMemory Failed : Failed to get Module Memory Usage" << endl << endl;
-                break;
-            }
-
-            break;
-        }
-
-        case 59: // getSystemMemory
-        {
-            cout << endl << "System Memory Usage per Module (in K bytes)" << endl << endl;
-
-            cout.setf(ios::left);
-            cout.width(8);
-            cout << "Module";
-            cout.width(11);
-            cout << "Mem Total";
-            cout.width(10);
-            cout << "Mem Used";
-            cout.width(9);
-            cout << "Cache";
-            cout.width(13);
-            cout << "Mem Usage %";
-            cout.width(12);
-            cout << "Swap Total";
-            cout.width(11);
-            cout << "Swap Used";
-            cout.width(14);
-            cout << "Swap Usage %";
-            cout << endl;
-
-            cout.setf(ios::left);
-            cout.width(8);
-            cout << "------";
-            cout.width(11);
-            cout << "---------";
-            cout.width(10);
-            cout << "--------";
-            cout.width(9);
-            cout << "-------";
-            cout.width(13);
-            cout << "-----------";
-            cout.width(12);
-            cout << "----------";
-            cout.width(11);
-            cout << "---------";
-            cout.width(14);
-            cout << "------------";
-            cout << endl;
-
-            SystemMemory systemmemory;
-
-            try
-            {
-                oam.getSystemMemoryUsage(systemmemory);
-
-                for ( unsigned int i = 0 ; i < systemmemory.modulememory.size(); i++)
-                {
-                    printModuleMemory(systemmemory.modulememory[i]);
-                }
-
-            }
-            catch (exception& e)
-            {
-                cout << endl << "Failed to get Memory Usage: " << e.what() << endl << endl;
-            }
-            catch (...)
-            {
-                cout << endl << "**** getSystemCpu Failed : Failed to get Memory Usage" << endl << endl;
-                break;
-            }
-
-            break;
-        }
-
-        case 60: // getModuleDisk
-        {
-            if (arguments[1] == "")
-            {
-                // need 1 arguments
-                cout << endl << "**** getModuleDisk Failed : Missing a required Parameter, enter 'help' for additional information" << endl;
-                break;
-            }
-
-            ModuleDisk moduledisk;
-
-            try
-            {
-                oam.getModuleDiskUsage(arguments[1], moduledisk);
-
-                printModuleDisk(moduledisk);
-
-            }
-            catch (exception& e)
-            {
-                cout << endl << "Failed to get Disk Usage: " << e.what() << endl << endl;
-            }
-            catch (...)
-            {
-                cout << endl << "**** getModuleDisk Failed : Failed to get Module Disk Usage" << endl << endl;
-                break;
-            }
-
-            break;
-        }
-
-        case 61: // getSystemDisk
-        {
-            cout << endl << "System Disk Usage per Module" << endl << endl;
-
-            SystemDisk systemdisk;
-
-            try
-            {
-                oam.getSystemDiskUsage(systemdisk);
-
-                for ( unsigned int i = 0 ; i < systemdisk.moduledisk.size(); i++)
-                {
-                    printModuleDisk(systemdisk.moduledisk[i]);
-                }
-
-            }
-            catch (exception& e)
-            {
-                cout << endl << "Failed to get Memory Usage: " << e.what() << endl << endl;
-            }
-            catch (...)
-            {
-                cout << endl << "**** getSystemCpu Failed : Failed to get Memory Usage" << endl << endl;
-                break;
-            }
-
-            break;
-        }
-
-        case 62: // getModuleResources
-        {
-            if (arguments[1] == "")
-            {
-                // need 1 arguments
-                cout << endl << "**** getModuleResources Failed : Missing a required Parameter, enter 'help' for additional information" << endl;
-                break;
-            }
-
-            int topNumber = 5;
-
-            TopProcessCpuUsers topprocesscpuusers;
-
-            try
-            {
-                oam.getTopProcessCpuUsers(arguments[1], topNumber, topprocesscpuusers);
-            }
-            catch (exception& e)
-            {
-                cout << endl << "Failed to get Top CPU Users: " << e.what() << endl << endl;
-                break;
-            }
-            catch (...)
-            {
-                cout << endl << "**** getModuleCpuUsers Failed : Failed to get Top CPU Users" << endl << endl;
-                break;
-            }
-
-            ModuleCpu modulecpu;
-
-            try
-            {
-                oam.getModuleCpuUsage(arguments[1], modulecpu);
-            }
-            catch (exception& e)
-            {
-                cout << endl << "Failed to get CPU Usage: " << e.what() << endl << endl;
-                break;
-            }
-            catch (...)
-            {
-                cout << endl << "**** getModuleCpu Failed : Failed to get Module CPU Usage" << endl << endl;
-                break;
-            }
-
-            TopProcessMemoryUsers topprocessmemoryusers;
-
-            try
-            {
-                oam.getTopProcessMemoryUsers(arguments[1], topNumber, topprocessmemoryusers);
-            }
-            catch (exception& e)
-            {
-                cout << endl << "Failed to get Top Memory Users: " << e.what() << endl << endl;
-                break;
-            }
-            catch (...)
-            {
-                cout << endl << "**** getModuleMemoryUsers Failed : Failed to get Top Memory Users" << endl << endl;
-                break;
-            }
-
-            ModuleMemory modulememory;
-
-            try
-            {
-                oam.getModuleMemoryUsage(arguments[1], modulememory);
-            }
-            catch (exception& e)
-            {
-                cout << endl << "Failed to get Memory Usage: " << e.what() << endl << endl;
-                break;
-            }
-            catch (...)
-            {
-                cout << endl << "**** getModuleMemory Failed : Failed to get Module Memory Usage" << endl << endl;
-                break;
-            }
-
-            ModuleDisk moduledisk;
-
-            try
-            {
-                oam.getModuleDiskUsage(arguments[1], moduledisk);
-            }
-            catch (exception& e)
-            {
-                cout << endl << "Failed to get Disk Usage: " << e.what() << endl << endl;
-                break;
-            }
-            catch (...)
-            {
-                cout << endl << "**** getModuleDisk Failed : Failed to get Module Disk Usage" << endl << endl;
-                break;
-            }
-
-            printModuleResources(topprocesscpuusers, modulecpu, topprocessmemoryusers, modulememory, moduledisk);
-
-            break;
-        }
-
-        case 63: // getSystemResources
-        {
-            cout << endl << "System Resource Usage per Module" << endl << endl;
-
-            int topNumber = 5;
-
-            SystemModuleTypeConfig systemmoduletypeconfig;
-            ModuleTypeConfig moduletypeconfig;
-
-            try
-            {
-                oam.getSystemConfig(systemmoduletypeconfig);
-
-                for ( unsigned int i = 0 ; i < systemmoduletypeconfig.moduletypeconfig.size(); i++)
-                {
-                    if ( systemmoduletypeconfig.moduletypeconfig[i].ModuleType.empty() )
-                        // end of list
-                        continue;
-
-                    int moduleCount = systemmoduletypeconfig.moduletypeconfig[i].ModuleCount;
-
-                    if ( moduleCount == 0 )
-                        continue;
-
-                    DeviceNetworkList::iterator pt = systemmoduletypeconfig.moduletypeconfig[i].ModuleNetworkList.begin();
-
-                    for ( ; pt != systemmoduletypeconfig.moduletypeconfig[i].ModuleNetworkList.end() ; pt++)
-                    {
-                        string modulename = (*pt).DeviceName;
-
-                        if ( modulename == "unknown" )
-                            continue;
-
-                        TopProcessCpuUsers topprocesscpuusers;
-
-                        try
-                        {
-                            oam.getTopProcessCpuUsers(modulename, topNumber, topprocesscpuusers);
-                        }
-                        catch (exception& e)
-                        {
-                            cout << endl << "Failed to get Top CPU Users: " << e.what() << endl << endl;
-                            break;
-                        }
-                        catch (...)
-                        {
-                            cout << endl << "**** getModuleCpuUsers Failed : Failed to get Top CPU Users" << endl << endl;
-                            break;
-                        }
-
-                        ModuleCpu modulecpu;
-
-                        try
-                        {
-                            oam.getModuleCpuUsage(modulename, modulecpu);
-                        }
-                        catch (exception& e)
-                        {
-                            cout << endl << "Failed to get CPU Usage: " << e.what() << endl << endl;
-                            break;
-                        }
-                        catch (...)
-                        {
-                            cout << endl << "**** getModuleCpu Failed : Failed to get Module CPU Usage" << endl << endl;
-                            break;
-                        }
-
-                        TopProcessMemoryUsers topprocessmemoryusers;
-
-                        try
-                        {
-                            oam.getTopProcessMemoryUsers(modulename, topNumber, topprocessmemoryusers);
-                        }
-                        catch (exception& e)
-                        {
-                            cout << endl << "Failed to get Top Memory Users: " << e.what() << endl << endl;
-                            break;
-                        }
-                        catch (...)
-                        {
-                            cout << endl << "**** getModuleMemoryUsers Failed : Failed to get Top Memory Users" << endl << endl;
-                            break;
-                        }
-
-                        ModuleMemory modulememory;
-
-                        try
-                        {
-                            oam.getModuleMemoryUsage(modulename, modulememory);
-                        }
-                        catch (exception& e)
-                        {
-                            cout << endl << "Failed to get Memory Usage: " << e.what() << endl << endl;
-                            break;
-                        }
-                        catch (...)
-                        {
-                            cout << endl << "**** getModuleMemory Failed : Failed to get Module Memory Usage" << endl << endl;
-                            break;
-                        }
-
-                        ModuleDisk moduledisk;
-
-                        try
-                        {
-                            oam.getModuleDiskUsage(modulename, moduledisk);
-                        }
-                        catch (exception& e)
-                        {
-                            cout << endl << "Failed to get Disk Usage: " << e.what() << endl << endl;
-                            break;
-                        }
-                        catch (...)
-                        {
-                            cout << endl << "**** getModuleDisk Failed : Failed to get Module Disk Usage" << endl << endl;
-                            break;
-                        }
-
-                        printModuleResources(topprocesscpuusers, modulecpu, topprocessmemoryusers, modulememory, moduledisk);
-                    }
-                }
-            }
-            catch (exception& e)
-            {
-                cout << endl << "**** getSystemResources Failed :  " << e.what() << endl;
-            }
-
-            break;
-        }
-
-        case 64: // getActiveSQLStatements
-        {
-            cout << endl << "Get List of Active SQL Statements" << endl;
-            cout <<         "=================================" << endl << endl;
-
-            ActiveSqlStatements activesqlstatements;
-
-            try
-            {
-                oam.getActiveSQLStatements(activesqlstatements);
-
-                if ( activesqlstatements.size() == 0 )
-                {
-                    cout << "No Active SQL Statements at this time" << endl << endl;
-                    break;
-                }
-
-                cout << "Start Time        Time (hh:mm:ss)   Session ID             SQL Statement" << endl;
-                cout << "----------------  ----------------  --------------------   ------------------------------------------------------------" << endl;
-
-                for ( unsigned int i = 0 ; i < activesqlstatements.size(); i++)
-                {
-                    struct tm tmStartTime;
-                    char timeBuf[36];
-                    time_t startTime = activesqlstatements[i].starttime;
-                    localtime_r(&startTime, &tmStartTime);
-                    (void)strftime(timeBuf, 36, "%b %d %H:%M:%S", &tmStartTime);
-
-                    cout.setf(ios::left);
-                    cout.width(21);
-                    cout << timeBuf;
-
-                    //get current time in Epoch
-                    time_t cal;
-                    time (&cal);
-
-                    int runTime = cal - activesqlstatements[i].starttime;
-                    int runHours = runTime / 3600;
-                    int runMinutes = (runTime - (runHours * 3600)) / 60;
-                    int runSeconds = runTime - (runHours * 3600)  - (runMinutes * 60);
-
-                    cout.width(15);
-                    string hours = oam.itoa(runHours);
-                    string minutes = oam.itoa(runMinutes);
-                    string seconds = oam.itoa(runSeconds);
-
-                    string run;
-
-                    if ( hours.size() == 1 )
-                        run = "0" + hours + ":";
-                    else
-                        run = hours + ":";
-
-                    if ( minutes.size() == 1 )
-                        run = run + "0" + minutes + ":";
-                    else
-                        run = run + minutes + ":";
-
-                    if ( seconds.size() == 1 )
-                        run = run + "0" + seconds;
-                    else
-                        run = run + seconds;
-
-                    cout << run;
-
-                    cout.width(23);
-                    cout << activesqlstatements[i].sessionid;
-
-                    string SQLStatement = activesqlstatements[i].sqlstatement;
-                    int pos = 0;
-
-                    for ( ;; )
-                    {
-                        string printSQL = SQLStatement.substr(pos, 60);
-                        pos = pos + 60;
-                        cout << printSQL << endl;
-
-                        if ( printSQL.size() < 60 )
-                            break;
-
-                        cout.width(59);
-                        cout << " ";
-                    }
-
-                    cout << endl;
-                }
-
-            }
-            catch (exception& e)
-            {
-                cout << endl << "Failed to get List of Active SQL Statements: " << e.what() << endl << endl;
-            }
-            catch (...)
-            {
-                cout << endl << "**** getActiveSQLStatements Failed : Failed to get List of Active SQL Statements" << endl << endl;
-                break;
-            }
-
-            break;
-        }
-
-        case 65: // alterSystem-disableModule
-        {
-            if (arguments[1] == "")
-            {
-                // need arguments
-                cout << endl << "**** alterSystem-disableModule Failed : Missing a required Parameter, enter 'help' for additional information" << endl;
-                break;
-            }
-
-            parentOAMModule = getParentOAMModule();
-
-            if ( arguments[1] == parentOAMModule )
-            {
-                // exit out since you can't manually remove OAM Parent Module
-                cout << endl << "**** alterSystem-disableModule Failed : can't manually disable the Active OAM Parent Module." << endl;
-                break;
-            }
-
-            string moduleType = arguments[1].substr(0, MAX_MODULE_TYPE_SIZE);
-
-            gracefulTemp = INSTALL;
-
-            //display Primary UM Module
-            string PrimaryUMModuleName;
-
-            try
-            {
-                oam.getSystemConfig("PrimaryUMModuleName", PrimaryUMModuleName);
-            }
-            catch (...) {}
-
-            bool primUM = false;
-
-            if ( PrimaryUMModuleName == arguments[1] )
-            {
-                cout << endl << "This command stops the processing of applications on the Primary User Module, which is where DDL/DML are performed";
-
-                if (confirmPrompt("If there is another module that can be changed to a new Primary User Module, this will be done"))
-                    break;
-
-                primUM = true;
-            }
-            else
-            {
-                // confirm request
-                if ( arguments[2] != "y" )
-                {
-                    if (confirmPrompt("This command stops the processing of applications on a Module within the Calpont System"))
-                        break;
-                }
-            }
-
-            //parse module names
-            DeviceNetworkConfig devicenetworkconfig;
-            DeviceNetworkList devicenetworklist;
-
-            boost::char_separator<char> sep(", ");
-            boost::tokenizer< boost::char_separator<char> > tokens(arguments[1], sep);
-
-            for ( boost::tokenizer< boost::char_separator<char> >::iterator it = tokens.begin();
-                    it != tokens.end();
-                    ++it)
-            {
-                devicenetworkconfig.DeviceName = *it;
-                devicenetworklist.push_back(devicenetworkconfig);
-            }
-
-            DeviceNetworkList::iterator pt = devicenetworklist.begin();
-            DeviceNetworkList::iterator endpt = devicenetworklist.end();
-
-            bool quit = false;
-
-            // check for module status and if any dbroots still assigned
-            if ( moduleType == "pm" )
-            {
-                for ( ; pt != endpt ; pt++)
-                {
-                    // check for dbroots assigned
-                    DBRootConfigList dbrootConfigList;
-                    string moduleID = (*pt).DeviceName.substr(MAX_MODULE_TYPE_SIZE, MAX_MODULE_ID_SIZE);
-
-                    try
-                    {
-                        oam.getPmDbrootConfig(atoi(moduleID.c_str()), dbrootConfigList);
-                    }
-                    catch (...)
-                    {}
-
-                    if ( !dbrootConfigList.empty() )
-                    {
-                        cout << endl << "**** alterSystem-disableModule Failed : " << (*pt).DeviceName << " has dbroots still assigned and will not be disabled. Please run movePmDbrootConfig or unassignPmDbrootConfig.";
-                        quit = true;
-                        cout << endl;
-                        break;
-                    }
-                }
-
-                if (quit)
-                {
-                    cout << endl;
-                    break;
-                }
-            }
-
-            if ( devicenetworklist.empty() )
-            {
-                cout << endl << "quiting, no modules to remove." << endl << endl;
-                break;
-            }
-
-            // stop module
-            try
-            {
-                cout << endl << "   Stopping Modules" << endl;
-                oam.stopModule(devicenetworklist, gracefulTemp, ackTemp);
-                cout << "   Successful stop of Modules " << endl;
-            }
-            catch (exception& e)
-            {
-
-                string Failed = e.what();
-
-                if (Failed.find("Disabled") != string::npos)
-                    cout << endl << "   Successful stop of Modules " << endl;
-                else
-                {
-                    cout << endl << "**** stopModule Failed :  " << e.what() << endl;
-                    break;
-                }
-            }
-
-            // disable module
-            try
-            {
-                cout << endl << "   Disabling Modules" << endl;
-                oam.disableModule(devicenetworklist);
-                cout << "   Successful disable of Modules " << endl;
-
-                //display Primary UM Module
-                string PrimaryUMModuleName;
-
-                try
-                {
-                    oam.getSystemConfig("PrimaryUMModuleName", PrimaryUMModuleName);
-                }
-                catch (...) {}
-
-                if ( primUM &&
-                        PrimaryUMModuleName != arguments[1] )
-                    cout << endl << "   New Primary User Module = " << PrimaryUMModuleName << endl;
-
-            }
-            catch (exception& e)
-            {
-                cout << endl << "**** disableModule Failed :  " << e.what() << endl;
-                break;
-            }
-
-            cout << endl;
-            break;
-        }
-
-        case 66: // alterSystem-enableModule
-        {
-            if (arguments[1] == "")
-            {
-                // need arguments
-                cout << endl << "**** alterSystem-enableModule Failed : Missing a required Parameter, enter 'help' for additional information" << endl;
-                break;
-            }
-
-            string moduleType = arguments[1].substr(0, MAX_MODULE_TYPE_SIZE);
-
-            ACK_FLAG ackTemp = ACK_YES;
-
-            // confirm request
-            if ( arguments[2] != "y" )
-            {
-                if (confirmPrompt("This command starts the processing of applications on a Module within the Calpont System"))
-                    break;
-            }
-
-            //parse module names
-            DeviceNetworkConfig devicenetworkconfig;
-            DeviceNetworkList devicenetworklist;
-            boost::char_separator<char> sep(", ");
-            boost::tokenizer< boost::char_separator<char> > tokens(arguments[1], sep);
-
-            for ( boost::tokenizer< boost::char_separator<char> >::iterator it = tokens.begin();
-                    it != tokens.end();
-                    ++it)
-            {
-                devicenetworkconfig.DeviceName = *it;
-                devicenetworklist.push_back(devicenetworkconfig);
-            }
-
-            //get the system status, enable modules and startmodules if system is ACTIVE
-            SystemStatus systemstatus;
-
-            try
-            {
-                oam.getSystemStatus(systemstatus);
-
-                // enable module
-                try
-                {
-                    cout << endl << "   Enabling Modules " << endl;
-                    oam.enableModule(devicenetworklist);
-                    cout << "   Successful enable of Modules " << endl;
-                }
-                catch (exception& e)
-                {
-                    cout << endl << "**** enableModule Failed :  " << e.what() << endl;
-                    break;
-                }
-
-                if ( moduleType == "pm" )
-                {
-                    cout << endl << "   Performance Module(s) Enabled, run movePmDbrootConfig or assignDbrootPmConfig to assign dbroots, if needed" << endl << endl;
-                    break;
-                }
-                else
-                {
-                    if (systemstatus.SystemOpState == oam::ACTIVE )
-                    {
-                        try
-                        {
-                            cout << endl << "   Starting Modules" << endl;
-                            oam.startModule(devicenetworklist, ackTemp);
-
-                            //reload DBRM with new configuration, needs to be done here after startModule
-                            string cmd = startup::StartUp::installDir() + "/bin/dbrmctl reload > /dev/null 2>&1";
-                            system(cmd.c_str());
-                            sleep(15);
-
-                            cout << "   Successful start of Modules " << endl;
-                        }
-                        catch (exception& e)
-                        {
-                            cout << endl << "**** startModule Failed :  " << e.what() << endl;
-                            break;
-                        }
-                    }
-                    else
-                        cout << endl << "   System not Active, run 'startSystem' to start system if needed" << endl;
-                }
-            }
-            catch (exception& e)
-            {
-                cout << endl << "**** alterSystem-enableModule Failed : " << e.what() << endl;
-                break;
-            }
-            catch (...)
-            {
-                cout << endl << "**** alterSystem-enableModule Failed,  Failed return from getSystemStatus API" << endl;
-                break;
-            }
-
-            cout << endl;
-
-            break;
-        }
-
-        case 67: // AVAILABLE
-        {
-        }
-
-
-        default:
-        {
-            cout << arguments[0] << ": Unknown Command, type help for list of commands" << endl << endl;
-            return 1;
-        }
-    }
-
-    return 0;
-}
-
-/******************************************************************************************
- * @brief	ProcessSupportCommand
- *
- * purpose:	Process Support commands
- *
- ******************************************************************************************/
-int ProcessSupportCommand(int CommandID, std::string arguments[])
-{
-    Oam oam;
-    GRACEFUL_FLAG gracefulTemp = GRACEFUL;
-    ACK_FLAG ackTemp = ACK_YES;
-    CC_SUSPEND_ANSWER suspendAnswer = WAIT;
-    bool bNeedsConfirm = true;
-
-    switch ( CommandID )
-    {
-        case 0: // helpsupport
-        {
-            // display commands in the Support Command list
-            cout << endl << "List of Support commands" << endl << endl;
-
-            for (int i = 1;; i++)
-            {
-                if (supportCmds[i] == "")
-                    // end of list
-                    break;
-
-                cout << "   " << supportCmds[i] << endl;
-            }
-
-            cout << endl;
-        }
-        break;
-
-        case 1: // stopprocess - parameters: Process-name, Module-name, Graceful flag, Ack flag
-        {
-            if (arguments[2] == "")
-            {
-                // need arguments
-                cout << endl << "**** stopprocess Failed : Missing a required Parameter, Enter Process and Module names" << endl;
-                break;
-            }
-
-            // don't allow stopping of Process-Monitor
-            if ( arguments[1] == "ProcessMonitor" )
-            {
-                cout << "ProcessMonitor is controlled by 'init' and can not be stopped" << endl;
-                break;
-            }
-            else
-            {
-                // give warning for Process-Monitor
-                if ( arguments[1] == "ProcessManager" )
-                {
-                    if (confirmPrompt("ProcessManager is the Interface for the Console and should only be removed as part of a Calpont Package installation"))
-                        break;
-                }
-                else
-                {
-                    if ( arguments[3] != "y" )
-                    {
-                        getFlags(arguments, gracefulTemp, ackTemp, suspendAnswer, bNeedsConfirm);
-
-                        // confirm request
-                        if (confirmPrompt("This command stops the processing of an application on a Module within the Calpont System"))
-                            break;
-                    }
-                }
-            }
-
-            try
-            {
-                oam.stopProcess(arguments[2], arguments[1], gracefulTemp, ackTemp);
-                cout << endl << "   Successful stop of Process " << arguments[1] << endl << endl;
-            }
-            catch (exception& e)
-            {
-                cout << endl << "**** stopprocess Failed :  " << e.what() << endl;
-            }
-        }
-        break;
-
-        case 2: // startprocess - parameters: Process-name, Module-name, Graceful flag, Ack flag
-        {
-            if (arguments[2] == "")
-            {
-                // need arguments
-                cout << endl << "**** startprocess Failed : Missing a required Parameter, Enter Process and Module names" << endl;
-                break;
-            }
-
-            getFlags(arguments, gracefulTemp, ackTemp, suspendAnswer, bNeedsConfirm);
-
-            try
-            {
-                oam.startProcess(arguments[2], arguments[1], gracefulTemp, ackTemp);
-                cout << endl << "   Successful start of Process " << arguments[1] << endl << endl;
-            }
-            catch (exception& e)
-            {
-                cout << endl << "**** startprocess Failed :  " << e.what() << endl;
-            }
-        }
-        break;
-
-        case 3: // restartprocess - parameters: Process-name, Module-name, Graceful flag, Ack flag
-        {
-            if (arguments[2] == "")
-            {
-                // need arguments
-                cout << endl << "**** restartprocess Failed : Missing a required Parameter, Enter Process and Module names" << endl;
-                break;
-            }
-
-            getFlags(arguments, gracefulTemp, ackTemp, suspendAnswer, bNeedsConfirm);
-
-            // confirm request
-            if (confirmPrompt("This command restarts the processing of an application on a Module within the Calpont System"))
-                break;
-
-            try
-            {
-                oam.restartProcess(arguments[2], arguments[1], gracefulTemp, ackTemp);
-                cout << endl << "   Successful restart of Process " << arguments[1] << endl << endl;
-            }
-            catch (exception& e)
-            {
-                cout << endl << "**** restartprocess Failed :  " << e.what() << endl;
-            }
-        }
-        break;
-
-        case 4: // killpid
-        {
-            if (arguments[1] == "" || arguments[2] != "")
-            {
-                // need arguments
-                cout << endl << "**** killpid Failed : Invalid or Missing Parameter, Enter local Process-ID" << endl;
-                break;
-            }
-
-            pid_t PID = atoi(arguments[1].c_str());
-
-            if ( PID <= 0 )
-            {
-                cout << endl << "**** killpid Failed : Invalid Process-ID Entered" << endl;
-                break;
-            }
-
-            int status = kill( PID, SIGTERM);
-
-            if ( status != API_SUCCESS)
-                cout << endl << "   Failure in kill of Process-ID " << arguments[1] << ", Failed: " << errno << endl << endl;
-            else
-                cout << endl << "   Successful kill of Process-ID " << arguments[1] << endl << endl;
-        }
-        break;
-
-        case 5: // rebootsystem - parameters: password
-        {
-            if ( !rootUser)
-            {
-                cout << endl << "**** rebootsystem Failed : command not available when running as non-root user" << endl;
-                break;
-            }
-
-            parentOAMModule = getParentOAMModule();
-
-            if ( localModule != parentOAMModule )
-            {
-                // exit out since not on Parent OAM Module
-                cout << endl << "**** rebootsystem Failed : only should be run on the Parent OAM Module, which is '" << parentOAMModule << "'" << endl;
-                break;
-            }
-
-            if (arguments[1] == "" || arguments[1] == "y")
-            {
-                // need arguments
-                cout << endl << "**** rebootsystem Failed : Invalid or Missing Parameter, Provide root-password" << endl;
-                break;
-            }
-
-            string password = arguments[1];
-
-            if ( arguments[2] != "y")
-            {
-                cout << endl << "!!!!! DESTRUCTIVE COMMAND !!!!!" << endl;
-                string warning = "This command stops the Processing of applications and reboots all modules within the Calpont System";
-
-                // confirm request
-                if (confirmPrompt(warning))
-                    break;
-            }
-
-            cout << endl << "   Stop System being performed, please wait..." << endl;
-
-            try
-            {
-                cout << endl << "   System being stopped, please wait... " << endl;
-                oam.stopSystem(GRACEFUL, ACK_YES);
-
-                if ( waitForStop() )
-                    cout << endl << "   Successful stop of System " << endl << endl;
-                else
-                    cout << endl << "**** stopSystem Failed : check log files" << endl;
-            }
-            catch (exception& e)
-            {
-                cout << endl << "**** stopSystem Failed :  " << e.what() << endl;
-                string warning = "stopSystem command failed,";
-
-                // confirm request
-                if (confirmPrompt(warning))
-                    break;
-            }
-
-            SystemModuleTypeConfig systemmoduletypeconfig;
-            systemmoduletypeconfig.moduletypeconfig.clear();
-
-            try
-            {
-                oam.getSystemConfig(systemmoduletypeconfig);
-
-                bool FAILED = false;
-
-                for ( unsigned int i = 0 ; i < systemmoduletypeconfig.moduletypeconfig.size(); i++)
-                {
-                    if ( systemmoduletypeconfig.moduletypeconfig[i].ModuleType.empty() )
-                        // end of list
-                        break;
-
-                    int moduleCount = systemmoduletypeconfig.moduletypeconfig[i].ModuleCount;
-                    string moduletype = systemmoduletypeconfig.moduletypeconfig[i].ModuleType;
-
-                    if ( moduleCount > 0 )
-                    {
-                        DeviceNetworkList::iterator pt = systemmoduletypeconfig.moduletypeconfig[i].ModuleNetworkList.begin();
-
-                        for ( ; pt != systemmoduletypeconfig.moduletypeconfig[i].ModuleNetworkList.end() ; pt++)
-                        {
-                            string modulename = (*pt).DeviceName;
-
-                            if (modulename == parentOAMModule )
-                            {
-                                //do me last
-                                continue;
-                            }
-
-                            //skip modules in MAN_DISABLED state
-                            try
-                            {
-                                int opState;
-                                bool degraded;
-                                oam.getModuleStatus(modulename, opState, degraded);
-
-                                if (opState == oam::MAN_DISABLED )
-                                    //skip
-                                    continue;
-                            }
-                            catch (exception& ex)
-                            {}
-
-                            //run remote command script
-                            HostConfigList::iterator pt1 = (*pt).hostConfigList.begin();
-                            string cmd = startup::StartUp::installDir() + "/bin/remote_command.sh " + (*pt1).IPAddr + " " + password + " reboot " ;
-                            int rtnCode = system(cmd.c_str());
-
-                            if (WEXITSTATUS(rtnCode) != 0)
-                            {
-                                cout << "Failed with running remote_command.sh" << endl;
-                                FAILED = true;
-                            }
-                            else
-                                cout << endl << "   Successful reboot request of Module " << modulename << endl;
-                        }
-                    }
-                }
-
-                if ( FAILED )
-                    break;
-
-                //reboot local module
-                int rtnCode = system("reboot");
-
-                if (WEXITSTATUS(rtnCode) != 0)
-                    cout << "Failed rebooting local module" << endl;
-                else
-                {
-                    cout << endl << "   Successful reboot request of local Module" << endl;
-                    // close the log file
-                    writeLog("End of a command session!!!");
-                    logFile.close();
-                    cout << endl << "Exiting the Calpont Command Console" << endl;
-                    exit (0);
-                }
-            }
-            catch (...)
-            {
-                cout << endl << "**** rebootsystem Failed : Failed on getSystemConfig API" << endl;
-                break;
-            }
-        }
-        break;
-
-        case 6: // rebootnode - parameters: module-name password
-        {
-            if ( !rootUser)
-            {
-                cout << endl << "**** rebootnode Failed : command not available when running as non-root user" << endl;
-                break;
-            }
-
-            if (arguments[1] == "" || arguments[2] == "")
-            {
-                // need arguments
-                cout << endl << "**** rebootnode Failed : Invalid or Missing Parameter, Enter module-name and root-password" << endl;
-                break;
-            }
-
-            string inputModuleName = arguments[1];
-            string password = arguments[2];
-
-            if ( arguments[3] != "y")
-            {
-                cout << endl << "!!!!! DESTRUCTIVE COMMAND !!!!!" << endl;
-                string warning = "This command reboots a node within the Calpont System";
-
-                // confirm request
-                if (confirmPrompt(warning))
-                    break;
-            }
-
-            SystemModuleTypeConfig systemmoduletypeconfig;
-            systemmoduletypeconfig.moduletypeconfig.clear();
-
-            try
-            {
-                oam.getSystemConfig(systemmoduletypeconfig);
-                unsigned int i = 0;
-
-                for (  ; i < systemmoduletypeconfig.moduletypeconfig.size(); i++)
-                {
-                    if ( systemmoduletypeconfig.moduletypeconfig[i].ModuleType.empty() )
-                    {
-                        // end of list
-                        break;
-                    }
-
-                    int moduleCount = systemmoduletypeconfig.moduletypeconfig[i].ModuleCount;
-                    string moduletype = systemmoduletypeconfig.moduletypeconfig[i].ModuleType;
-
-                    if ( moduleCount > 0 )
-                    {
-                        DeviceNetworkList::iterator pt = systemmoduletypeconfig.moduletypeconfig[i].ModuleNetworkList.begin();
-
-                        for ( ; pt != systemmoduletypeconfig.moduletypeconfig[i].ModuleNetworkList.end() ; pt++)
-                        {
-                            string modulename = (*pt).DeviceName;
-
-                            if (inputModuleName == modulename )
-                            {
-                                if (inputModuleName == localModule )
-                                {
-                                    //reboot local module
-                                    int rtnCode = system("reboot");
-
-                                    if (WEXITSTATUS(rtnCode) != 0)
-                                        cout << "Failed rebooting local node" << endl;
-                                    else
-                                    {
-                                        cout << endl << "   Successful reboot request of Node " << modulename << endl;
-                                        // close the log file
-                                        writeLog("End of a command session!!!");
-                                        logFile.close();
-                                        cout << endl << "Exiting the Calpont Command Console" << endl;
-                                        exit (0);
-                                    }
-                                }
-                                else
-                                {
-                                    HostConfigList::iterator pt1 = (*pt).hostConfigList.begin();
-                                    string ipAddr = (*pt1).IPAddr;
-                                    //run remote command script
-                                    string cmd = startup::StartUp::installDir() + "/bin/remote_command.sh " + ipAddr + " " + password + " reboot " ;
-                                    int rtnCode = system(cmd.c_str());
-
-                                    if (WEXITSTATUS(rtnCode) != 0)
-                                        cout << "Failed with running remote_command.sh" << endl;
-                                    else
-                                        cout << endl << "   Successful reboot request of Node " << modulename << endl;
-
-                                    return (0);
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-            catch (...)
-            {
-                cout << endl << "**** rebootnode Failed : Failed on getSystemConfig API" << endl;
-                break;
-            }
-        }
-        break;
-
-        case 7: // stopdbrmprocess
-        {
-            if ( arguments[1] != "y" )
-            {
-                // confirm request
-                if (confirmPrompt("This command stops the dbrm processes within the Calpont System"))
-                    break;
-            }
-
-            try
-            {
-                oam.stopProcessType("DBRM");
-                cout << endl << "   Successful stop of DBRM Processes" << endl << endl;
-            }
-            catch (exception& e)
-            {
-                cout << endl << "**** stopdbrmprocess Failed :  " << e.what() << endl;
-            }
-        }
-        break;
-
-        case 8: // startdbrmprocess
-        {
-            try
-            {
-                oam.startProcessType("DBRM");
-                cout << endl << "   Successful Start of DBRM Processes" << endl << endl;
-            }
-            catch (exception& e)
-            {
-                cout << endl << "**** startdbrmprocess Failed :  " << e.what() << endl;
-            }
-        }
-        break;
-
-        case 9: // restartdbrmprocess
-        {
-            if ( arguments[1] != "y" )
-            {
-                // confirm request
-                if (confirmPrompt("This command restarts the dbrm processes within the Calpont System"))
-                    break;
-            }
-
-            try
-            {
-                oam.restartProcessType("DBRM");
-                cout << endl << "   Successful Restart of DBRM Processes" << endl << endl;
-            }
-            catch (exception& e)
-            {
-                cout << endl << "**** restartdbrmprocess Failed :  " << e.what() << endl;
-            }
-        }
-        break;
-
-        case 10: // setsystemstartupstate
-        {
-            Config* sysConfig = Config::makeConfig();
-
-            parentOAMModule = getParentOAMModule();
-
-            if ( localModule != parentOAMModule )
-            {
-                // exit out since not on Parent OAM Module
-                cout << endl << "**** setsystemstartupstate Failed : only should be run on the Parent OAM Module, which is '" << parentOAMModule << "'" << endl;
-                break;
-            }
-
-            string systemStartupOffline;
-
-            try
-            {
-                systemStartupOffline = sysConfig->getConfig("Installation", "SystemStartupOffline");
-                cout << "SystemStartupOffline currently set to '" + systemStartupOffline + "'" << endl;
-            }
-            catch (...)
-            {
-                cout << "ERROR: Problem getting systemStartupOffline from the Calpont System Configuration file" << endl;
-                return 1;
-            }
-
-            while (true)
-            {
-                char* pcommand = 0;
-                string prompt;
-                string temp = "cancel";
-                prompt = "Set system startup state to offline: (y,n,cancel) [cancel]: ";
-                pcommand = readline(prompt.c_str());
-
-                if (pcommand)
-                {
-                    if (strlen(pcommand) > 0) temp = pcommand;
-
-                    free(pcommand);
-                    pcommand = 0;
-                }
-
-                if ( temp == "cancel" )
-                    return 0;
-
-                if ( temp == "n" || temp == "y")
-                {
-                    systemStartupOffline = temp;
-                    break;
-                }
-
-                cout << "Invalid Option, please re-enter" << endl;
-            }
-
-            try
-            {
-                sysConfig->setConfig("Installation", "SystemStartupOffline", systemStartupOffline);
-                sysConfig->write();
-            }
-            catch (...)
-            {
-                cout << "ERROR: Problem setting systemStartupOffline in the Calpont System Configuration file" << endl;
-                exit(-1);
-            }
-
-            cout << endl << "   Successful setting of systemStartupOffline to '" << systemStartupOffline << "'" << endl << endl;
-        }
-        break;
-
-        case 11: // stopPrimProcs
-        {
-            if ( arguments[1] != "y" )
-            {
-                // confirm request
-                if (confirmPrompt("This command stops the PrimProc processes within the Calpont System"))
-                    break;
-            }
-
-            try
-            {
-                oam.stopProcessType("PrimProc");
-                cout << endl << "   Successful stop of PrimProc Processes" << endl << endl;
-            }
-            catch (exception& e)
-            {
-                cout << endl << "**** stopPrimProcs Failed :  " << e.what() << endl;
-            }
-        }
-        break;
-
-        case 12: // startPrimProcs
-        {
-            try
-            {
-                oam.startProcessType("PrimProc");
-                cout << endl << "   Successful Start of PrimProc Processes" << endl << endl;
-            }
-            catch (exception& e)
-            {
-                cout << endl << "**** startPrimProcs Failed :  " << e.what() << endl;
-            }
-        }
-        break;
-
-        case 13: // restartPrimProcs
-        {
-            if ( arguments[1] != "y" )
-            {
-                // confirm request
-                if (confirmPrompt("This command restarts the PrimProc processes within the Calpont System"))
-                    break;
-            }
-
-            try
-            {
-                oam.restartProcessType("PrimProc");
-                cout << endl << "   Successful Restart of PrimProc Processes" << endl << endl;
-            }
-            catch (exception& e)
-            {
-                cout << endl << "**** restartPrimProcs Failed :  " << e.what() << endl;
-            }
-        }
-        break;
-
-        case 14: // stopExeMgrs
-        {
-            if ( arguments[1] != "y" )
-            {
-                // confirm request
-                if (confirmPrompt("This command stops the ExeMgr processes within the Calpont System"))
-                    break;
-            }
-
-            try
-            {
-                oam.stopProcessType("ExeMgr");
-                cout << endl << "   Successful stop of ExeMgr Processes" << endl << endl;
-            }
-            catch (exception& e)
-            {
-                cout << endl << "**** stopExeMgrs Failed :  " << e.what() << endl;
-            }
-        }
-        break;
-
-        case 15: // startExeMgrs
-        {
-            try
-            {
-                oam.startProcessType("ExeMgr");
-                cout << endl << "   Successful Start of ExeMgr Processes" << endl << endl;
-            }
-            catch (exception& e)
-            {
-                cout << endl << "**** startExeMgrs Failed :  " << e.what() << endl;
-            }
-        }
-        break;
-
-        case 16: // restartExeMgrs
-        {
-            if ( arguments[1] != "y" )
-            {
-                // confirm request
-                if (confirmPrompt("This command restarts the ExeMgr processes within the Calpont System"))
-                    break;
-            }
-
-            try
-            {
-                oam.restartProcessType("ExeMgr");
-                cout << endl << "   Successful Restart of ExeMgr Processes" << endl << endl;
-            }
-            catch (exception& e)
-            {
-                cout << endl << "**** restartExeMgrs Failed :  " << e.what() << endl;
-            }
-        }
-        break;
-
-        case 17: // getProcessStatusStandby - parameters: NONE
-        {
-            printProcessStatus("ProcStatusControlStandby");
-        }
-        break;
-
-        case 18: // distributeconfigfile - parameters: option, moduleName
-        {
-            string name = "system";
-
-            if ( arguments[1] != "" )
-                name = arguments[1];
-
-            try
-            {
-                oam.distributeConfigFile(name);
-                cout << endl << "   Successful Distribution of Calpont Config File" << endl << endl;
-            }
-            catch (exception& e)
-            {
-                cout << endl << "**** Distribution of Calpont Config File Failed :  " << e.what() << endl;
-            }
-        }
-        break;
-
-        case 19: // getPmDbrootConfig - paramaters: pm id
-        {
-            string pmID;
-
-            if (arguments[1] == "")
-            {
-                cout << endl;
-                string prompt = "Enter the Performance Module ID";
-                pmID = dataPrompt(prompt);
-            }
-            else
-                pmID = arguments[1];
-
-            try
-            {
-                DBRootConfigList dbrootConfigList;
-                oam.getPmDbrootConfig(atoi(pmID.c_str()), dbrootConfigList);
-
-                cout << "DBRoot IDs assigned to 'pm" + pmID + "' = ";
-
-                DBRootConfigList::iterator pt = dbrootConfigList.begin();
-
-                for ( ; pt != dbrootConfigList.end() ;)
-                {
-                    cout << oam.itoa(*pt);
-                    pt++;
-
-                    if (pt != dbrootConfigList.end())
-                        cout << ", ";
-                }
-
-                cout << endl;
-            }
-            catch (exception& e)
-            {
-                cout << endl << "**** getPmDbrootConfig Failed :  " << e.what() << endl;
-            }
-        }
-        break;
-
-        case 20: // getDbrootPmConfig - parameters dbroot id
-        {
-            string dbrootID;
-
-            if (arguments[1] == "")
-            {
-                cout << endl;
-                string prompt = "Enter the DBRoot ID";
-                dbrootID = dataPrompt(prompt);
-            }
-            else
-                dbrootID = arguments[1];
-
-            try
-            {
-                int pmID;
-                oam.getDbrootPmConfig(atoi(dbrootID.c_str()), pmID);
-
-                cout << endl << " DBRoot ID " << dbrootID << " is assigned to 'pm" << pmID << "'" << endl;
-            }
-            catch (exception& e)
-            {
-                cout << endl << "**** getDbrootPmConfig Failed :  " << e.what() << endl;
-            }
-        }
-        break;
-
-        case 21: // getSystemDbrootConfig
-        {
-            cout << endl << "System DBroot Configuration" << endl << endl;
-
-            try
-            {
-                DBRootConfigList dbrootConfigList;
-                oam.getSystemDbrootConfig(dbrootConfigList);
-
-                cout << "System DBRoot IDs = ";
-                DBRootConfigList::iterator pt = dbrootConfigList.begin();
-
-                for ( ; pt != dbrootConfigList.end() ;)
-                {
-                    cout << oam.itoa(*pt);
-                    pt++;
-
-                    if (pt != dbrootConfigList.end())
-                        cout << ", ";
-                }
-
-                cout << endl;
-            }
-            catch (exception& e)
-            {
-                cout << endl << "**** getSystemDbrootConfig Failed :  " << e.what() << endl;
-            }
-        }
-        break;
-
-        case 22: // checkDBFunctional
-        {
-            try
-            {
-                oam.checkDBFunctional(false);
-                cout << endl << "   checkDBFunctional Successful" << endl << endl;
-            }
-            catch (exception& e)
-            {
-                cout << endl << "**** checkDBFunctional Failed :  " << e.what() << endl;
-                cout << endl << "     can check UM /tmp/dbfunctional.log for possible additional information" << endl << endl;
-            }
-            catch (...)
-            {
-                cout << endl << "   checkDBFunctional Failed: check UM /tmp/dbfunctional.log" << endl << endl;
-            }
-        }
-        break;
-
-        case 23: // getsystemreadflags
-        {
-
-            cout << " Print the DB System Flags. 1 = set and ready, 0 = clear and not ready" << endl;
-
-            BRM::DBRM dbrm;
-
-            cout << endl;
-
-            try
-            {
-                cout << "getSystemQueryReady = " << dbrm.getSystemQueryReady() << endl;
-            }
-            catch (...)
-            {}
-
-            try
-            {
-                cout << "getSystemReady = " << dbrm.getSystemReady() << endl;
-            }
-            catch (...)
-            {}
-
-            try
-            {
-                cout << "getSystemSuspended = " << dbrm.getSystemSuspended() << endl;
-            }
-            catch (...)
-            {}
-        }
-        break;
-
-        case 24: // setsystemqueryready
-        {
-            BRM::DBRM dbrm;
-
-            string set = "0";
-
-            if (arguments[1] == "")
-            {
-                cout << endl;
-                string prompt = "Enter 1 for set and 0 for clear";
-                set = dataPrompt(prompt);
-            }
-            else
-                set = arguments[1];
-
-            bool flag = true;
-
-            if ( set == "0" )
-                flag = false;
-
-            cout << endl;
-
-            try
-            {
-                cout << "getSystemQueryReady = " << dbrm.getSystemQueryReady() << endl;
-            }
-            catch (...)
-            {}
-
-            cout << endl;
-
-            try
-            {
-                dbrm.setSystemQueryReady(flag);
-                cout << "setSystemQueryReady = " << flag << endl;
-            }
-            catch (...)
-            {}
-
-            cout << endl;
-
-            try
-            {
-                cout << "getSystemQueryReady = " << dbrm.getSystemQueryReady() << endl;
-            }
-            catch (...)
-            {}
-        }
-
-        default: // shouldn't get here, but...
-            return 1;
-
-    } // end of switch
-
-    return 0;
-}
-
-/******************************************************************************************
- * @brief	getFlags
- *
- * purpose:	get and convert Graceful and Ack flags
- *
- ******************************************************************************************/
-void getFlags(const string* arguments, GRACEFUL_FLAG& gracefulTemp, ACK_FLAG& ackTemp, oam::CC_SUSPEND_ANSWER& suspendAnswer, bool& bNeedsConfirm, string* password)
-{
-    gracefulTemp = GRACEFUL;                      // default
-    ackTemp = ACK_YES;                             // default
-    suspendAnswer = CANCEL;
-    bNeedsConfirm = true;
-
-    for ( int i = 1; i < ArgNum; i++)
-    {
-        if (strcasecmp(arguments[i].c_str(), "Y") == 0)
-            bNeedsConfirm = false;
-        else if (strcasecmp(arguments[i].c_str(), "N") == 0)
-            bNeedsConfirm = true;
-        else if (strcasecmp(arguments[i].c_str(), "GRACEFUL") == 0)
-            gracefulTemp = oam::GRACEFUL;
-        else if (strcasecmp(arguments[i].c_str(), "FORCEFUL") == 0)
-            gracefulTemp = FORCEFUL;
-        else if (strcasecmp(arguments[i].c_str(), "INSTALL") == 0)
-            gracefulTemp = INSTALL;
-        else if (strcasecmp(arguments[i].c_str(), "ACK_YES") == 0 || strcasecmp(arguments[i].c_str(), "YES_ACK") == 0)
-            ackTemp = ACK_YES;
-        else if (strcasecmp(arguments[i].c_str(), "ACK_NO") == 0 || strcasecmp(arguments[i].c_str(), "NO_ACK") == 0)
-            ackTemp = ACK_NO;
-        else if (strcasecmp(arguments[i].c_str(), "WAIT") == 0)
-            suspendAnswer = WAIT;
-        else if (strcasecmp(arguments[i].c_str(), "ROLLBACK") == 0)
-            suspendAnswer = ROLLBACK;
-        else if (strcasecmp(arguments[i].c_str(), "FORCE") == 0)
-            suspendAnswer = FORCE;
-        else if (password && arguments[i].length() > 0)
-            *password = arguments[i];
-    }
-}
-
-
-/******************************************************************************************
- * @brief	confirmPrompt
- *
- * purpose:	Confirmation prompt
- *
- ******************************************************************************************/
-int confirmPrompt(std::string warningCommand)
-{
-    char* pcommand = 0;
-    char* p;
-    string argument = "n";
-
-    while (true)
-    {
-        // read input
-        if (warningCommand.size() > 0)
-        {
-            cout << endl << warningCommand << endl;
-        }
-
-        pcommand = readline("           Do you want to proceed: (y or n) [n]: ");
-
-        if (pcommand && *pcommand)
-        {
-            p = strtok(pcommand, " ");
-            argument = p;
-            free(pcommand);
-            pcommand = 0;
-        }
-
-        if (pcommand)
-        {
-            free(pcommand);
-            pcommand = 0;
-        }
-
-        // covert argument into lowercase
-        transform (argument.begin(), argument.end(), argument.begin(), to_lower());
-
-        if ( argument == "y")
-            return 0;
-        else if ( argument == "n")
-            return 1;
-    }
-}
-
-/******************************************************************************************
- * @brief	dataPrompt
- *
- * purpose:	Prompt for additional data
- *
- ******************************************************************************************/
-std::string dataPrompt(std::string promptCommand)
-{
-    char data[CmdSize];
-    char* pdata = data;
-    char* pd;
-    string argument;
-
-    while (true)
-    {
-        // read input
-        cout << promptCommand << endl;
-        pdata = readline("           Please enter: ");
-
-        if (!pdata)                            // user hit <Ctrl>-D
-            pdata = strdup("exit");
-
-        else if (!*pdata)
-            // just an enter-key was entered, ignore and reprompt
-            continue;
-
-        pd = pdata;
-        argument = pd;
-
-        return argument;
-    }
-}
-
-
-/******************************************************************************************
- * @brief	writeLog for command
- *
- * purpose:	write command to the log file
- *
- ******************************************************************************************/
-void writeLog(string command)
-{
-    Oam oam;
-
-    //filter off password on reboot commands
-
-    logFile << oam.getCurrentTime() << ": " << command << endl;
-    logFile.flush();
-    return;
-}
-
-/******************************************************************************************
- * @brief	printAlarmSummary
- *
- * purpose:	get active alarms and produce a summary
- *
- ******************************************************************************************/
-void printAlarmSummary()
-{
-    AlarmList alarmList;
-    Oam oam;
-
-    try
-    {
-        oam.getActiveAlarms(alarmList);
-    }
-    catch (...)
-    {
-        return;
-    }
-
-    int critical = 0, major = 0, minor = 0, warning = 0, info = 0;
-    AlarmList :: iterator i;
-
-    for (i = alarmList.begin(); i != alarmList.end(); ++i)
-    {
-        switch (i->second.getSeverity())
-        {
-            case CRITICAL:
-                ++critical;
-                break;
-
-            case MAJOR:
-                ++major;
-                break;
-
-            case MINOR:
-                ++minor;
-                break;
-
-            case WARNING:
-                ++warning;
-                break;
-
-            case INFORMATIONAL:
-                ++info;
-                break;
-        }
-    }
-
-    cout << endl << "Active Alarm Counts: ";
-    cout << "Critical = " << critical;
-    cout << ", Major = " << major;
-    cout << ", Minor = " << minor;
-    cout << ", Warning = " << warning;
-    cout << ", Info = " << info;
-    cout << endl;
-}
-
-/******************************************************************************************
- * @brief	printCriticalAlarms
- *
- * purpose:	get active Critical alarms
- *
- ******************************************************************************************/
-void printCriticalAlarms()
-{
-    AlarmList alarmList;
-    Oam oam;
-
-    try
-    {
-        oam.getActiveAlarms(alarmList);
-    }
-    catch (...)
-    {
-        return;
-    }
-
-    cout << endl << "Critical Active Alarms:" << endl << endl;
-
-    AlarmList :: iterator i;
-
-    for (i = alarmList.begin(); i != alarmList.end(); ++i)
-    {
-        switch (i->second.getSeverity())
-        {
-            case CRITICAL:
-                cout << "AlarmID           = " << i->second.getAlarmID() << endl;
-                cout << "Brief Description = " << i->second.getDesc() << endl;
-                cout << "Alarm Severity    = ";
-                cout << "CRITICAL" << endl;
-                cout << "Time Issued       = " << i->second.getTimestamp() << endl;
-                cout << "Reporting Module  = " << i->second.getSname() << endl;
-                cout << "Reporting Process = " << i->second.getPname() << endl;
-                cout << "Reported Device   = " << i->second.getComponentID() << endl << endl;
-                break;
-
-            case MAJOR:
-            case MINOR:
-            case WARNING:
-            case INFORMATIONAL:
-                break;
-        }
-    }
-}
-
-/******************************************************************************************
- * @brief	printSystemStatus
- *
- * purpose:	get and Display System and Module Statuses
- *
- ******************************************************************************************/
-void printSystemStatus()
-{
-    SystemStatus systemstatus;
-    Oam oam;
-    BRM::DBRM dbrm(true);
-
-    cout << endl << "System " << systemName << endl << endl;
-    cout << "System and Module statuses" << endl << endl;
-    cout << "Component     Status                       Last Status Change" << endl;
-    cout << "------------  --------------------------   ------------------------" << endl;
-
-    try
-    {
-        oam.getSystemStatus(systemstatus, false);
-        cout << "System        ";
-        cout.setf(ios::left);
-        cout.width(29);
-        int state = systemstatus.SystemOpState;
-        string extraInfo = " ";
-        bool bRollback = false;
-        bool bForce = false;
-
-        if (dbrm.isDBRMReady())
-        {
-            if (dbrm.getSystemSuspended() > 0)
-            {
-                extraInfo = " WRITE SUSPENDED";
-            }
-            else if (dbrm.getSystemSuspendPending(bRollback) > 0)
-            {
-                extraInfo = " WRITE SUSPEND PENDING";
-            }
-            else if (dbrm.getSystemShutdownPending(bRollback, bForce) > 0)
-            {
-                extraInfo = " SHUTDOWN PENDING";
-            }
-        }
-
-        printState(state, extraInfo);
-        cout.width(24);
-        string stime = systemstatus.StateChangeDate;
-        stime = stime.substr (0, 24);
-        cout << stime << endl << endl;
-
-        for ( unsigned int i = 0 ; i < systemstatus.systemmodulestatus.modulestatus.size(); i++)
-        {
-            if ( systemstatus.systemmodulestatus.modulestatus[i].Module.empty() )
-                // end of list
-                break;
-
-            cout << "Module ";
-            cout.setf(ios::left);
-            cout.width(7);
-            cout << systemstatus.systemmodulestatus.modulestatus[i].Module;
-            cout.width(29);
-            state = systemstatus.systemmodulestatus.modulestatus[i].ModuleOpState;
-
-            // get NIC functional state (degraded or not)
-            bool degraded = false;
-
-            try
-            {
-                int state;
-                oam.getModuleStatus(systemstatus.systemmodulestatus.modulestatus[i].Module, state, degraded);
-            }
-            catch (...)
-            {}
-
-            string nicFun = " ";
-
-            if (degraded)
-                nicFun = "/" + DEGRADEDSTATE;
-
-            printState(state, nicFun);
-
-            cout.width(24);
-            string stime = systemstatus.systemmodulestatus.modulestatus[i].StateChangeDate ;
-            stime = stime.substr (0, 24);
-            cout << stime << endl;
-        }
-
-        cout << endl;
-
-        if ( systemstatus.systemmodulestatus.modulestatus.size() > 1)
-        {
-            // get and display Parent OAM Module
-            cout << "Active Parent OAM Performance Module is '" << getParentOAMModule() << "'" << endl;
-
-            //display Primary UM Module
-            string PrimaryUMModuleName;
-
-            try
-            {
-                oam.getSystemConfig("PrimaryUMModuleName", PrimaryUMModuleName);
-            }
-            catch (...) {}
-
-            if ( serverInstallType != oam::INSTALL_COMBINE_DM_UM_PM )
-            {
-                ModuleTypeConfig moduletypeconfig;
-
-                try
-                {
-                    oam.getSystemConfig("um", moduletypeconfig);
-                }
-                catch (...)
-                {}
-
-                if ( moduletypeconfig.ModuleCount > 1 )
-                {
-                    if ( PrimaryUMModuleName != oam::UnassignedName )
-                        cout << "Primary Front-End MySQL Module is '" << PrimaryUMModuleName << "'" << endl;
-                }
-            }
-            else
-            {
-                if ( PrimaryUMModuleName != oam::UnassignedName )
-                    cout << "Primary Front-End MySQL Module is '" << PrimaryUMModuleName << "'" << endl;
-            }
-        }
-
-        //display local Query / PMwithUM feature, if enabled
-        string PMwithUM;
-
-        try
-        {
-            oam.getSystemConfig("PMwithUM", PMwithUM);
-        }
-        catch (...) {}
-
-        if ( PMwithUM == "y" )
-            cout << "Local Query Feature is enabled" << endl;
-
-        //display MySQL replication feature, if enabled
-        string MySQLRep;
-
-        try
-        {
-            oam.getSystemConfig("MySQLRep", MySQLRep);
-        }
-        catch (...) {}
-
-        if ( MySQLRep == "y" )
-            cout << "MySQL Replication Feature is enabled" << endl << endl;
-    }
-    catch (exception& e)
-    {
-        cout << endl << "**** printSystemStatus Failed =  " << e.what() << endl;
-        throw runtime_error("");
-    }
-}
-
-/******************************************************************************************
- * @brief	printProcessStatus
- *
- * purpose:	get and Display Process Statuses
- *
- ******************************************************************************************/
-void printProcessStatus(std::string port)
-{
-    SystemProcessStatus systemprocessstatus;
-    ProcessStatus processstatus;
-    ModuleTypeConfig moduletypeconfig;
-    Oam oam;
-    BRM::DBRM dbrm(true);
-
-    int state;
-    string extraInfo = " ";
-    bool bRollback = false;
-    bool bForce = false;
-    bool bSuspend = false;
-
-    if (dbrm.isDBRMReady())
-    {
-        if (dbrm.getSystemSuspended() > 0)
-        {
-            bSuspend = true;
-            extraInfo = "WRITE_SUSPEND";
-        }
-        else if (dbrm.getSystemSuspendPending(bRollback) > 0)
-        {
-            bSuspend = true;
-
-            if (bRollback)
-            {
-                extraInfo = "ROLLBACK";
-            }
-            else
-            {
-                extraInfo = "SUSPEND_PENDING";
-            }
-        }
-        else if (dbrm.getSystemShutdownPending(bRollback, bForce) > 0)
-        {
-            bSuspend = true;
-
-            if (bRollback)
-            {
-                extraInfo = "ROLLBACK";
-            }
-            else
-            {
-                extraInfo = "SHUTDOWN_PENDING";
-            }
-        }
-    }
-
-    cout << endl << "Calpont Process statuses" << endl << endl;
-    cout << "Process             Module    Status            Last Status Change        Process ID" << endl;
-    cout << "------------------  ------    ---------------   ------------------------  ----------" << endl;
-
-    try
-    {
-        oam.getProcessStatus(systemprocessstatus, port);
-
-        string prevModule = systemprocessstatus.processstatus[0].Module;
-
-        for ( unsigned int i = 0 ; i < systemprocessstatus.processstatus.size(); i++)
-        {
-            if ( prevModule != systemprocessstatus.processstatus[i].Module)
-                cout << endl;	//added a space line between different modules
-
-            cout.setf(ios::left);
-            cout.width(20);
-            cout << systemprocessstatus.processstatus[i].ProcessName;
-            cout.width(10);
-            cout << systemprocessstatus.processstatus[i].Module;
-            cout.width(18);
-            state = systemprocessstatus.processstatus[i].ProcessOpState;
-
-            // For these processes, if state is ACTIVE and we're in write
-            // suspend, then we want to display the extra data instead of state.
-            // Otherwise, we ignore extra data and display state.
-            if (state == ACTIVE && bSuspend &&
-                    (   systemprocessstatus.processstatus[i].ProcessName == "DMLProc"
-                        || systemprocessstatus.processstatus[i].ProcessName == "DDLProc"
-                        || systemprocessstatus.processstatus[i].ProcessName == "WriteEngineServer"))
-            {
-                printState(LEAVE_BLANK, extraInfo);
-            }
-            else
-            {
-                state = systemprocessstatus.processstatus[i].ProcessOpState;
-                printState(state, " ");
-            }
-
-            cout.width(24);
-            string stime = systemprocessstatus.processstatus[i].StateChangeDate ;
-            stime = stime.substr (0, 24);
-            cout << stime;
-
-            if ( state == COLD_STANDBY )
-            {
-                cout << endl;
-                continue;
-            }
-            else
-            {
-                cout.setf(ios::right);
-                cout.width(12);
-
-                if ( systemprocessstatus.processstatus[i].ProcessID != 0 )
-                    cout << systemprocessstatus.processstatus[i].ProcessID << endl;
-                else
-                    cout << endl;
-            }
-
-            cout.unsetf(ios::right);
-
-            prevModule = systemprocessstatus.processstatus[i].Module;
-
-        }
-    }
-    catch (exception& e)
-    {
-        cout << endl << "**** printProcessStatus Failed =  " << e.what() << endl;
-        throw runtime_error("");
-    }
-}
-
-/******************************************************************************************
- * @brief	printModuleCpuUsers
- *
- * purpose:	get and Display Module TOP CPU users
- *
- ******************************************************************************************/
-void printModuleCpuUsers(TopProcessCpuUsers topprocesscpuusers)
-{
-    cout << "Module '" + topprocesscpuusers.ModuleName + "' Top CPU Users" << endl << endl;
-    cout << "Process             CPU Usage %" << endl;
-    cout << "-----------------   -----------" << endl;
-
-    for ( unsigned int i = 0 ; i < topprocesscpuusers.processcpuuser.size(); i++)
-    {
-        cout.setf(ios::left);
-        cout.width(25);
-        cout << topprocesscpuusers.processcpuuser[i].ProcessName;
-        cout.width(10);
-        cout << topprocesscpuusers.processcpuuser[i].CpuUsage << endl;
-    }
-
-    cout << endl;
-}
-
-/******************************************************************************************
- * @brief	printModuleCpu
- *
- * purpose:	get and Display Module CPU Usage
- *
- ******************************************************************************************/
-void printModuleCpu(ModuleCpu modulecpu)
-{
-    Oam oam;
-
-    cout << endl << "Module '" + modulecpu.ModuleName + "' CPU Usage % = " + oam.itoa(modulecpu.CpuUsage) << endl;
-}
-
-/******************************************************************************************
- * @brief	printModuleMemoryUsers
- *
- * purpose:	get and Display Module TOP Memory users
- *
- ******************************************************************************************/
-void printModuleMemoryUsers(TopProcessMemoryUsers topprocessmemoryusers)
-{
-    cout << "Module '" + topprocessmemoryusers.ModuleName + "' Top Memory Users (in bytes)" << endl << endl;
-    cout << "Process             Memory Used  Memory Usage %" << endl;
-    cout << "-----------------   -----------  --------------" << endl;
-
-    for ( unsigned int i = 0 ; i < topprocessmemoryusers.processmemoryuser.size(); i++)
-    {
-        cout.setf(ios::left);
-        cout.width(20);
-        cout << topprocessmemoryusers.processmemoryuser[i].ProcessName;
-        cout.width(19);
-        cout << topprocessmemoryusers.processmemoryuser[i].MemoryUsed;
-        cout.width(3);
-        cout << topprocessmemoryusers.processmemoryuser[i].MemoryUsage << endl;
-    }
-
-    cout << endl;
-}
-
-/******************************************************************************************
- * @brief	printModuleMemory
- *
- * purpose:	get and Display Module Memory Usage
- *
- ******************************************************************************************/
-void printModuleMemory(ModuleMemory modulememory)
-{
-    Oam oam;
-    cout.setf(ios::left);
-    cout.width(8);
-    cout << modulememory.ModuleName;
-    cout.width(11);
-    cout << oam.itoa(modulememory.MemoryTotal);
-    cout.width(10);
-    cout << oam.itoa(modulememory.MemoryUsed);
-    cout.width(13);
-    cout << oam.itoa(modulememory.cache);
-    cout.width(9);
-    cout << oam.itoa(modulememory.MemoryUsage);
-    cout.width(12);
-    cout << oam.itoa(modulememory.SwapTotal);
-    cout.width(16);
-    cout << oam.itoa(modulememory.SwapUsed);
-    cout.width(7);
-    cout << oam.itoa(modulememory.SwapUsage);
-    cout << endl;
-}
-
-/******************************************************************************************
- * @brief	printModuleDisk
- *
- * purpose:	get and Display Module disk usage
- *
- ******************************************************************************************/
-void printModuleDisk(ModuleDisk moduledisk)
-{
-    Oam oam;
-
-    cout << "Module '" + moduledisk.ModuleName + "' Disk Usage (in 1K blocks)" << endl << endl;
-    cout << "Mount Point                    Total Blocks  Used Blocks   Usage %" << endl;
-    cout << "-----------------------------  ------------  ------------  -------" << endl;
-
-    string etcdir = startup::StartUp::installDir() + "/etc";
-
-    for ( unsigned int i = 0 ; i < moduledisk.diskusage.size(); i++)
-    {
-        //skip mounts to other server disk
-        if ( moduledisk.diskusage[i].DeviceName.find("/mnt", 0) == string::npos &&
-                moduledisk.diskusage[i].DeviceName.find(etcdir, 0) == string::npos )
-        {
-            cout.setf(ios::left);
-            cout.width(31);
-            cout << moduledisk.diskusage[i].DeviceName;
-            cout.width(14);
-            cout << moduledisk.diskusage[i].TotalBlocks;
-            cout.width(17);
-            cout << moduledisk.diskusage[i].UsedBlocks;
-            cout.width(2);
-            cout << moduledisk.diskusage[i].DiskUsage << endl;
-        }
-    }
-
-    cout << endl;
-}
-
-/******************************************************************************************
- * @brief	printModuleResources
- *
- * purpose:	get and Display Module resource usage
- *
- ******************************************************************************************/
-void printModuleResources(TopProcessCpuUsers topprocesscpuusers, ModuleCpu modulecpu, TopProcessMemoryUsers topprocessmemoryusers, ModuleMemory modulememory, ModuleDisk moduledisk)
-{
-    Oam oam;
-    string etcdir = startup::StartUp::installDir() + "/etc";
-
-    cout << endl << "Module '" + topprocesscpuusers.ModuleName + "' Resource Usage" << endl << endl;
-
-    cout << "CPU: " + oam.itoa(modulecpu.CpuUsage) << "% Usage" << endl;
-
-    cout << "Mem:  " << oam.itoa(modulememory.MemoryTotal) << "k total, " << oam.itoa(modulememory.MemoryUsed);
-    cout << "k used, " << oam.itoa(modulememory.cache) << "k cache, " << oam.itoa(modulememory.MemoryUsage) << "% Usage" << endl;
-    cout << "Swap: " << oam.itoa(modulememory.SwapTotal) << " k total, " << oam.itoa(modulememory.SwapUsed);
-    cout << "k used, " << oam.itoa(modulememory.SwapUsage) << "% Usage" << endl;
-
-    cout << "Top CPU Process Users: ";
-
-    for ( unsigned int i = 0 ; i < topprocesscpuusers.processcpuuser.size(); i++)
-    {
-        cout << topprocesscpuusers.processcpuuser[i].ProcessName << " ";
-        cout << topprocesscpuusers.processcpuuser[i].CpuUsage;
-
-        if ( i + 1 != topprocesscpuusers.processcpuuser.size() )
-            cout << "%, ";
-        else
-            cout << "%";
-    }
-
-    cout << endl;
-
-    cout << "Top Memory Process Users: ";
-
-    for ( unsigned int i = 0 ; i < topprocessmemoryusers.processmemoryuser.size(); i++)
-    {
-        cout << topprocessmemoryusers.processmemoryuser[i].ProcessName << " ";
-        cout << topprocessmemoryusers.processmemoryuser[i].MemoryUsage;
-
-        if ( i + 1 != topprocessmemoryusers.processmemoryuser.size() )
-            cout << "%, ";
-        else
-            cout << "%";
-    }
-
-    cout << endl;
-
-    cout << "Disk Usage: ";
-
-    for ( unsigned int i = 0 ; i < moduledisk.diskusage.size(); i++)
-    {
-        //skip mounts to other server disk
-        if ( moduledisk.diskusage[i].DeviceName.find("/mnt", 0) == string::npos &&
-                moduledisk.diskusage[i].DeviceName.find(etcdir, 0) == string::npos )
-        {
-            cout << moduledisk.diskusage[i].DeviceName << " ";
-            cout << moduledisk.diskusage[i].DiskUsage;
-
-            if ( i + 1 != moduledisk.diskusage.size() )
-                cout << "%, ";
-            else
-                cout << "%";
-        }
-    }
-
-    cout << endl << endl;
-}
-
-/******************************************************************************************
- * @brief	printModuleResources
- *
- * purpose:	get and Display Module resource usage
- *
- ******************************************************************************************/
-void printState(int state, std::string addInfo)
-{
-    switch (state)
-    {
-        case MAN_OFFLINE:
-            cout << MANOFFLINE + addInfo;
-            break;
-
-        case AUTO_OFFLINE:
-            cout << AUTOOFFLINE + addInfo;
-            break;
-
-        case MAN_INIT:
-            cout << MANINIT + addInfo;
-            break;
-
-        case AUTO_INIT:
-            cout << AUTOINIT + addInfo;
-            break;
-
-        case ACTIVE:
-            cout << ACTIVESTATE + addInfo;
-            break;
-
-        case LEAVE_BLANK:
-            cout << addInfo;
-            break;
-
-        case STANDBY:
-            cout << STANDBYSTATE + addInfo;
-            break;
-
-        case FAILED:
-            cout << FAILEDSTATE + addInfo;
-            break;
-
-        case UP:
-            cout << UPSTATE + addInfo;
-            break;
-
-        case DOWN:
-            cout << DOWNSTATE + addInfo;
-            break;
-
-        case COLD_STANDBY:
-            cout << COLDSTANDBYSTATE + addInfo;
-            break;
-
-        case INITIAL:
-            cout << INITIALSTATE + addInfo;
-            break;
-
-        case MAN_DISABLED:
-            cout << MANDISABLEDSTATE + addInfo;
-            break;
-
-        case AUTO_DISABLED:
-            cout << AUTODISABLEDSTATE + addInfo;
-            break;
-
-        case STANDBY_INIT:
-            cout << STANDBYINIT + addInfo;
-            break;
-
-        case BUSY_INIT:
-            cout << BUSYINIT + addInfo;
-            break;
-
-        case DEGRADED:
-            cout << DEGRADEDSTATE + addInfo;
-            break;
-
-        default:
-            cout << INITIALSTATE + addInfo;
-            break;
-    }
-}
-
-/******************************************************************************************
- * @brief	checkPromptThread
- *
- * purpose:	check for exit out of repeat command
- *
- ******************************************************************************************/
-static void checkPromptThread()
-{
-    char* pcommand = 0;
-
-    while (true)
-    {
-        // check input
-        pcommand = readline("");
-
-        if (!pcommand)                          // user hit <Ctrl>-D
-        {
-            repeatStop = true;
-            break;
-        }
-
-        free(pcommand);
-        pcommand = 0;
-    }
-
-    pthread_exit(0);
-    return;
-}
-
-/******************************************************************************************
- * @brief	getParentOAMModule
- *
- * purpose:	get Parent OAm Module name
- *
- ******************************************************************************************/
-std::string getParentOAMModule()
-{
-    Oam oam;
-
-    // Get Parent OAM module Name
-    try
-    {
-        string parentOAMModule;
-        oam.getSystemConfig("ParentOAMModuleName", parentOAMModule);
-        return parentOAMModule;
-    }
-    catch (...)
-    {
-        cout << endl << "**** Failed : Failed to read Parent OAM Module Name" << endl;
-        exit(-1);
-    }
-}
-
-/******************************************************************************************
- * @brief	checkForDisabledModules
- *
- * purpose:	Chcek and report any modules in a disabled state
- *
- ******************************************************************************************/
-bool checkForDisabledModules()
-{
-
-    SystemModuleTypeConfig systemmoduletypeconfig;
-    Oam oam;
-
-    try
-    {
-        oam.getSystemConfig(systemmoduletypeconfig);
-    }
-    catch (...)
-    {
-        return false;
-    }
-
-    bool found = false;
-    bool dbroot = false;
-
-    for ( unsigned int i = 0 ; i < systemmoduletypeconfig.moduletypeconfig.size(); i++)
-    {
-        int moduleCount = systemmoduletypeconfig.moduletypeconfig[i].ModuleCount;
-
-        if ( moduleCount == 0)
-            continue;
-
-        string moduleType = systemmoduletypeconfig.moduletypeconfig[i].ModuleType;
-
-        DeviceNetworkList::iterator pt = systemmoduletypeconfig.moduletypeconfig[i].ModuleNetworkList.begin();
-
-        for ( ; pt != systemmoduletypeconfig.moduletypeconfig[i].ModuleNetworkList.end(); pt++)
-        {
-            string moduleName = (*pt).DeviceName;
-
-            // report DISABLED modules
-            try
-            {
-                int opState;
-                bool degraded;
-                oam.getModuleStatus(moduleName, opState, degraded);
-
-                if (opState == oam::MAN_DISABLED || opState == oam::AUTO_DISABLED)
-                {
-                    if (!found)
-                    {
-                        cout << "   NOTE: These module(s) are DISABLED: ";
-                        found = true;
-                    }
-
-                    cout << moduleName << " ";
-
-                    if ( moduleType == "um" )
-                        continue;
-
-                    //check if module has any dbroots assigned to it
-                    string PMID = moduleName.substr(MAX_MODULE_TYPE_SIZE, MAX_MODULE_ID_SIZE);;
-                    DBRootConfigList dbrootConfigList;
-
-                    try
-                    {
-                        oam.getPmDbrootConfig(atoi(PMID.c_str()), dbrootConfigList);
-
-                        if ( dbrootConfigList.size() != 0 )
-                            dbroot = true;
-                    }
-                    catch (exception& e)
-                    {}
-                }
-            }
-            catch (...)
-            {}
-        }
-    }
-
-    if (found)
-        cout << endl << endl;
-
-    if (dbroot)
-        return false;
-
-    return true;
-}
-
-/** @brief Ask the user for cancel/wait/rollback/force
- *
- *  When a Shutdown, stop, restart or suspend operation is
- *  requested but there are active transactions of some sort,
- *  we ask the user what to do.
- */
-CC_SUSPEND_ANSWER AskSuspendQuestion(int CmdID)
-{
-    char* szAnswer = 0;
-    char* p;
-    string argument = "cancel";
-
-    const char* szCommand = "Unknown";
-
-    switch (CmdID)
-    {
-        case 16:
-            szCommand = "stop";
-            break;
-
-        case 17:
-            szCommand = "shutdown";
-            break;
-
-        case 19:
-            szCommand = "restart";
-            break;
-
-        case 28:
-            szCommand = "switch parent oam";
-            break;
-
-        case 32:
-            szCommand = "suspend";
-            break;
-
-        default:
-            return CANCEL;
-            break;
-    }
-
-    cout << "Your options are:" << endl
-         << "    Cancel    -- Cancel the " << szCommand << " request" << endl
-         << "    Wait      -- Wait for write operations to end and then " << szCommand << endl;
-
-//		 << "    Rollback  -- Rollback all transactions and then " << szCommand << endl;
-    if (CmdID != 28 && CmdID != 32)
-    {
-        cout << "    Force     -- Force a " << szCommand << endl;
-    }
-
-    while (true)
-    {
-        argument = "cancel";
-        // read input
-        szAnswer = readline("What would you like to do: [Cancel]: ");
-
-        if (szAnswer && *szAnswer)
-        {
-            p = strtok(szAnswer, " ");
-            argument = p;
-            free(szAnswer);
-            szAnswer = 0;
-        }
-
-        // In case they just hit return.
-        if (szAnswer)
-        {
-            free(szAnswer);
-            szAnswer = 0;
-        }
-
-        // convert argument into lowercase
-        transform(argument.begin(), argument.end(), argument.begin(), to_lower());
-
-        if ( argument == "cancel")
-        {
-            return CANCEL;
-        }
-        else if ( argument == "wait")
-        {
-            return WAIT;
-        }
-//		else if( argument == "rollback")
-//		{
-//			return ROLLBACK;
-//		}
-        else if ( argument == "force" && (CmdID == 16 || CmdID == 17 || CmdID == 19))
-        {
-            return FORCE;
-        }
-        else
-        {
-            cout << argument << " is an invalid response" << endl;
-        }
-    }
-}
-
-// vim:ts=4 sw=4:
-
diff --git a/oamapps/calpontConsole/calpontConsole.h b/oamapps/calpontConsole/calpontConsole.h
deleted file mode 100644
index 11613358f..000000000
--- a/oamapps/calpontConsole/calpontConsole.h
+++ /dev/null
@@ -1,135 +0,0 @@
-/* Copyright (C) 2014 InfiniDB, Inc.
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License
-   as published by the Free Software Foundation; version 2 of
-   the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-   MA 02110-1301, USA. */
-
-/******************************************************************************************
- * $Id: calpontConsole.h 3071 2013-04-04 18:45:53Z rdempsey $
- *
- ******************************************************************************************/
-/**
- * @file
- */
-#ifndef CALPONTCONSOLE_H
-#define CALPONTCONSOLE_H
-
-#include <iostream>
-#include <fstream>
-#include <cstdlib>
-#include <string>
-#include <limits.h>
-#include <sstream>
-#include <exception>
-#include <stdexcept>
-#include <vector>
-#include <stdio.h>
-#include <ctype.h>
-#include <sys/signal.h>
-#include <sys/types.h>
-#include <readline/readline.h>
-#include <readline/history.h>
-#include <time.h>
-#include <pthread.h>
-#include <errno.h>
-
-#include "liboamcpp.h"
-#include "configcpp.h"
-#include "alarmmanager.h"
-#include "alarmglobal.h"
-#include "calpontsystemcatalog.h"
-#include "brmtypes.h"
-
-
-const int CmdSize = 80;
-const int ArgNum = 10;
-const int DescNumMax = 10;
-const int cmdNum = 68;
-
-const std::string  DEFAULT_LOG_FILE = "/var/log/mariadb/columnstore/uiCommands.log";
-std::ofstream   logFile;
-
-/**
- * write the command to the log file
- */
-void    writeLog(std::string command);
-
-/** @brief location of the Process Configuration file
- */
-const std::string ConsoleCmdsFile = "ConsoleCmds.xml";
-
-void getFlags(const std::string* arguments, oam::GRACEFUL_FLAG& gracefulTemp, oam::ACK_FLAG& ackTemp, oam::CC_SUSPEND_ANSWER& suspendAnswer, bool& bNeedsConfirm, std::string* password = NULL);
-int confirmPrompt(std::string warningCommand);
-std::string dataPrompt(std::string promptCommand);
-int processCommand(std::string*);
-int ProcessSupportCommand(int CommandID, std::string arguments[]);
-void printAlarmSummary();
-void printCriticalAlarms();
-void checkRepeat(std::string*, int);
-void printSystemStatus();
-void printProcessStatus(std::string port = "ProcStatusControl");
-void printModuleCpuUsers(oam::TopProcessCpuUsers topprocesscpuusers);
-void printModuleCpu(oam::ModuleCpu modulecpu);
-void printModuleMemoryUsers(oam::TopProcessMemoryUsers topprocessmemoryusers);
-void printModuleMemory(oam::ModuleMemory modulememory);
-void printModuleDisk(oam::ModuleDisk moduledisk);
-void printModuleResources(oam::TopProcessCpuUsers topprocesscpuusers, oam::ModuleCpu modulecpu, oam::TopProcessMemoryUsers topprocessmemoryusers, oam::ModuleMemory modulememory, oam::ModuleDisk moduledisk);
-void printState(int state, std::string addInfo);
-std::string getParentOAMModule();
-bool checkForDisabledModules();
-oam::CC_SUSPEND_ANSWER AskSuspendQuestion(int CmdID);
-
-
-
-class to_lower
-{
-public:
-    char operator() (char c) const            // notice the return type
-    {
-        return tolower(c);
-    }
-};
-
-/** @brief Hidden Support commands in lower-case
-*/
-const std::string supportCmds[] = {	"helpsupport",
-                                    "stopprocess",
-                                    "startprocess",
-                                    "restartprocess",
-                                    "killpid",
-                                    "rebootsystem",
-                                    "rebootnode",
-                                    "stopdbrmprocess",
-                                    "startdbrmprocess",
-                                    "restartdbrmprocess",
-                                    "setsystemstartupstate",
-                                    "stopprimprocs",
-                                    "startprimprocs",
-                                    "restartprimprocs",
-                                    "stopexemgrs",
-                                    "startexemgrs",
-                                    "restartexemgrs",
-                                    "getprocessstatusstandby",
-                                    "distributeconfigfile",
-                                    "getpmdbrootconfig",
-                                    "getdbrootpmconfig",
-                                    "getsystemdbrootconfig",
-                                    "checkdbfunctional",
-                                    "getsystemreadflags",
-                                    "setsystemqueryready",
-                                    ""
-                                  };
-
-
-#endif
diff --git a/oamapps/calpontConsole/tdriver.cpp b/oamapps/calpontConsole/tdriver.cpp
deleted file mode 100644
index 5be1266e9..000000000
--- a/oamapps/calpontConsole/tdriver.cpp
+++ /dev/null
@@ -1,380 +0,0 @@
-/* Copyright (C) 2014 InfiniDB, Inc.
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License
-   as published by the Free Software Foundation; version 2 of
-   the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-   MA 02110-1301, USA. */
-
-/***************************************************************************
-* $Id: tdriver.cpp 3072 2013-04-04 19:04:45Z rdempsey $
-*
- *   dhill@srvengcm1.calpont.com
- *
- *   Purpose: Calpont Console tester
- *
- ***************************************************************************/
-
-#include <stdexcept>
-#include <iostream>
-using namespace std;
-
-#include <boost/scoped_ptr.hpp>
-using namespace boost;
-
-#include <cppunit/extensions/HelperMacros.h>
-
-class GeneralCmdsTest : public CppUnit::TestFixture
-{
-
-    CPPUNIT_TEST_SUITE( GeneralCmdsTest );
-
-    CPPUNIT_TEST( test1 );
-    CPPUNIT_TEST( test2 );
-    CPPUNIT_TEST( test3 );
-    CPPUNIT_TEST( test4 );
-    CPPUNIT_TEST( test5 );
-    CPPUNIT_TEST( test6 );
-    CPPUNIT_TEST( test7 );
-
-    CPPUNIT_TEST_SUITE_END();
-
-private:
-
-public:
-    void setUp()
-    {
-    }
-
-    void tearDown()
-    {
-    }
-
-    void test1()
-    {
-        system("./calpontConsole help > tdriver.output");
-    }
-
-    void test2()
-    {
-        system("./calpontConsole ? >> tdriver.output");
-    }
-
-    void test3()
-    {
-        system("./calpontConsole help verbose >> tdriver.output");
-    }
-
-    void test4()
-    {
-        system("./calpontConsole help getAlarmConfig >> tdriver.output");
-    }
-
-    void test5()
-    {
-        system("./calpontConsole exit >> tdriver.output");
-    }
-
-    void test6()
-    {
-        system("./calpontConsole quit >> tdriver.output");
-    }
-
-    void test7()
-    {
-        system("./calpontConsole system ls -ltr >> tdriver.output");
-    }
-};
-
-class AlarmConfigTest : public CppUnit::TestFixture
-{
-
-    CPPUNIT_TEST_SUITE( AlarmConfigTest );
-
-    CPPUNIT_TEST( test1 );
-    CPPUNIT_TEST( test2 );
-    CPPUNIT_TEST( test3 );
-    CPPUNIT_TEST( test4 );
-
-    CPPUNIT_TEST_SUITE_END();
-
-private:
-
-public:
-    void setUp()
-    {
-    }
-
-    void tearDown()
-    {
-    }
-
-    void test1()
-    {
-        system("./calpontConsole getAlarmConfig >> tdriver.output");
-    }
-
-    void test2()
-    {
-        system("./calpontConsole getAlarmConfig 1 >> tdriver.output");
-    }
-
-    void test3()
-    {
-        system("./calpontConsole setAlarmConfig 1 Threshold 50 >> tdriver.output");
-    }
-
-    void test4()
-    {
-        system("./calpontConsole getAlarmConfig 1 >> tdriver.output");
-    }
-
-};
-
-class ProcessConfigTest : public CppUnit::TestFixture
-{
-
-    CPPUNIT_TEST_SUITE( ProcessConfigTest );
-
-    CPPUNIT_TEST( test1 );
-    CPPUNIT_TEST( test2 );
-    CPPUNIT_TEST( test3 );
-    CPPUNIT_TEST( test4 );
-    CPPUNIT_TEST( test5 );
-    CPPUNIT_TEST( test6 );
-    CPPUNIT_TEST( test7 );
-
-    CPPUNIT_TEST_SUITE_END();
-
-private:
-
-public:
-    void setUp()
-    {
-    }
-
-    void tearDown()
-    {
-    }
-
-    void test1()
-    {
-        system("./calpontConsole getProcessConfig >> tdriver.output");
-    }
-
-    void test2()
-    {
-        system("./calpontConsole getProcessConfig ProcessManager dm1 >> tdriver.output");
-    }
-
-    void test3()
-    {
-        system("./calpontConsole getProcessConfig ProcessManager dm1 LaunchID >> tdriver.output");
-    }
-
-    void test4()
-    {
-        system("./calpontConsole setProcessConfig ProcessManager dm1 LaunchID 1 >> tdriver.output");
-    }
-
-    void test5()
-    {
-        system("./calpontConsole getProcessConfig ProcessManager dm1 LaunchID >> tdriver.output");
-    }
-
-    void test6()
-    {
-        system("./calpontConsole setProcessConfig ProcessManager dm1 LaunchID 3 >> tdriver.output");
-    }
-
-    void test7()
-    {
-        system("./calpontConsole getProcessConfig ProcessManager dm1 LaunchID >> tdriver.output");
-    }
-
-};
-
-class ServerConfigTest : public CppUnit::TestFixture
-{
-
-    CPPUNIT_TEST_SUITE( ServerConfigTest );
-
-    CPPUNIT_TEST( test1 );
-    CPPUNIT_TEST( test2 );
-    CPPUNIT_TEST( test3 );
-    CPPUNIT_TEST( test4 );
-    CPPUNIT_TEST( test5 );
-    CPPUNIT_TEST( test6 );
-    CPPUNIT_TEST( test7 );
-
-    CPPUNIT_TEST_SUITE_END();
-
-private:
-
-public:
-    void setUp()
-    {
-    }
-
-    void tearDown()
-    {
-    }
-
-    void test1()
-    {
-        system("./calpontConsole getModuleConfig >> tdriver.output");
-    }
-
-    void test2()
-    {
-        system("./calpontConsole getModuleConfig dm1 >> tdriver.output");
-    }
-
-    void test3()
-    {
-        system("./calpontConsole getModuleConfig dm1 ServerCPUCriticalThreshold >> tdriver.output");
-    }
-
-    void test4()
-    {
-        system("./calpontConsole setModuleConfig dm1 ServerCPUCriticalThreshold 9999 >> tdriver.output");
-    }
-
-    void test5()
-    {
-        system("./calpontConsole getModuleConfig dm1 ServerCPUCriticalThreshold >> tdriver.output");
-    }
-
-    void test6()
-    {
-        system("./calpontConsole setModuleConfig dm1 ServerCPUCriticalThreshold 9000 >> tdriver.output");
-    }
-
-    void test7()
-    {
-        system("./calpontConsole getModuleConfig dm1 ServerCPUCriticalThreshold >> tdriver.output");
-    }
-
-};
-
-class SystemConfigTest : public CppUnit::TestFixture
-{
-
-    CPPUNIT_TEST_SUITE( SystemConfigTest );
-
-    CPPUNIT_TEST( test1 );
-    CPPUNIT_TEST( test2 );
-    CPPUNIT_TEST( test3 );
-    CPPUNIT_TEST( test4 );
-
-    CPPUNIT_TEST_SUITE_END();
-
-private:
-
-public:
-    void setUp()
-    {
-    }
-
-    void tearDown()
-    {
-    }
-
-    void test1()
-    {
-        system("./calpontConsole getSystemConfig >> tdriver.output");
-    }
-
-    void test2()
-    {
-        system("./calpontConsole getSystemConfig SystemVersion >> tdriver.output");
-    }
-
-    void test3()
-    {
-        system("./calpontConsole setSystemConfig SystemVersion 2.0.0.0 >> tdriver.output");
-    }
-
-    void test4()
-    {
-        system("./calpontConsole getSystemConfig SystemVersion >> tdriver.output");
-    }
-
-};
-
-class SystemActionTest : public CppUnit::TestFixture
-{
-
-    CPPUNIT_TEST_SUITE( SystemActionTest );
-
-    CPPUNIT_TEST( test1 );		// valid, but will fail command
-    CPPUNIT_TEST( test2 );		// valid, but will fail command
-    CPPUNIT_TEST( test3 );		// valid, but will fail command
-    CPPUNIT_TEST( test4 );		// valid, but will fail command
-
-
-    CPPUNIT_TEST_SUITE_END();
-
-private:
-
-public:
-    void setUp()
-    {
-    }
-
-    void tearDown()
-    {
-    }
-
-    void test1()
-    {
-        system("./calpontConsole stopSystem >> tdriver.output");
-    }
-
-    void test2()
-    {
-        system("./calpontConsole shutdownSystem >> tdriver.output");
-    }
-
-    void test3()
-    {
-        system("./calpontConsole startSystem >> tdriver.output");
-    }
-
-    void test4()
-    {
-        system("./calpontConsole restartSystem >> tdriver.output");
-    }
-
-};
-
-
-//CPPUNIT_TEST_SUITE_REGISTRATION( SystemActionTest );
-CPPUNIT_TEST_SUITE_REGISTRATION( SystemConfigTest );
-CPPUNIT_TEST_SUITE_REGISTRATION( ServerConfigTest );
-CPPUNIT_TEST_SUITE_REGISTRATION( ProcessConfigTest );
-CPPUNIT_TEST_SUITE_REGISTRATION( AlarmConfigTest );
-CPPUNIT_TEST_SUITE_REGISTRATION( GeneralCmdsTest );
-
-#include <cppunit/extensions/TestFactoryRegistry.h>
-#include <cppunit/ui/text/TestRunner.h>
-
-int main( int argc, char** argv)
-{
-    CppUnit::TextUi::TestRunner runner;
-    CppUnit::TestFactoryRegistry& registry = CppUnit::TestFactoryRegistry::getRegistry();
-    runner.addTest( registry.makeTest() );
-    bool wasSuccessful = runner.run( "", false );
-    return (wasSuccessful ? 0 : 1);
-}
-
-
diff --git a/oamapps/calpontDB/CMakeLists.txt b/oamapps/calpontDB/CMakeLists.txt
deleted file mode 100644
index 781a909e2..000000000
--- a/oamapps/calpontDB/CMakeLists.txt
+++ /dev/null
@@ -1,49 +0,0 @@
-
-#
-# Not used
-#
-#
-
-
-
-#original Makefile.am contents follow:
-
-## Copyright (C) 2014 InfiniDB, Inc.
-##
-## This program is free software; you can redistribute it and/or
-## modify it under the terms of the GNU General Public License
-## as published by the Free Software Foundation; version 2 of
-## the License.
-##
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-## GNU General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-## MA 02110-1301, USA.
-#
-## $Id: Makefile.am 333 2009-04-03 20:35:04Z rdempsey $
-### Process this file with automake to produce Makefile.in
-#
-#AM_CPPFLAGS = $(idb_cppflags)
-#AM_CFLAGS = $(idb_cflags)
-#AM_CXXFLAGS = $(idb_cxxflags)
-#AM_LDFLAGS = $(idb_ldflags)
-#bin_PROGRAMS = calpontDBWrite
-#calpontDBWrite_SOURCES = calpontDB.cpp
-#calpontDBWrite_CPPFLAGS = $(idb_common_includes) $(AM_CPPFLAGS)
-#calpontDBWrite_LDFLAGS = $(idb_common_ldflags) $(idb_common_libs) $(idb_oam_libs) $(idb_exec_libs) -lreadline -lncurses $(AM_LDFLAGS)
-#
-#test:
-#
-#coverage:
-#
-#leakcheck:
-#
-#docs:
-#
-#bootstrap: install-data-am
-#
diff --git a/oamapps/calpontDB/calpontDB.cpp b/oamapps/calpontDB/calpontDB.cpp
deleted file mode 100644
index a29f53a27..000000000
--- a/oamapps/calpontDB/calpontDB.cpp
+++ /dev/null
@@ -1,162 +0,0 @@
-/* Copyright (C) 2014 InfiniDB, Inc.
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License
-   as published by the Free Software Foundation; version 2 of
-   the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-   MA 02110-1301, USA. */
-
-/******************************************************************************************
- * $Id: calpontDB.cpp 419 2007-07-22 17:18:00Z dhill $
- *
- ******************************************************************************************/
-/**
- * @file
- */
-
-#include <iostream>
-#include <fstream>
-#include <cstdlib>
-#include <string>
-#include <limits.h>
-#include <sstream>
-#include <exception>
-#include <stdexcept>
-#include <vector>
-#include <stdio.h>
-#include <ctype.h>
-#include <sys/signal.h>
-#include <sys/types.h>
-
-#include "liboamcpp.h"
-#include "configcpp.h"
-#include "installdir.h"
-
-using namespace std;
-using namespace oam;
-using namespace config;
-
-namespace
-{
-
-void usage(char* prog)
-{
-
-    cout << endl;
-    cout << "Usage: " << prog << " [options]" << endl;
-
-    cout << endl;
-    cout << "This utility is used to suspend and resume Calpont Database Writes." << endl;
-    cout << "Normally this would be done while performing Database Backups and" << endl;
-    cout << "Restores " << endl;
-    cout << endl;
-
-    cout << "Options:" << endl;
-    cout << "-c <command>   Command: suspend or resume" << endl << endl;
-    cout << "-h             Display this help." << endl << endl;
-}
-}
-
-int main(int argc, char** argv)
-{
-    string command;
-    Oam oam;
-    BRM::DBRM dbrm;
-
-    char c;
-
-    // Invokes member function `int operator ()(void);'
-    while ((c = getopt(argc, argv, "c:h")) != -1)
-    {
-        switch (c)
-        {
-            case 'c':
-                command = optarg;
-                break;
-
-            case 'h':
-                usage(argv[0]);
-                exit(-1);
-                break;
-
-            default:
-                usage(argv[0]);
-                exit(1);
-                break;
-        }
-    }
-
-    if ( command == "suspend" )
-    {
-        try
-        {
-            std::vector<BRM::TableLockInfo> tableLocks = dbrm.getAllTableLocks();
-
-            if (!tableLocks.empty())
-            {
-                oam.DisplayLockedTables(tableLocks, &dbrm);
-            }
-            else
-            {
-                dbrm.setSystemSuspended(true);
-                sleep(5);
-                string cmd = startup::StartUp::installDir() + "/bin/save_brm  > /var/log/mariadb/columnstore/save_brm.log1 2>&1";
-                int rtnCode = system(cmd.c_str());
-
-                if (rtnCode == 0)
-                {
-                    cout << endl << "Suspend Calpont Database Writes Request successfully completed" << endl;
-                }
-                else
-                {
-                    cout << endl << "Suspend Calpont Database Writes Failed: save_brm Failed" << endl;
-                    dbrm.setSystemSuspended(false);
-                }
-            }
-        }
-        catch (exception& e)
-        {
-            cout << endl << "**** Suspend Calpont Database Writes Failed: " << e.what() << endl;
-        }
-        catch (...)
-        {
-            cout << endl << "**** Suspend Calpont Database Writes Failed" << endl;
-        }
-    }
-    else
-    {
-        if ( command == "resume" )
-        {
-            try
-            {
-                dbrm.setSystemSuspended(false);
-                cout << endl << "Resume Calpont Database Writes Request successfully completed" << endl;
-            }
-            catch (exception& e)
-            {
-                cout << endl << "**** Resume Calpont Database Writes Failed: " << e.what() << endl;
-            }
-            catch (...)
-            {
-                cout << endl << "**** Resume Calpont Database Writes Failed" << endl;
-            }
-        }
-        else
-        {
-            cout << "Invalid Command Entered, please try again" << endl;
-            exit(-1);
-        }
-    }
-
-    exit(0);
-}
-
diff --git a/oamapps/calpontDB/calpontDBWrite.vpj b/oamapps/calpontDB/calpontDBWrite.vpj
deleted file mode 100644
index 9e14f5296..000000000
--- a/oamapps/calpontDB/calpontDBWrite.vpj
+++ /dev/null
@@ -1,216 +0,0 @@
-<!DOCTYPE Project SYSTEM "http://www.slickedit.com/dtd/vse/10.0/vpj.dtd">
-<Project
-	Version="10.0"
-	VendorName="SlickEdit"
-	TemplateName="GNU C/C++"
-	WorkingDir=".">
-	<Config
-		Name="Debug"
-		Type="gnuc"
-		DebugCallbackName="gdb"
-		Version="1"
-		OutputFile="%bdcalpontDBWrite"
-		CompilerConfigName="Latest Version">
-		<Menu>
-			<Target
-				Name="Compile"
-				MenuCaption="&amp;Compile"
-				Dialog="_gnuc_options_form Compile"
-				CaptureOutputWith="ProcessBuffer"
-				Deletable="0"
-				OutputExts="*.o"
-				SaveOption="SaveCurrent"
-				RunFromDir="%rw">
-				<Exec CmdLine='g++ -c %xup  %defd -g -o "%bd%n%oe" %i "%f"'/>
-			</Target>
-			<Target
-				Name="Link"
-				MenuCaption="&amp;Link"
-				ShowOnMenu="Never"
-				Dialog="_gnuc_options_form Link"
-				CaptureOutputWith="ProcessBuffer"
-				Deletable="0"
-				SaveOption="SaveCurrent"
-				RunFromDir="%rw">
-				<Exec CmdLine='g++ %xup -g -o "%o" %f %libs'/>
-			</Target>
-			<Target
-				Name="Build"
-				MenuCaption="&amp;Build"
-				CaptureOutputWith="ProcessBuffer"
-				Deletable="0"
-				SaveOption="SaveWorkspaceFiles"
-				RunFromDir="%rw">
-				<Exec CmdLine="make"/>
-			</Target>
-			<Target
-				Name="Rebuild"
-				MenuCaption="&amp;Rebuild"
-				CaptureOutputWith="ProcessBuffer"
-				Deletable="0"
-				SaveOption="SaveWorkspaceFiles"
-				RunFromDir="%rw">
-				<Exec CmdLine=""/>
-			</Target>
-			<Target
-				Name="Debug"
-				MenuCaption="&amp;Debug"
-				Dialog="_gnuc_options_form Run/Debug"
-				BuildFirst="1"
-				CaptureOutputWith="ProcessBuffer"
-				Deletable="0"
-				SaveOption="SaveNone"
-				RunFromDir="%rw">
-				<Exec CmdLine='vsdebugio -prog "%o"'/>
-			</Target>
-			<Target
-				Name="Execute"
-				MenuCaption="E&amp;xecute"
-				Dialog="_gnuc_options_form Run/Debug"
-				BuildFirst="1"
-				CaptureOutputWith="ProcessBuffer"
-				Deletable="0"
-				SaveOption="SaveWorkspaceFiles"
-				RunFromDir="%rw">
-				<Exec CmdLine='"%o"'/>
-			</Target>
-			<Target
-				Name="dash"
-				MenuCaption="-"
-				Deletable="0">
-				<Exec/>
-			</Target>
-			<Target
-				Name="GNU C Options"
-				MenuCaption="GNU C &amp;Options..."
-				ShowOnMenu="HideIfNoCmdLine"
-				Deletable="0"
-				SaveOption="SaveNone">
-				<Exec
-					CmdLine="gnucoptions"
-					Type="Slick-C"/>
-			</Target>
-		</Menu>
-		<List Name="GNUC Options">
-			<Item
-				Name="LinkerOutputType"
-				Value="Executable"/>
-		</List>
-	</Config>
-	<Config
-		Name="Release"
-		Type="gnuc"
-		DebugCallbackName="gdb"
-		Version="1"
-		OutputFile="%bdcalpontDBWrite"
-		CompilerConfigName="Latest Version">
-		<Menu>
-			<Target
-				Name="Compile"
-				MenuCaption="&amp;Compile"
-				Dialog="_gnuc_options_form Compile"
-				CaptureOutputWith="ProcessBuffer"
-				Deletable="0"
-				OutputExts="*.o"
-				SaveOption="SaveCurrent"
-				RunFromDir="%rw">
-				<Exec CmdLine='g++ -c %xup %defd -o "%bd%n%oe" %i "%f"'/>
-			</Target>
-			<Target
-				Name="Link"
-				MenuCaption="&amp;Link"
-				ShowOnMenu="Never"
-				Dialog="_gnuc_options_form Link"
-				CaptureOutputWith="ProcessBuffer"
-				Deletable="0"
-				SaveOption="SaveCurrent"
-				RunFromDir="%rw">
-				<Exec CmdLine='g++ %xup -o "%o" %f %libs'/>
-			</Target>
-			<Target
-				Name="Build"
-				MenuCaption="&amp;Build"
-				CaptureOutputWith="ProcessBuffer"
-				Deletable="0"
-				SaveOption="SaveWorkspaceFiles"
-				RunFromDir="%rw">
-				<Exec CmdLine="make"/>
-			</Target>
-			<Target
-				Name="Rebuild"
-				MenuCaption="&amp;Rebuild"
-				CaptureOutputWith="ProcessBuffer"
-				Deletable="0"
-				SaveOption="SaveWorkspaceFiles"
-				RunFromDir="%rw">
-				<Exec CmdLine=""/>
-			</Target>
-			<Target
-				Name="Debug"
-				MenuCaption="&amp;Debug"
-				Dialog="_gnuc_options_form Run/Debug"
-				BuildFirst="1"
-				CaptureOutputWith="ProcessBuffer"
-				Deletable="0"
-				SaveOption="SaveNone"
-				RunFromDir="%rw">
-				<Exec CmdLine='vsdebugio -prog "%o"'/>
-			</Target>
-			<Target
-				Name="Execute"
-				MenuCaption="E&amp;xecute"
-				Dialog="_gnuc_options_form Run/Debug"
-				BuildFirst="1"
-				CaptureOutputWith="ProcessBuffer"
-				Deletable="0"
-				SaveOption="SaveWorkspaceFiles"
-				RunFromDir="%rw">
-				<Exec CmdLine='"%o"'/>
-			</Target>
-			<Target
-				Name="dash"
-				MenuCaption="-"
-				Deletable="0">
-				<Exec/>
-			</Target>
-			<Target
-				Name="GNU C Options"
-				MenuCaption="GNU C &amp;Options..."
-				ShowOnMenu="HideIfNoCmdLine"
-				Deletable="0"
-				SaveOption="SaveNone">
-				<Exec
-					CmdLine="gnucoptions"
-					Type="Slick-C"/>
-			</Target>
-		</Menu>
-		<List Name="GNUC Options">
-			<Item
-				Name="LinkerOutputType"
-				Value="Executable"/>
-		</List>
-	</Config>
-	<Files>
-		<Folder
-			Name="Source Files"
-			Filters="*.c;*.C;*.cc;*.cpp;*.cp;*.cxx;*.c++;*.prg;*.pas;*.dpr;*.asm;*.s;*.bas;*.java;*.cs;*.sc;*.e;*.cob;*.html;*.rc;*.tcl;*.py;*.pl;*.d">
-			<F N="calpontDB.cpp"/>
-		</Folder>
-		<Folder
-			Name="Header Files"
-			Filters="*.h;*.H;*.hh;*.hpp;*.hxx;*.inc;*.sh;*.cpy;*.if"/>
-		<Folder
-			Name="Resource Files"
-			Filters="*.ico;*.cur;*.dlg"/>
-		<Folder
-			Name="Bitmaps"
-			Filters="*.bmp"/>
-		<Folder
-			Name="Other Files"
-			Filters="">
-			<F
-				N="Makefile"
-				Type="Makefile"/>
-		</Folder>
-	</Files>
-</Project>
diff --git a/oamapps/calpontSupport/CMakeLists.txt b/oamapps/calpontSupport/CMakeLists.txt
deleted file mode 100644
index 3db067d75..000000000
--- a/oamapps/calpontSupport/CMakeLists.txt
+++ /dev/null
@@ -1,57 +0,0 @@
-
-#
-# Not used
-#
-#
-
-
-#original Makefile.am contents follow:
-
-## Copyright (C) 2014 InfiniDB, Inc.
-##
-## This program is free software; you can redistribute it and/or
-## modify it under the terms of the GNU General Public License
-## as published by the Free Software Foundation; version 2 of
-## the License.
-##
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-## GNU General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-## MA 02110-1301, USA.
-#
-## $Id: Makefile.am 333 2009-04-03 20:35:04Z rdempsey $
-### Process this file with automake to produce Makefile.in
-#
-#AM_CPPFLAGS = $(idb_cppflags)
-#AM_CFLAGS = $(idb_cflags)
-#AM_CXXFLAGS = $(idb_cxxflags)
-#AM_LDFLAGS = $(idb_ldflags)
-#bin_PROGRAMS = calpontSupport
-#calpontSupport_SOURCES = calpontSupport.cpp
-#calpontSupport_CPPFLAGS = $(idb_common_includes) $(AM_CPPFLAGS)
-#calpontSupport_LDFLAGS = $(idb_common_ldflags) $(idb_brm_libs) $(idb_oam_libs) $(idb_exec_libs) -lreadline -lncurses $(AM_LDFLAGS)
-#dist_bin_SCRIPTS=\
-#	alarmReport.sh \
-#	bulklogReport.sh \
-#	configReport.sh \
-#	hadoopReport.sh \
-#	hardwareReport.sh \
-#	logReport.sh \
-#	resourceReport.sh \
-#	softwareReport.sh
-#
-#test:
-#
-#coverage:
-#
-#leakcheck:
-#
-#docs:
-#
-#bootstrap: install-data-am
-#
diff --git a/oamapps/calpontSupport/alarmReport.sh b/oamapps/calpontSupport/alarmReport.sh
deleted file mode 100755
index 865ea95a4..000000000
--- a/oamapps/calpontSupport/alarmReport.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#! /bin/sh
-#
-# $Id: logReport.sh 421 2007-04-05 15:46:55Z dhill $
-#
-if [ $1 ] ; then
-        SERVER=$1
-else
-        SERVER="localhost"
-fi
-
-if [ $2 ] ; then
-        DATE=$2
-else
-        DATE=" "
-fi
-
-rm -f /tmp/logReport.log
-
-{
-echo " "
-echo "******************** Alarm Report for $SERVER ********************"
-echo " "
-
-echo "-- Today's Alarms --"
-echo " "
-cat /var/log/mariadb/columnstore/alarm.log 2>/dev/null
-
-if test -f /var/log/mariadb/columnstore/archive/alarm.log-$DATE ; then
-	echo "-- Archived Alarms --"
-	echo " "
-	cat /var/log/mariadb/columnstore/archive/alarm.log-$DATE 2>/dev/null
-fi
-
-} > /tmp/logReport.log
-
-exit 0
\ No newline at end of file
diff --git a/oamapps/calpontSupport/analytics/create.sql b/oamapps/calpontSupport/analytics/create.sql
deleted file mode 100644
index a7026bc6a..000000000
--- a/oamapps/calpontSupport/analytics/create.sql
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
-Table for output from track.sh.
-
-Contains a row per process / snapshot.
-
-*/
-
-drop table if exists processLog;
-
-create table processLog (
-snapshotid int, 
-dtm datetime,         /* repeated for a snapshot */
-processPid int,
-processUserName varchar(7),
-processPriority int,
-processNice int,
-moduleSwapUsedK int,
-moduleCachedUsedK int,
-processVirt int,
-processRes  int,
-processShr int,
-processS   char(8),
-processCPUPct decimal(4,1),
-processMemPct decimal(4,1),
-processTime varchar(20),
-processCommand varchar(20))engine=infinidb;
diff --git a/oamapps/calpontSupport/analytics/track.sh b/oamapps/calpontSupport/analytics/track.sh
deleted file mode 100755
index 6dc4dd672..000000000
--- a/oamapps/calpontSupport/analytics/track.sh
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-#
-# Usage:
-# track.sh 
-
-# top output
-#top - 12:45:49 up 21:58,  2 users,  load average: 0.04, 0.10, 0.08
-#Tasks: 164 total,   1 running, 163 sleeping,   0 stopped,   0 zombie
-#Cpu(s):  2.9%us,  2.4%sy, 10.3%ni, 76.2%id,  8.0%wa,  0.0%hi,  0.2%si,  0.0%st
-#Mem:  16440336k total,  6129588k used, 10310748k free,    74336k buffers
-#Swap:  2031608k total,    14848k used,  2016760k free,   511012k cached
-#
-#  PID USER      PR  NI  VIRT  RES  SHR S %CPU %MEM    TIME+  COMMAND
-
-# track.sh output
-# SEQ DATE PID USER PR NI SWAP CACHE VIRT RES SHR S %CPU %MEM TIME+ COMMAND
-# SWAP and CACHE are systemwise swap space: Swap: ... used ... cached
-
-i=0
-while [ true ]
-do
-  let i++
-  dt=`date '+%Y-%m-%d %H:%M:%S'`
-  top -b -n 1 |
-  egrep "Swap:|PrimProc|ExeMgr|DMLProc|DDLProc|cpimport|WriteEngineServ|controllernode|workernode|mysqld|DecomSvr" |
-  awk '{if(NR==1){s=$4; c=$8; next}}; {print s" "c" "$0}' |
-  awk -v i=$i -v dt="$dt" '{
-    sub(/k/,"",$1); sub(/k/,"",$2); sub(/m/,"000",$7); sub(/m/,"000",$8); sub(/m/,"000",$9);
-    sub(/\.([0-9]+)g/, "&00000",$7); sub(/^[0-9]+g/, "&000000",$7); gsub(/[.|g]/, "",$7);
-    sub(/\.([0-9]+)g/, "&00000",$8); sub(/^[0-9]+g/, "&000000",$8); gsub(/[.|g]/, "",$8)}
-    {print i"|"dt"|"$3"|"$4"|"$5"|"$6"|"$1"|"$2"|"$7"|"$8"|"$9"|"$10"|"$11"|"$12"|"$13"|"$14"|"}'
-  if [ -f stop.txt ]; then
-    rm -f stop.txt
-    exit
-  fi
-  sleep 1
-done
diff --git a/oamapps/calpontSupport/approximateRowCount.sh b/oamapps/calpontSupport/approximateRowCount.sh
deleted file mode 100755
index 13cea4582..000000000
--- a/oamapps/calpontSupport/approximateRowCount.sh
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/bin/bash
-
-#
-# Estimates the row count for a given table.  Uses number of extents * 8M for the estimate.
-#
-
-#
-# Initialize variables.
-#
-
-if [ -z "$MYSQLCMD" ]; then
-	INSTALLDIR="/usr/local/mariadb/columnstore"
-	MYSQLCNF=$INSTALLDIR/mysql/my.cnf
-	MYSQLCMD="$INSTALLDIR/mysql/bin/mysql --defaults-extra-file=$MYSQLCNF -u root"
-fi
-
-#
-# Validate that there are two parameters - schema and table.
-#
-if [ $# -ne 2 ]; then
-	echo ""
-	echo "Reports the approximate row count for the given table."
-	echo ""
-	echo "Parameters:"
-	echo "	Schema"
-	echo "	Table"
-fi
-db=$1
-table=$2
-
-#
-# Validate that the table exists.
-#
-sql="select count(*) from systable where \`schema\`='$db' and tablename='$table';"
-count=`$MYSQLCMD calpontsys --skip-column-names -e "$sql;"`
-if [ $count -le 0 ]; then
-	echo ""
-	echo "$db.$table does not exist in InfiniDB."
-	echo ""
-	exit 1
-fi
-
-#
-# Grab the objectid and column width for a column in the table.
-#
-sql="select objectid from syscolumn where \`schema\`='$db' and tablename='$table' limit 1;" 
-objectid=`$MYSQLCMD calpontsys --skip-column-names -e "$sql"`
-sql="select columnlength from syscolumn where objectid=$objectid;"
-colWidth=`$MYSQLCMD calpontsys --skip-column-names -e "$sql"`
-
-#
-# Use editem to count the extents.
-#
-extentCount=`/usr/local/mariadb/columnstore/bin/editem -o $objectid | wc -l`
-let extentCount-=2 # Take out the 2 extra rows for header and blank line at end.
-let approximateRowCount=$extentCount*8192*1024;
-
-echo ""
-echo "Approximate row count for $db.$table is $approximateRowCount."
-echo ""
-
-exit 0
diff --git a/oamapps/calpontSupport/bulklogReport.sh b/oamapps/calpontSupport/bulklogReport.sh
deleted file mode 100755
index 755aa29d2..000000000
--- a/oamapps/calpontSupport/bulklogReport.sh
+++ /dev/null
@@ -1,38 +0,0 @@
-#! /bin/sh
-#
-# $Id: logReport.sh 421 2007-04-05 15:46:55Z dhill $
-#
-if [ $1 ] ; then
-        MODULE=$1
-else
-        MODULE="pm1"
-fi
-
-if [ $2 ] ; then
-        INSTALLDIR=$2
-else
-        INSTALLDIR="/usr/local/mariadb/columnstore"
-fi
-
-if [ $USER = "root" ]; then
-	SUDO=" "
-else
-	SUDO="sudo"
-fi
-
-$SUDO rm -f /tmp/${MODULE}_bulklogReport.txt
-
-{
-
-if test -d $INSTALLDIR/data/bulk ; then
-	echo " "
-	echo "-- Check for Errors in Bulk Logs --"
-	echo " "
-	echo "################# egrep '(ERR|CRIT)' $INSTALLDIR/data/bulk/log/*.err #################"
-	echo " "
-	egrep '(ERR|CRIT)' $INSTALLDIR/data/bulk/log/*.err 2>/dev/null
-fi
-
-} > /tmp/${MODULE}_bulklogReport.txt
-
-exit 0
\ No newline at end of file
diff --git a/oamapps/calpontSupport/calpontSupport.bat b/oamapps/calpontSupport/calpontSupport.bat
deleted file mode 100644
index eb2a2a93f..000000000
--- a/oamapps/calpontSupport/calpontSupport.bat
+++ /dev/null
@@ -1,227 +0,0 @@
-@echo off
-pushd .
-set help=
-if "%1" == "-h" (set help=true)
-if "%1" == "/h" (set help=true)
-if "%1" == "--help" (set help=true)
-if "%help%"=="true" (
-  echo The InfiniDB Support Report creates a report that can be sent to InfiniDB
-  echo for help with field support. There are no options to this command.
-  set help=
-  exit /B 0 
-)
-
-echo.  
-echo Running the InfiniDB Support Report, outputting to InfiniDBSupportReport.txt
-
-call :func > InfiniDBSupportReport.txt 2>&1
-
-echo.  
-echo Report finished
-
-popd
-exit /B 0
-
-:ErrorExit
-
-echo.  
-echo Error - Failed to find InfiniDB Install Directory in Windows Registry, Exiting
-popd
-exit /B 1
-
-:func
-
-  setlocal
-  set key="HKLM\SOFTWARE\Calpont\InfiniDB"
-  set homeValue=InfiniDBHome
-  set configValue=ConfigFile
-
-  for /f "tokens=3,*" %%a in ('reg query %key% /ve 2^>NUL ^| findstr REG_SZ') do (
-    set InfiniDBInstall=%%b
-   )
-
-  if "%InfiniDBInstall%" == "" (
-  	for /f "tokens=2,*" %%a in ('reg query %key% /ve 2^>NUL ^| findstr REG_SZ') do (
-    	set InfiniDBInstall=%%b
-   	)
-  )
-
-  ::error out if can't locate Install Directory
-  if "%InfiniDBInstall%" == "" GOTO ErrorExit
-
-echo #######################################################################
-echo #                                                                     #
-echo #     InfiniDB Support Report - %date% %time%
-echo #                                                                     #
-echo #######################################################################
-echo.
-echo.
-echo =======================================================================
-echo =                    Software/Version Report                          =
-echo =======================================================================
-echo. 
-echo.
-echo -- InfiniDB Software Version --
-type %InfiniDBInstall%\etc\CalpontVersion.txt
-echo. 
-echo -- mysql Software Version --
-mysql --user=root -e status
-echo. 
-echo -- Windows Version --
-ver
-echo.
-echo.
-echo =======================================================================
-echo =                    Status Report                                    =
-echo =======================================================================
-echo.  
-echo. 
-echo -- InfiniDB Process Status -- 
-echo. 
-
-tasklist /FI "Imagename eq mysqld.exe"
-tasklist /FI "Imagename eq controllernode.exe"   
-tasklist /FI "Imagename eq workernode.exe"
-tasklist /FI "Imagename eq PrimProc.exe"
-tasklist /FI "Imagename eq ExeMgr.exe"      
-tasklist /FI "Imagename eq DDLProc.exe"           
-tasklist /FI "Imagename eq DMLProc.exe"         
-tasklist /FI "Imagename eq WriteEngineServer.exe"
-
-echo. 
-echo. 
-echo =======================================================================
-echo =                    Configuration Report                             =
-echo =======================================================================
-echo.
-echo -- Windows InfiniDB Registry Values --
-echo.
-
-  echo InfiniDBInstall = %InfiniDBInstall%
-
-  for /f "tokens=2,*" %%a in ('reg query %key% /v %homeValue% 2^>NUL ^| findstr %homeValue%') do (
-    set InfiniDBHome=%%b
-  )
-  echo InfiniDBHome    = %InfiniDBHome%
-
-  for /f "tokens=2,*" %%a in ('reg query %key% /v %configValue% 2^>NUL ^| findstr %configValue%') do (
-    set ConfigFile=%%b
-  )
-  echo ConfigFile     = %ConfigFile%
-echo.
-echo.
-echo -- InfiniDB System Configuration Information -- 
-echo.
-cd %InfiniDBInstall%\bin
-for /f "delims=" %%a in ('getConfig.exe DBBC NumBlocksPct') do @echo NumBlocksPct = %%a
-for /f "delims=" %%a in ('getConfig.exe HashJoin TotalUmMemory') do @echo TotalUmMemory = %%a
-for /f "delims=" %%a in ('getConfig.exe VersionBuffer VersionBufferFileSize') do @echo VersionBufferFileSize = %%a
-for /f "delims=" %%a in ('getConfig.exe ExtentMap FilesPerColumnPartition') do @echo FilesPerColumnPartition = %%a
-for /f "delims=" %%a in ('getConfig.exe ExtentMap ExtentsPerSegmentFile') do @echo ExtentsPerSegmentFile = %%a
-echo.
-echo.
-echo -- InfiniDB System Configuration File --
-echo.
-type "%ConfigFile%"
-echo.  
-echo.  
-echo -- System Process Status -- 
-echo. 
-tasklist /v
-echo.
-echo =======================================================================
-echo =                   Resource Usage Report                             =
-echo =======================================================================
-echo. 
-echo -- System Information--
-echo. 
-systeminfo
-echo. 
-echo -- IP Configuration Information --
-echo. 
-ipconfig
-echo.
-echo  -- Disk BRM Data files --
-echo.   
-dir "%InfiniDBInstall%\dbrm\"
-echo.   
-echo  -- View Table Locks --
-echo.   
-cd %InfiniDBInstall%\bin\
-viewtablelock.exe
-echo.   
-echo.    
-echo   -- BRM Extent Map  --
-echo.    
-cd %InfiniDBInstall%\bin\
-editem.exe -i
-echo.
-echo.
-echo =======================================================================
-echo =                   Log Report                                        =
-echo =======================================================================
-echo. 
-echo -- InfiniDB Platform Logs --
-echo. 
-type "%InfiniDBInstall%\log\InfiniDBLog.txt"
-echo. 
-echo. 
-echo -- InfiniDB MySQl log --
-echo.
-type "%InfiniDBInstall%\mysqldb\*.err" 
-echo.
-echo. 
-echo -- InfiniDB Bulk Load Logs --
-echo. 
-dir "%InfiniDBInstall%\bulk\data"
-echo. 
-dir "%InfiniDBInstall%\bulk\log"
-echo. 
-dir "%InfiniDBInstall%\bulk\job"
-echo.
-echo -- Check for Errors in Bulk Logs --
-echo.
-cd "%InfiniDBInstall%\bulk\log"
-findstr /spin /c:"error" *
-findstr /spin /c:"failed" *
-cd "%InfiniDBInstall%\bulk\job"
-findstr /spin /c:"error" *
-findstr /spin /c:"failed" *
-echo.
-echo =======================================================================
-echo =                    DBMS Report                                      =
-echo =======================================================================
-echo.
-echo -- DBMS InfiniDB Mysql Version -- 
-echo.
-mysql --user=root -e status
-echo. 
-echo -- DBMS Mysql InfiniDB System Column  -- 
-echo. 
-mysql --user=root -e "desc calpontsys.syscolumn"
-echo. 
-echo -- DBMS Mysql InfiniDB System Table  -- 
-echo. 
-mysql --user=root -e "desc calpontsys.systable"
-echo. 
-echo -- DBMS Mysql InfiniDB System Table Data -- 
-echo.
-mysql --user=root -e "select * from calpontsys.systable"
-echo. 
-echo -- DBMS Mysql InfiniDB Databases -- 
-echo.
-mysql --user=root -e "show databases"
-echo.
-echo -- DBMS Mysql InfiniDB variables -- 
-echo. 
-mysql --user=root -e "show variables"
-echo. 
-echo -- DBMS Mysql InfiniDB config file -- 
-echo.
-type "%InfiniDBInstall%\my.ini"
-echo.
-echo -- Active Queries -- 
-
-::cd \InfiniDB\genii\oamapps\calpontSupport
-
-
diff --git a/oamapps/calpontSupport/calpontSupport.cpp b/oamapps/calpontSupport/calpontSupport.cpp
deleted file mode 100644
index b96349bfe..000000000
--- a/oamapps/calpontSupport/calpontSupport.cpp
+++ /dev/null
@@ -1,1102 +0,0 @@
-/* Copyright (C) 2013 Calpont Corp. */
-
-
-/******************************************************************************************
-* $Id: calpontSupport.cpp 64 2006-10-12 22:21:51Z dhill $
-*
-*
-*
-******************************************************************************************/
-/**
- * @file
- */
-
-#include <iterator>
-#include <numeric>
-#include <deque>
-#include <iostream>
-#include <ostream>
-#include <fstream>
-#include <cstdlib>
-#include <string>
-#include <limits.h>
-#include <sstream>
-#include <exception>
-#include <stdexcept>
-#include <vector>
-#include "stdio.h"
-#include "ctype.h"
-#include <netdb.h>
-#include <readline/readline.h>
-
-#include "liboamcpp.h"
-#include "configcpp.h"
-#include "installdir.h"
-
-using namespace std;
-using namespace oam;
-using namespace config;
-
-typedef struct Child_Module_struct
-{
-    std::string     moduleName;
-    std::string     moduleIP;
-    std::string     hostName;
-} ChildModule;
-
-typedef std::vector<ChildModule> ChildModuleList;
-
-string currentDate;
-string systemName;
-string localModule;
-string localModuleHostName;
-ChildModuleList childmodulelist;
-ChildModuleList parentmodulelist;
-ChildModule childmodule;
-
-string rootPassword = "";
-string debug_flag = "0";
-string mysqlpw = " ";
-
-int runningThreads = 0;
-pthread_mutex_t mutex1 = PTHREAD_MUTEX_INITIALIZER;
-
-typedef boost::tuple<ChildModuleList::iterator, string > threadInfo_t;
-
-bool LOCAL = false;
-
-void title(string outputFile = "calpontSupportReport.txt")
-{
-    string cmd = "echo '%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%' >> " + outputFile;
-    system(cmd.c_str());
-    cmd = "echo ' ' >> " + outputFile;
-    system(cmd.c_str());
-    cmd = "echo ' System " + systemName + "' >> " + outputFile;
-    system(cmd.c_str());
-    cmd = "echo ' calpontSupportReport script ran from Module " + localModule + " on " + currentDate + "' >> " + outputFile;
-    system(cmd.c_str());
-    cmd = "echo ' ' >> " + outputFile;
-    system(cmd.c_str());
-    cmd = "echo '%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%' >> " + outputFile;
-    system(cmd.c_str());
-}
-
-void childReportThread(threadInfo_t& st)
-{
-    ChildModuleList::iterator& list = boost::get<0>(st);
-    string reportType = boost::get<1>(st);
-
-    string remoteModuleName = (*list).moduleName;
-    string remoteModuleIP = (*list).moduleIP;
-    string remoteHostName = (*list).hostName;
-
-    string installDir(startup::StartUp::installDir());
-
-    pthread_mutex_lock( &mutex1 );
-    runningThreads++;
-//cout << "++ " << runningThreads << endl;
-    pthread_mutex_unlock( &mutex1 );
-
-    string outputFile;
-
-    if (reportType == "log")
-    {
-        outputFile = remoteModuleName + "_" + reportType + "Report.tar.gz";
-    }
-    else if (reportType == "hadoop")
-    {
-        outputFile = "hadoopReport.txt";
-    }
-    else
-    {
-        outputFile = remoteModuleName + "_" + reportType + "Report.txt";
-
-        title(outputFile);
-
-        string cmd = "echo '=======================================================================' >> " + outputFile;
-        system(cmd.c_str());
-        cmd = "echo '=                    " + reportType + " report                                  =' >> " + outputFile;
-        system(cmd.c_str());
-        cmd = "echo '=======================================================================' >> " + outputFile;
-        system(cmd.c_str());
-    }
-
-    //run remote report script
-    if (reportType == "hadoop")
-        cout << "Get " + reportType + " report data" << endl;
-    else
-        cout << "Get " + reportType + " report data for " +  remoteModuleName + "      " << endl;
-
-    cout.flush();
-
-    string cmd = installDir + "/bin/remote_command.sh " + remoteModuleIP + " " + rootPassword + " '" +
-                 installDir + "/bin/" + reportType + "Report.sh " + remoteModuleName + " " + installDir +
-                 "' " + debug_flag + " - forcetty";
-    int rtnCode = system(cmd.c_str());
-
-    if (WEXITSTATUS(rtnCode) != 0)
-    {
-        cout << "Error with running remote_command.sh, exiting..." << endl;
-    }
-
-    cmd = installDir + "/bin/remote_scp_get.sh " + remoteModuleIP + " " + rootPassword + " /tmp/" + outputFile + " > /dev/null 2>&1";
-    rtnCode = system(cmd.c_str());
-
-    if (WEXITSTATUS(rtnCode) != 0)
-        cout << "ERROR: failed to retrieve /tmp/" << outputFile << " from " + remoteHostName << endl;
-
-    pthread_mutex_lock( &mutex1 );
-    runningThreads--;
-//cout << "-- " << runningThreads << endl;
-    pthread_mutex_unlock( &mutex1 );
-
-    // exit thread
-    pthread_exit(0);
-}
-
-void reportThread(string reporttype)
-{
-    string reportType = reporttype;
-
-    string installDir(startup::StartUp::installDir());
-    Oam oam;
-
-    pthread_mutex_lock( &mutex1 );
-    runningThreads++;
-//cout << "++ " << runningThreads << endl;
-    pthread_mutex_unlock( &mutex1 );
-
-    string outputFile = localModule + "_" + reportType + "Report.txt";
-
-    // run on child servers and get report
-    if (!LOCAL)
-    {
-        ChildModuleList::iterator list1 = childmodulelist.begin();
-
-        for (; list1 != childmodulelist.end() ; list1++)
-        {
-            threadInfo_t* st = new threadInfo_t;
-            *st = boost::make_tuple(list1, reportType);
-
-            pthread_t childreportthread;
-            int status = pthread_create (&childreportthread, NULL, (void* (*)(void*)) &childReportThread, st);
-
-            if ( status != 0 )
-            {
-                cout <<  "ERROR: childreportthread: pthread_create failed, return status = " + oam.itoa(status) << endl;
-            }
-
-            sleep(1);
-        }
-    }
-
-    // run report on local server
-    cout << "Get " + reportType + " report data for " + localModule  << endl;
-
-    if (reportType == "log")
-    {
-        string cmd = installDir + "/bin/logReport.sh " + localModule + " " + installDir;
-        system(cmd.c_str());
-
-        cmd = "mv -f /tmp/" + localModule + "_logReport.tar.gz .";
-        system(cmd.c_str());
-
-        cmd = "tar -zcf " + localModule + "_mysqllogReport.tar.gz " + installDir + "/mysql/db/*.err* 2>/dev/null";
-        system(cmd.c_str());
-
-        // run log config on local server
-        cout << "Get log config data for " + localModule << endl;
-
-        cmd = "echo ' ' >> " + outputFile;
-        system(cmd.c_str());
-        cmd = "echo '******************** Log Configuration  ********************' >> " + outputFile;
-        system(cmd.c_str());
-        cmd = "echo ' ' >> " + outputFile;
-        system(cmd.c_str());
-        cmd = "echo '################# mcsadmin getLogConfig ################# ' >> " + outputFile;
-        system(cmd.c_str());
-        cmd = "echo ' ' >> " + outputFile;
-        system(cmd.c_str());
-        cmd = installDir + "/bin/mcsadmin getLogConfig >> " + outputFile;
-        system(cmd.c_str());
-    }
-    else
-    {
-        //get local report
-        title(outputFile);
-
-        string cmd = "echo '=======================================================================' >> " + outputFile;
-        system(cmd.c_str());
-        cmd = "echo '=                    " + reportType + " report                                  =' >> " + outputFile;
-        system(cmd.c_str());
-        cmd = "echo '=======================================================================' >> " + outputFile;
-        system(cmd.c_str());
-
-        cmd = installDir + "/bin/" + reportType + "Report.sh " + localModule + " " + installDir;
-        system(cmd.c_str());
-        cmd = " mv -f /tmp/" + localModule + "_" + reportType + "Report.txt .";
-        system(cmd.c_str());
-
-        if (reportType == "config" )
-        {
-            cmd = "echo ' ' >> " + outputFile;
-            system(cmd.c_str());
-            cmd = "echo '******************** System Network Configuration ********************' >> " + outputFile;
-            system(cmd.c_str());
-            cmd = "echo ' ' >> " + outputFile;
-            system(cmd.c_str());
-            cmd = "echo '################# mcsadmin getSystemNetworkConfig ################# ' >> " + outputFile;
-            system(cmd.c_str());
-            cmd = "echo ' ' >> " + outputFile;
-            system(cmd.c_str());
-            cmd = installDir + "/bin/mcsadmin getSystemNetworkConfig >> " + outputFile;
-            system(cmd.c_str());
-
-            cmd = "echo ' ' >> " + outputFile;
-            system(cmd.c_str());
-            cmd = "echo '******************** System Module Configure  ********************' >> " + outputFile;
-            system(cmd.c_str());
-            cmd = "echo ' ' >> " + outputFile;
-            system(cmd.c_str());
-            cmd = "echo '################# mcsadmin getModuleTypeConfig ################# ' >> " + outputFile;
-            system(cmd.c_str());
-            cmd = "echo ' ' >> " + outputFile;
-            system(cmd.c_str());
-            cmd = installDir + "/bin/mcsadmin getModuleTypeConfig >> " + outputFile;
-            system(cmd.c_str());
-
-            cmd = "echo ' ' >> " + outputFile;
-            system(cmd.c_str());
-            cmd = "echo '******************** System Storage Configuration  ********************' >> " + outputFile;
-            system(cmd.c_str());
-            cmd = "echo ' ' >> " + outputFile;
-            system(cmd.c_str());
-            cmd = "echo '################# mcsadmin getStorageConfig ################# ' >> " + outputFile;
-            system(cmd.c_str());
-            cmd = "echo ' ' >> " + outputFile;
-            system(cmd.c_str());
-            cmd = installDir + "/bin/mcsadmin getStorageConfig >> " + outputFile;
-            system(cmd.c_str());
-
-            cmd = "echo ' ' >> " + outputFile;
-            system(cmd.c_str());
-            cmd = "echo '******************** System Storage Status  ********************' >> " + outputFile;
-            system(cmd.c_str());
-            cmd = "echo ' ' >> " + outputFile;
-            system(cmd.c_str());
-            cmd = "echo '################# mcsadmin getStorageStatus ################# ' >> " + outputFile;
-            system(cmd.c_str());
-            cmd = "echo ' ' >> " + outputFile;
-            system(cmd.c_str());
-            cmd = installDir + "/bin/mcsadmin getStorageStatus >> " + outputFile;
-            system(cmd.c_str());
-
-            cmd = "echo ' ' >> " + outputFile;
-            system(cmd.c_str());
-            cmd = "echo '******************** System Status  ********************' >> " + outputFile;
-            system(cmd.c_str());
-            cmd = "echo ' ' >> " + outputFile;
-            system(cmd.c_str());
-            cmd = "echo '################# mcsadmin getSystemInfo ################# ' >> " + outputFile;
-            system(cmd.c_str());
-            cmd = "echo ' ' >> " + outputFile;
-            system(cmd.c_str());
-            cmd = installDir + "/bin/mcsadmin getSystemInfo >> " + outputFile;
-            system(cmd.c_str());
-
-            cmd = "echo ' ' >> " + outputFile;
-            system(cmd.c_str());
-            cmd = "echo '******************** System Configuration File  ********************' >> " + outputFile;
-            system(cmd.c_str());
-            cmd = "echo ' ' >> " + outputFile;
-            system(cmd.c_str());
-            cmd = "echo '################# cat /etc/Columnstore.xml ################# ' >> " + outputFile;
-            system(cmd.c_str());
-            cmd = "echo ' ' >> " + outputFile;
-            system(cmd.c_str());
-            cmd = "cat " + installDir + "/etc/Columnstore.xml >> " + outputFile;
-            system(cmd.c_str());
-        }
-
-        if (reportType == "resource" )
-        {
-            if (LOCAL)
-            {
-                cmd = "echo '################# mcsadmin getModuleResourceUsage ################# ' >> " + outputFile;
-                system(cmd.c_str());
-                cmd = "echo ' ' >> " + outputFile;
-                system(cmd.c_str());
-                string cmd = installDir + "/bin/mcsadmin getModuleResourceUsage " + localModule + " >> " + outputFile;
-                system(cmd.c_str());
-            }
-            else
-            {
-                cmd = "echo '################# mcsadmin getSystemResourceUsage ################# ' >> " + outputFile;
-                system(cmd.c_str());
-                cmd = "echo ' ' >> " + outputFile;
-                system(cmd.c_str());
-                string cmd = installDir + "/bin/mcsadmin getSystemResourceUsage >> " + outputFile;
-                system(cmd.c_str());
-            }
-        }
-    }
-
-    // exit thread
-    pthread_mutex_lock( &mutex1 );
-    runningThreads--;
-//cout << "-- " << runningThreads << endl;
-    pthread_mutex_unlock( &mutex1 );
-
-    pthread_exit(0);
-}
-
-int main(int argc, char* argv[])
-{
-    Oam oam;
-    string installDir(startup::StartUp::installDir());
-
-    Config* sysConfig = Config::makeConfig();
-    string SystemSection = "SystemConfig";
-    string InstallSection = "Installation";
-
-    bool HARDWARE = false;
-    bool SOFTWARE = false;
-    bool CONFIG = false;
-    bool DBMS = false;
-    bool RESOURCE = false;
-    bool LOG = false;
-    bool BULKLOG = false;
-    bool HADOOP = false;
-
-    //get current time and date
-    time_t now;
-    now = time(NULL);
-    struct tm tm;
-    localtime_r(&now, &tm);
-    char timestamp[200];
-    strftime (timestamp, 200, "%m:%d:%y-%H:%M:%S", &tm);
-    currentDate = timestamp;
-
-    char helpArg[3] = "-h";
-
-    // Get System Name
-    try
-    {
-        oam.getSystemConfig("SystemName", systemName);
-    }
-    catch (...)
-    {
-        systemName = "unassigned";
-    }
-
-    // get Local Module Name and Server Install Indicator
-    string singleServerInstall;
-
-    oamModuleInfo_t st;
-
-    try
-    {
-        st = oam.getModuleInfo();
-        localModule = boost::get<0>(st);
-    }
-    catch (...)
-    {
-        cout << endl << "**** Failed : Failed to read Local Module Name" << endl;
-        exit(-1);
-    }
-
-    try
-    {
-        oam.getSystemConfig("SingleServerInstall", singleServerInstall);
-    }
-    catch (...)
-    {
-        singleServerInstall = "y";
-    }
-
-    if (argc == 1)
-    {
-        argv[1] = &helpArg[0];
-        argc = 2;
-    }
-
-    string DataFilePlugin;
-
-    try
-    {
-        DataFilePlugin = sysConfig->getConfig(SystemSection, "DataFilePlugin");
-    }
-    catch (...)
-    {
-        cout << "ERROR: Problem accessing InfiniDB configuration file" << endl;
-        exit(-1);
-    }
-
-    for ( int i = 1; i < argc; i++ )
-    {
-        if ( string("-h") == argv[i] )
-        {
-            cout << endl;
-            cout << "'calpontSupport' generates a Set of System Support Report Files in a tar file" << endl;
-            cout << "called calpontSupportReport.'system-name'.tar.gz in the local directory." << endl;
-            cout << "It should be run on the server with the DBRM front-end." << endl;
-            cout << "Check the Admin Guide for additional information." << endl;
-            cout << endl;
-            cout << "Usage: calpontSupport [-h][-a][-hw][-s][-c][-db][-r][-l][-bl][-lc][-p 'root-password'][-mp 'mysql-root-password'][-de]";
-
-            // if hdfs set up print the hadoop option
-            if (!DataFilePlugin.empty())
-                cout << "[-hd]";
-
-            cout << endl;
-            cout << "			-h  help" << endl;
-            cout << "			-a  Output all Reports (excluding Bulk Logs Reports)" << endl;
-            cout << "			-hw Output Hardware Reports only" << endl;
-            cout << "			-s  Output Software Reports only" << endl;
-            cout << "			-c  Output Configuration/Status Reports only" << endl;
-            cout << "			-db Output DBMS Reports only" << endl;
-            cout << "			-r  Output Resource Reports only" << endl;
-            cout << "			-l  Output Calpont Log/Alarms Reports only" << endl;
-            cout << "			-bl Output Calpont Bulk Log Reports only" << endl;
-            cout << "			-lc Output Reports for Local Server only" << endl;
-            cout << "			-p  password (multi-server systems), root-password or 'ssh' to use 'ssh keys'" << endl;
-            cout << "			-mp mysql root user password" << endl;
-            cout << "			-de Debug Flag" << endl;
-
-            // if hdfs set up print the hadoop option
-            if (!DataFilePlugin.empty())
-                cout << "			-hd Output hadoop reports only" << endl;
-
-            exit (0);
-        }
-        else
-        {
-            if ( string("-a") == argv[i] )
-            {
-                HARDWARE = true;
-                SOFTWARE = true;
-                CONFIG = true;
-                DBMS = true;
-                RESOURCE = true;
-                LOG = true;
-                HADOOP = (DataFilePlugin.empty() ? false : true);
-            }
-            else if ( string("-hw") == argv[i] )
-                HARDWARE = true;
-            else if ( string("-s") == argv[i] )
-                SOFTWARE = true;
-            else if ( string("-c") == argv[i] )
-                CONFIG = true;
-            else if ( string("-db") == argv[i] )
-                DBMS = true;
-            else if ( string("-r") == argv[i] )
-                RESOURCE = true;
-            else if ( string("-l") == argv[i] )
-                LOG = true;
-            else if ( string("-bl") == argv[i] )
-                BULKLOG = true;
-            else if ( string("-lc") == argv[i] )
-                LOCAL = true;
-            else if ( string("-p") == argv[i] )
-            {
-                i++;
-
-                if ( argc == i )
-                {
-                    cout << "ERROR: missing root password argument" << endl;
-                    exit(-1);
-                }
-
-                rootPassword = argv[i];
-
-                //add single quote for special characters
-                if ( rootPassword != "ssh" )
-                {
-                    rootPassword = "'" + rootPassword + "'";
-                }
-            }
-            else if ( string("-mp") == argv[i] )
-            {
-                i++;
-
-                if ( argc == i )
-                {
-                    cout << "ERROR: missing mysql root user password argument" << endl;
-                    exit(-1);
-                }
-
-                mysqlpw = argv[i];
-                mysqlpw = "'" + mysqlpw + "'";
-            }
-            else if ( string("-de") == argv[i] )
-                debug_flag = "1";
-            else if ( string("-hd") == argv[i] )
-            {
-                HADOOP = (DataFilePlugin.empty() ? false : true);
-            }
-            else
-            {
-                cout << "Invalid Option of '" << argv[i] << "', run with '-h' for help" << endl;
-                exit (1);
-            }
-        }
-    }
-
-    //default to -a if nothing is set
-    if ( !HARDWARE && !SOFTWARE && !CONFIG && !DBMS && !RESOURCE && !LOG && !BULKLOG && !HADOOP)
-    {
-        HARDWARE = true;
-        SOFTWARE = true;
-        CONFIG = true;
-        DBMS = true;
-        RESOURCE = true;
-        LOG = true;
-        HADOOP = (DataFilePlugin.empty() ? false : true);
-    }
-
-    //get Parent OAM Module Name and setup of it's Custom OS files
-    string PrimaryUMModuleName;
-
-    try
-    {
-        PrimaryUMModuleName = sysConfig->getConfig(SystemSection, "PrimaryUMModuleName");
-    }
-    catch (...)
-    {
-        cout << "ERROR: Problem getting Parent OAM Module Name" << endl;
-        exit(-1);
-    }
-
-    if ( PrimaryUMModuleName == "unassigned" )
-        PrimaryUMModuleName = localModule;
-
-    if ( (localModule != PrimaryUMModuleName) && DBMS )
-    {
-        char* pcommand = 0;
-        char* p;
-        string argument = "n";
-
-        while (true)
-        {
-            cout << endl << "You selected to get the DBMS data." << endl;
-            cout << "You need to run the calpontSupport command on module '" << PrimaryUMModuleName << "' to get that information." << endl;
-            cout << "Or you can proceed on to get all data except the DBMS." << endl;
-
-            pcommand = readline("           Do you want to proceed: (y or n) [n]: ");
-
-            if (pcommand && *pcommand)
-            {
-                p = strtok(pcommand, " ");
-                argument = p;
-                free(pcommand);
-                pcommand = 0;
-            }
-
-            if (pcommand)
-            {
-                free(pcommand);
-                pcommand = 0;
-            }
-
-            if ( argument == "y")
-            {
-                cout << endl;
-                break;
-            }
-            else if ( argument == "n")
-                exit (1);
-        }
-    }
-
-    //get number of worker-nodes, will tell us if a single server system
-    //get Parent OAM Module Name and setup of it's Custom OS files
-    try
-    {
-        string NumWorkers = sysConfig->getConfig("DBRM_Controller", "NumWorkers");
-
-        if ( NumWorkers == "1" )
-            singleServerInstall = "y";
-    }
-    catch (...)
-    {}
-
-    if ( singleServerInstall == "n" && !LOCAL)
-        if ( HARDWARE || SOFTWARE || CONFIG || RESOURCE || LOG || HADOOP )
-            if ( rootPassword.empty() )
-            {
-                cout << "ERROR: Multi-Module System, Password Argument required or use '-lc' option, check help for more information" << endl;
-                exit(-1);
-            }
-
-    //get Parent OAM Module Name and setup of it's Custom OS files
-    //string parentOAMModuleName;
-    ChildModule parentOAMModule;
-
-    try
-    {
-        parentOAMModule.moduleName = sysConfig->getConfig(SystemSection, "ParentOAMModuleName");
-    }
-    catch (...)
-    {
-        cout << "ERROR: Problem getting Parent OAM Module Name" << endl;
-        exit(-1);
-    }
-
-    //Get list of configured system modules
-    SystemModuleTypeConfig sysModuleTypeConfig;
-
-    try
-    {
-        oam.getSystemConfig(sysModuleTypeConfig);
-    }
-    catch (...)
-    {
-        cout << "ERROR: Problem reading the Calpont System Configuration file" << endl;
-        exit(-1);
-    }
-
-    string ModuleSection = "SystemModuleConfig";
-
-    for ( unsigned int i = 0 ; i < sysModuleTypeConfig.moduletypeconfig.size(); i++)
-    {
-        string moduleType = sysModuleTypeConfig.moduletypeconfig[i].ModuleType;
-        int moduleCount = sysModuleTypeConfig.moduletypeconfig[i].ModuleCount;
-
-        if ( moduleCount == 0 )
-            //no modules equipped for this Module Type, skip
-            continue;
-
-        //get IP addresses and Host Names
-        DeviceNetworkList::iterator listPT = sysModuleTypeConfig.moduletypeconfig[i].ModuleNetworkList.begin();
-
-        for ( ; listPT != sysModuleTypeConfig.moduletypeconfig[i].ModuleNetworkList.end() ; listPT++)
-        {
-            string moduleName = (*listPT).DeviceName;
-            HostConfigList::iterator pt1 = (*listPT).hostConfigList.begin();
-            string moduleIPAddr = (*pt1).IPAddr;
-            string moduleHostName = (*pt1).HostName;
-
-            if ( moduleName == localModule)
-            {
-                localModuleHostName = moduleHostName;
-            }
-
-            //save Child modules
-            if ( moduleName != localModule && moduleType != "xm")
-            {
-                childmodule.moduleName = moduleName;
-                childmodule.moduleIP = moduleIPAddr;
-                childmodule.hostName = moduleHostName;
-                childmodulelist.push_back(childmodule);
-            }
-
-            if (moduleName == parentOAMModule.moduleName)
-            {
-                parentOAMModule.moduleIP = moduleIPAddr;
-                parentOAMModule.hostName = moduleHostName;
-                parentOAMModule.moduleName = moduleName;
-            }
-        }
-    } //end of i for loop
-
-    // create a clean Calpont Support Report
-    system("rm -f *_configReport.txt");
-    system("rm -f *_dbmsReport.txt");
-    system("rm -f *_hardwareReport.txt");
-    system("rm -f *_logReport.txt");
-    system("rm -f *_bulklogReport.txt");
-    system("rm -f *_resourceReport.txt");
-    system("rm -f *_softwareReport.txt");
-    system("rm -f hadoopReport.txt");
-
-    //
-    // Software
-    //
-
-    if ( SOFTWARE )
-    {
-        string reportType = "software";
-        pthread_t reportthread;
-        int status = pthread_create (&reportthread, NULL, (void* (*)(void*)) &reportThread, &reportType);
-
-        if ( status != 0 )
-        {
-            cout <<  "ERROR: reportthread: pthread_create failed, return status = " + oam.itoa(status);
-        }
-
-        sleep(5);
-    }
-
-    //
-    // Configuration
-    //
-
-    if ( CONFIG )
-    {
-        string reportType = "config";
-        pthread_t reportthread;
-        int status = pthread_create (&reportthread, NULL, (void* (*)(void*)) &reportThread, &reportType);
-
-        if ( status != 0 )
-        {
-            cout <<  "ERROR: reportthread: pthread_create failed, return status = " + oam.itoa(status);
-        }
-
-        sleep(5);
-    }
-
-    //
-    // Alarms and Calpont Logs
-    //
-
-    if ( LOG )
-    {
-        string reportType = "log";
-        pthread_t reportthread;
-        int status = pthread_create (&reportthread, NULL, (void* (*)(void*)) &reportThread, &reportType);
-
-        if ( status != 0 )
-        {
-            cout <<  "ERROR: reportthread: pthread_create failed, return status = " + oam.itoa(status);
-        }
-
-        sleep(5);
-    }
-
-    //
-    // Bulk Logs
-    //
-
-    if ( BULKLOG )
-    {
-        string reportType = "bulklog";
-        pthread_t reportthread;
-        int status = pthread_create (&reportthread, NULL, (void* (*)(void*)) &reportThread, &reportType);
-
-        if ( status != 0 )
-        {
-            cout <<  "ERROR: reportthread: pthread_create failed, return status = " + oam.itoa(status);
-        }
-
-        sleep(5);
-    }
-
-    //
-    // Hardware
-    //
-
-    if ( HARDWARE )
-    {
-        string reportType = "hardware";
-        pthread_t reportthread;
-        int status = pthread_create (&reportthread, NULL, (void* (*)(void*)) &reportThread, &reportType);
-
-        if ( status != 0 )
-        {
-            cout <<  "ERROR: reportthread: pthread_create failed, return status = " + oam.itoa(status);
-        }
-
-        sleep(5);
-    }
-
-    //
-    // Resources
-    //
-
-    if ( RESOURCE )
-    {
-        string reportType = "resource";
-        pthread_t reportthread;
-        int status = pthread_create (&reportthread, NULL, (void* (*)(void*)) &reportThread, &reportType);
-
-        if ( status != 0 )
-        {
-            cout <<  "ERROR: reportthread: pthread_create failed, return status = " + oam.itoa(status);
-        }
-
-        sleep(5);
-    }
-
-    //
-    // DBMS
-    //
-
-    if ( DBMS )
-    {
-        system("rm -f calpontSupportReport.txt;touch calpontSupportReport.txt");
-        title();
-
-        system("echo '=======================================================================' >> calpontSupportReport.txt");
-        system("echo '=                    DBMS Report                                      =' >> calpontSupportReport.txt");
-        system("echo '=======================================================================' >> calpontSupportReport.txt");
-
-        // run DBMS report on local server
-        cout << "Get dbms report data for " << localModule << endl;
-
-        bool FAILED = false;
-
-        if ( localModule != PrimaryUMModuleName )
-        {
-            cout << "     FAILED: run calpontSupport on '" << PrimaryUMModuleName << "' to get the dbrm report" << endl;
-            FAILED = true;
-        }
-        else
-        {
-            // check if mysql is supported and get info
-            string calpontMysql = installDir + "/mysql/bin/mysql --defaults-file=" + installDir + "/mysql/my.cnf -u root ";
-            string cmd = calpontMysql + " -e 'status' > /tmp/idbmysql.log 2>&1";
-            system(cmd.c_str());
-
-            //check for mysql password set
-            string pwprompt = " ";
-
-            if (oam.checkLogStatus("/tmp/idbmysql.log", "ERROR 1045") )
-            {
-                cout << "NOTE: MySQL root user password is set" << endl;
-
-                //needs a password, was password entered on command line
-                if ( mysqlpw == " " )
-                {
-                    //go check my.cnf
-                    string file = installDir + "/mysql/my.cnf";
-                    ifstream oldFile (file.c_str());
-
-                    vector <string> lines;
-                    char line[200];
-                    string buf;
-
-                    while (oldFile.getline(line, 200))
-                    {
-                        buf = line;
-                        string::size_type pos = buf.find("password", 0);
-
-                        if (pos != string::npos)
-                        {
-                            string::size_type pos1 = buf.find("=", 0);
-
-                            if (pos1 != string::npos)
-                            {
-                                pos = buf.find("#", 0);
-
-                                if (pos == string::npos)
-                                {
-                                    //password arg in my.cnf, go get password
-                                    cout << "NOTE: Using password from my.cnf" << endl;
-                                    mysqlpw = buf.substr(pos1 + 1, 80);
-                                    cout << mysqlpw << endl;
-                                    break;
-                                }
-                            }
-                        }
-                    }
-
-                    oldFile.close();
-
-                    if ( mysqlpw == " " )
-                    {
-                        cout << "NOTE: No password provide on command line or found uncommented in my.cnf" << endl;
-                        cout << endl;
-                        string prompt = " *** Enter MySQL password > ";
-                        mysqlpw = getpass(prompt.c_str());
-                    }
-                }
-
-                //check for mysql password set
-                pwprompt = "--password=" + mysqlpw;
-
-                string cmd = calpontMysql + pwprompt + " -e 'status' > /tmp/idbmysql.log 2>&1";
-                system(cmd.c_str());
-
-                if (oam.checkLogStatus("/tmp/idbmysql.log", "ERROR 1045") )
-                {
-                    cout << "FAILED: Failed login using MySQL root user password '" << mysqlpw << "'" << endl;
-                    FAILED = true;
-                }
-            }
-
-            if (!FAILED)
-            {
-                // check if mysql is supported and get info
-                string calpontMysql = installDir + "/mysql/bin/mysql --defaults-file=" + installDir + "/mysql/my.cnf -u root " + pwprompt;
-                string cmd = calpontMysql + " -V > /dev/null 2>&1";
-                int ret = system(cmd.c_str());
-
-                if ( WEXITSTATUS(ret) == 0)
-                {
-                    // run DBMS report info
-                    system("echo ' ' >> calpontSupportReport.txt");
-                    system("echo '******************** DBMS InfiniDB Mysql Version ********************' >> calpontSupportReport.txt");
-                    system("echo ' ' >> calpontSupportReport.txt");
-                    cmd = "echo '################# " + calpontMysql + " -e status ################# ' >> calpontSupportReport.txt";
-                    system(cmd.c_str());
-                    cmd = "echo ' ' >> calpontSupportReport.txt";
-                    system(cmd.c_str());
-                    cmd = calpontMysql + " -e 'status' >> calpontSupportReport.txt";
-                    system(cmd.c_str());
-
-                    system("echo ' ' >> calpontSupportReport.txt");
-                    system("echo '******************** DBMS Mysql Calpont System Column  ********************' >> calpontSupportReport.txt");
-                    system("echo ' ' >> calpontSupportReport.txt");
-                    cmd = "echo '################# " + calpontMysql + " -e desc calpontsys.syscolumn ################# ' >> calpontSupportReport.txt";
-                    system(cmd.c_str());
-                    cmd = "echo ' ' >> calpontSupportReport.txt";
-                    system(cmd.c_str());
-                    cmd = calpontMysql + " -e 'desc calpontsys.syscolumn;' >> calpontSupportReport.txt";
-                    system(cmd.c_str());
-
-                    system("echo ' ' >> calpontSupportReport.txt");
-                    system("echo '******************** DBMS Mysql Calpont System Table  ********************' >> calpontSupportReport.txt");
-                    system("echo ' ' >> calpontSupportReport.txt");
-                    cmd = "echo '################# " + calpontMysql + " -e desc calpontsys.systable ################# ' >> calpontSupportReport.txt";
-                    system(cmd.c_str());
-                    cmd = "echo ' ' >> calpontSupportReport.txt";
-                    system(cmd.c_str());
-                    cmd = calpontMysql + " -e 'desc calpontsys.systable;' >> calpontSupportReport.txt";
-                    system(cmd.c_str());
-
-                    system("echo ' ' >> calpontSupportReport.txt");
-                    system("echo '******************** DBMS Mysql Calpont System Catalog Data ********************' >> calpontSupportReport.txt");
-                    system("echo ' ' >> calpontSupportReport.txt");
-                    cmd = "echo '################# " + calpontMysql + " calpontsys < " + installDir + "/mysql/dumpcat_mysql.sql ################# ' >> calpontSupportReport.txt";
-                    system(cmd.c_str());
-                    cmd = "echo ' ' >> calpontSupportReport.txt";
-                    system(cmd.c_str());
-                    cmd = calpontMysql + " calpontsys < " + installDir + "/mysql/dumpcat_mysql.sql >> calpontSupportReport.txt";
-                    system(cmd.c_str());
-
-                    system("echo ' ' >> calpontSupportReport.txt");
-                    system("echo '******************** DBMS Mysql Calpont System Table Data ********************' >> calpontSupportReport.txt");
-                    system("echo ' ' >> calpontSupportReport.txt");
-                    cmd = "echo '################# " + calpontMysql + " -e select * from calpontsys.systable ################# ' >> calpontSupportReport.txt";
-                    system(cmd.c_str());
-                    cmd = "echo ' ' >> calpontSupportReport.txt";
-                    system(cmd.c_str());
-                    cmd = calpontMysql + " -e 'select * from calpontsys.systable;' >> calpontSupportReport.txt";
-                    system(cmd.c_str());
-
-                    system("echo ' ' >> calpontSupportReport.txt");
-                    system("echo '******************** DBMS Mysql Calpont Usernames ********************' >> calpontSupportReport.txt");
-                    system("echo ' ' >> calpontSupportReport.txt");
-                    cmd = "echo '################# " + calpontMysql + " -e show databases ################# ' >> calpontSupportReport.txt";
-                    system(cmd.c_str());
-                    cmd = "echo ' ' >> calpontSupportReport.txt";
-                    system(cmd.c_str());
-                    cmd = calpontMysql + " -e 'show databases;' >> calpontSupportReport.txt";
-                    system(cmd.c_str());
-
-                    system("echo ' ' >> calpontSupportReport.txt");
-                    system("echo '******************** DBMS Mysql InfiniDB variables ********************' >> calpontSupportReport.txt");
-                    system("echo ' ' >> calpontSupportReport.txt");
-                    cmd = "echo '################# " + calpontMysql + " show variables ################# ' >> calpontSupportReport.txt";
-                    system(cmd.c_str());
-                    cmd = "echo ' ' >> calpontSupportReport.txt";
-                    system(cmd.c_str());
-                    cmd = calpontMysql + " -e 'show variables;' >> calpontSupportReport.txt";
-                    system(cmd.c_str());
-                }
-            }
-        }
-
-        system("echo ' ' >> calpontSupportReport.txt");
-        system("echo '******************** Database Size Report ********************' >> calpontSupportReport.txt");
-        system("echo ' ' >> calpontSupportReport.txt");
-        string cmd = "echo '################# /bin/databaseSizeReport ################# ' >> calpontSupportReport.txt";
-        system(cmd.c_str());
-        cmd = "echo ' ' >> calpontSupportReport.txt";
-        system(cmd.c_str());
-        cmd = installDir + "/bin/databaseSizeReport >> calpontSupportReport.txt";
-        system(cmd.c_str());
-
-        system("echo ' ' >> calpontSupportReport.txt");
-        system("echo '******************** DBMS Mysql InfiniDB config file ********************' >> calpontSupportReport.txt");
-        system("echo ' ' >> calpontSupportReport.txt");
-        cmd = "echo '################# cat /mysql/my.cnf ################# ' >> calpontSupportReport.txt";
-        system(cmd.c_str());
-        cmd = "echo ' ' >> calpontSupportReport.txt";
-        system(cmd.c_str());
-        cmd = "cat " + installDir + "/mysql/my.cnf 2>/dev/null >> calpontSupportReport.txt";
-        system(cmd.c_str());
-
-        system("echo ' ' >> calpontSupportReport.txt");
-        system("echo '******************** Active Queries ********************' >> calpontSupportReport.txt");
-        system("echo ' ' >> calpontSupportReport.txt");
-        cmd = "echo '################# mcsadmin getActiveSqlStatement ################# ' >> calpontSupportReport.txt";
-        system(cmd.c_str());
-        cmd = "echo ' ' >> calpontSupportReport.txt";
-        system(cmd.c_str());
-        cmd = installDir + "/bin/mcsadmin getActiveSqlStatement >> calpontSupportReport.txt";
-        system(cmd.c_str());
-
-        cmd = "cat calpontSupportReport.txt > " + localModule + "_dbmsReport.txt";
-        system(cmd.c_str());
-    }
-
-    //
-    // HADOOP
-    //
-
-    if (HADOOP)
-    {
-        if (LOCAL || childmodulelist.empty())
-        {
-            cout << "Get hadoop report data" << endl;
-            string cmd = installDir + "/bin/hadoopReport.sh " + localModule + " " + installDir + "\n";
-            cmd += " mv -f /tmp/hadoopReport.txt .";
-            FILE* pipe = popen(cmd.c_str(), "r");
-
-            if (!pipe)
-            {
-                cout << "Failed to get a pipe for hadoop health check commands" << endl;
-                exit(-1);
-            }
-
-            pclose(pipe);
-        }
-        else
-        {
-            // only get hadoop report from parentOAMModule, because it's consistant view.
-            parentmodulelist.push_back(parentOAMModule);
-            threadInfo_t* st = new threadInfo_t;
-            ChildModuleList::iterator iter = parentmodulelist.begin();
-            *st = boost::make_tuple(iter, "hadoop");
-
-            pthread_t hdthread;
-            int status = pthread_create (&hdthread, NULL, (void* (*)(void*)) &childReportThread, st);
-
-            if ( status != 0 )
-            {
-                cout <<  "ERROR: childreportthread: pthread_create failed, return status = " + oam.itoa(status) << endl;
-            }
-        }
-    }
-
-    //wait for all threads to complete
-    sleep(5);
-    int wait = 0;
-
-    while (true)
-    {
-//cout << "check " << runningThreads << endl;
-        if (runningThreads < 1)
-            break;
-
-        sleep(2);
-        wait++;
-
-        // give it 60 minutes to complete
-        if ( wait >= 3600 * 5)
-        {
-            cout << "Timed out (60 minutes) waiting for Requests to complete" << endl;
-        }
-    }
-
-    system("rm -f calpontSupportReport.txt");
-
-    system("unix2dos *Report.txt > /dev/null 2>&1");
-    system("rm -rf calpontSupportReport;mkdir calpontSupportReport;mv *Report.txt calpontSupportReport/. > /dev/null 2>&1;mv *Report.tar.gz calpontSupportReport/. > /dev/null 2>&1");
-    string cmd = "tar -zcf calpontSupportReport." + systemName + ".tar.gz calpontSupportReport/*";
-    system(cmd.c_str());
-
-
-    cout << endl << "Calpont Support Script Successfully completed, files located in calpontSupportReport." + systemName + ".tar.gz" << endl;
-}
diff --git a/oamapps/calpontSupport/configReport.sh b/oamapps/calpontSupport/configReport.sh
deleted file mode 100755
index 6b7cf3499..000000000
--- a/oamapps/calpontSupport/configReport.sh
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/bin/bash
-#
-# $Id: hardwareReport.sh 421 2007-04-05 15:46:55Z dhill $
-#
-if [ $1 ] ; then
-        MODULE=$1
-else
-        MODULE="pm1"
-fi
-
-if [ $2 ] ; then
-        INSTALLDIR=$2
-else
-        INSTALLDIR="/usr/local/mariadb/columnstore"
-fi
-
-if [ $USER = "root" ]; then
-	SUDO=" "
-else
-	SUDO="sudo"
-fi
-
-$SUDO rm -f /tmp/${MODULE}_configReport.txt
-
-{
-echo " "
-echo "******************** Configuration/Status Report for ${MODULE} ********************"
-echo " "
-
-if test -f /sbin/chkconfig ; then
-	echo "-- chkconfig configuration --"
-	echo " "
-	echo "################# /sbin/chkconfig --list | grep infinidb #################"
-	echo " "
-	$SUDO /sbin/chkconfig --list | grep infinidb 2>/dev/null
-	echo "################# /sbin/chkconfig --list | grep mysql-Columnstore #################"
-	echo " "
-	$SUDO /sbin/chkconfig --list | grep mysql-Columnstore 2>/dev/null
-fi
-
-echo " "
-echo "-- fstab Configuration --"
-echo " "
-echo "################# cat /etc/fstab #################"
-echo " "
-$SUDO cat /etc/fstab 2>/dev/null
-
-echo " "
-echo "-- Server Processes --"
-echo " "
-echo "################# ps axu #################"
-echo " "
-$SUDO ps axu
-
-echo " "
-echo "-- Server Processes with resource usage --"
-echo " "
-echo "################# top -b -n 1 #################"
-echo " "
-$SUDO top -b -n 1
-
-} > /tmp/${MODULE}_configReport.txt
-
-exit 0
\ No newline at end of file
diff --git a/oamapps/calpontSupport/findStranded.sh b/oamapps/calpontSupport/findStranded.sh
deleted file mode 100755
index 1263aace9..000000000
--- a/oamapps/calpontSupport/findStranded.sh
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/sh
-
-#
-# This script lists InfiniDBlpont data files that do not have associated extent map entries.
-#
-# NOTES:  
-# 1) Only looks in $COLUMNSTORE_INSTALL_DIR/data* for the data files.
-# 2) Only checks for an existing extent with a matching OID, doesn't validate that there is an
-#    existing extent for the exact segment.
-#
-# Close enough for hand grenades.
-
-if [ -z "$COLUMNSTORE_INSTALL_DIR" ]; then
-	COLUMNSTORE_INSTALL_DIR=/usr/local/mariadb/columnstore
-fi
-
-export COLUMNSTORE_INSTALL_DIR=$COLUMNSTORE_INSTALL_DIR
-
-if [ $COLUMNSTORE_INSTALL_DIR != "/usr/local/mariadb/columnstore" ]; then
-	export PATH=$COLUMNSTORE_INSTALL_DIR/bin:$COLUMNSTORE_INSTALL_DIR/mysql/bin:/bin:/usr/bin
-	export LD_LIBRARY_PATH=$COLUMNSTORE_INSTALL_DIR/lib:$COLUMNSTORE_INSTALL_DIR/mysql/lib
-fi
-
-cd $COLUMNSTORE_INSTALL_DIR
-
-last=-1
-existsInExtentMap=0
-count=0
-
-for i in $COLUMNSTORE_INSTALL_DIR/data*/*/*/*/*/*/FILE*cdf; do
-        let count++
-        oid=`$COLUMNSTORE_INSTALL_DIR/bin/file2oid.pl $i`
-	if [ $last -ne $oid ]; then
-		last=$oid
-        	existsInExtentMap=`$COLUMNSTORE_INSTALL_DIR/bin/editem -o $oid | wc -l`
-	fi
-        if [ $existsInExtentMap -le 0 ]; then
-                echo "Missing oid $oid path $i"
-        fi
-done
diff --git a/oamapps/calpontSupport/getMinMax.sh b/oamapps/calpontSupport/getMinMax.sh
deleted file mode 100755
index 9a95e518d..000000000
--- a/oamapps/calpontSupport/getMinMax.sh
+++ /dev/null
@@ -1,132 +0,0 @@
-#!/bin/bash
-
-#
-# Reports the max value from the extent map for the given column.
-#
-
-#
-# Initialize variables.
-#
-
-if [ -z "$MYSQLCMD" ]; then
-	INSTALLDIR="/usr/local/mariadb/columnstore"
-	MYSQLCNF=$INSTALLDIR/mysql/my.cnf
-	MYSQLCMD="$INSTALLDIR/mysql/bin/mysql --defaults-extra-file=$MYSQLCNF -u root"
-fi
-
-#
-# Validate that there are three parameters - schema and table and columnname.
-#
-if [ $# -ne 3 ]; then
-	echo ""
-	echo "Reports the max value for the given column."
-	echo ""
-	echo "Parameters:"
-	echo "	Schema"
-	echo "	Table"
-	echo "	Column"
-	exit 1
-fi
-db=$1
-table=$2
-column=$3
-
-#
-# Validate that the column exists.
-#
-sql="select count(*) from syscolumn where \`schema\`='$db' and tablename='$table' and columnname='$column';"
-count=`$MYSQLCMD calpontsys --skip-column-names -e "$sql;"`
-if [ $count -le 0 ]; then
-	echo ""
-	echo "$db.$table.$column does not exist in InfiniDB."
-	echo ""
-	exit 1
-fi
-
-#
-# Validate that the column type is one that this script supports.
-# Supported Types:
-# 6  int
-# 8  date
-# 9  bigint
-# 11 datetime
-sql="select datatype from syscolumn where \`schema\`='$db' and tablename='$table' and columnname='$column';"
-dataType=`$MYSQLCMD calpontsys --skip-column-names -e "$sql"`
-if [ $dataType -ne 6 ] && [ $dataType -ne 8 ] && [ $dataType -ne 9 ] && [ $dataType -ne 11 ]; then
-	echo ""
-	echo "The column data type must be an int, bigint, date, or datetime."
-	echo ""
-	exit 1
-fi 
-
-#
-# Grab the objectid for the column.
-#
-sql="select objectid from syscolumn where \`schema\`='$db' and tablename='$table' and columnname='$column';" 
-objectid=`$MYSQLCMD calpontsys --skip-column-names -e "$sql"`
-
-#
-# Set the editem specific parameter if the column is a date or datetime.
-#
-if [ $dataType -eq 8 ]; then
-	parm="-t"
-elif [ $dataType -eq 11 ]; then
-	parm="-s"
-fi
-
-#
-# Use the editem utility to get the min and max value.
-#
-/usr/local/mariadb/columnstore/bin/editem -o $objectid $parm | grep max | awk -v dataType=$dataType '
-	BEGIN {
-		allValid=1;
-		foundValidExtent=0;
-	}
-	{
-		if(dataType == 11) {
-			state=substr($14, 1, length($14)-1); # Datetime has date and time as two fields.
-			thisMin=$6 " " substr($7, 1, length($7)-1);
-			thisMax=$9 " " substr($10, 1, length($10)-1);
-		}
-		else {
-			state=substr($12, 1, length($12)-1);
-			thisMin=substr($6, 1, length($6)-1);
-			thisMax=substr($8, 1, length($8)-1);
-		}
-		if(state == "valid") {
-			if(!foundValidExtent) {
-				min=thisMin;
-				max=thisMax;
-				foundValidExtent=1;
-			}
-			else {
-				if(thisMin < min) {
-					min=thisMin;
-				}
-				if(thisMax > max) {
-					max=thisMax;
-				}
-			}
-		} 
-		else {
-			allValid=0;
-		}
-	}
-	END {
-		if(foundValidExtent == 1) {
-			print "";
-			print "Min=" min;
-			print "Max=" max;
-			print "";
-			if(allValid == 0) {
-				print "Not all extents had min and max values set.  Answer is incomplete."
-			}
-		}
-		else {
-			print "";
-			print "There were not any extents with valid min/max values.  Unable to provide answer.";
-			print "";
-		}
-	}'
-
-exit 0
diff --git a/oamapps/calpontSupport/hadoopReport.sh b/oamapps/calpontSupport/hadoopReport.sh
deleted file mode 100755
index 644e696d9..000000000
--- a/oamapps/calpontSupport/hadoopReport.sh
+++ /dev/null
@@ -1,69 +0,0 @@
-#! /bin/sh
-#
-
-if [ $1 ] ; then
-        MODULE=$1
-else
-        MODULE="pm1"
-fi
-
-if [ $2 ] ; then
-        INSTALLDIR=$2
-else
-        INSTALLDIR="/usr/local/mariadb/columnstore"
-fi
-
-if [ $USER = "hdfs" ]; then
-	SUDO=" "
-else
-	SUDO="sudo -u hdfs"
-fi
-
-sudo rm -f /tmp/hdfsReport.txt
-
-{
-echo 
-echo "****************************** HDFS REPORT ********************************"
-echo 
-echo "-- Hadoop version --"
-echo 
-echo "################# hadoop version  #################"
-echo
-$SUDO hadoop version
-
-echo 
-echo "-- Data File Plugin --"
-echo 
-echo "######### $INSTALLDIR/bin/getConfig SystemConfig DataFilePlugin ##########"
-echo
-sudo $INSTALLDIR/bin/getConfig SystemConfig DataFilePlugin
-
-echo
-echo
-echo "-- Hadoop Configuration File --"
-echo
-echo "################ core-site.xml ################"
-echo
-cat $HADOOP_CONF_DIR/core-site.xml
-
-echo
-echo "################ hdfs-site.xml ################"
-echo
-cat $HADOOP_CONF_DIR/hdfs-site.xml
-
-echo
-echo "-- Hadoop Health Check --"
-echo 
-echo "################# hdfs dfsadmin -report #################"
-echo 
-$SUDO hadoop dfsadmin -report 2>/dev/null
-
-echo 
-echo "-- HDFS check --"
-echo 
-echo "################# hdfs fsck $INSTALLDIR #################"
-echo 
-$SUDO hadoop fsck $INSTALLDIR 2>/dev/null
-} > /tmp/hadoopReport.txt
-
-exit 0
diff --git a/oamapps/calpontSupport/hardwareReport.sh b/oamapps/calpontSupport/hardwareReport.sh
deleted file mode 100755
index 1fedeffaa..000000000
--- a/oamapps/calpontSupport/hardwareReport.sh
+++ /dev/null
@@ -1,101 +0,0 @@
-#! /bin/sh
-#
-# $Id: hardwareReport.sh 421 2007-04-05 15:46:55Z dhill $
-#
-if [ $1 ] ; then
-        MODULE=$1
-else
-        MODULE="pm1"
-fi
-
-if [ $2 ] ; then
-        INSTALLDIR=$2
-else
-        INSTALLDIR="/usr/local/mariadb/columnstore"
-fi
-
-if [ $USER = "root" ]; then
-	SUDO=" "
-else
-	SUDO="sudo"
-fi
-
-$SUDO rm -f /tmp/${MODULE}_hardwareReport.txt
-
-{
-echo " "
-echo "******************** Hardware Report for ${MODULE} ********************"
-echo " "
-
-echo "-- Server OS Version --"
-echo " "
-echo "################# cat /proc/version #################"
-echo " "
-$SUDO cat /proc/version 2>/dev/null
-echo " "
-echo "################# uname -a #################"
-echo " "
-uname -a
-echo " "
-echo "################# cat /etc/issue #################"
-echo " "
-cat /etc/issue 2>/dev/null
-echo " "
-echo "run os_check.sh"
-echo " "
-echo "################# /bin/os_check.sh #################"
-echo " "
-$INSTALLDIR/bin/os_check.sh 2>/dev/null
-
-echo " "
-echo "-- Server Uptime --"
-echo " "
-echo "################# uptime #################"
-echo " "
-uptime
-
-echo " "
-echo "-- Server cpu-info --"
-echo " "
-echo "################# cat /proc/cpuinfo #################"
-echo " "
-$SUDO cat /proc/cpuinfo 2>/dev/null
-
-echo " "
-echo "-- Server memory-info --"
-echo " "
-echo "################# cat /proc/meminfo #################"
-echo " "
-$SUDO cat /proc/meminfo 2>/dev/null
-
-echo " "
-echo "-- Server mounts --"
-echo " "
-echo "################# cat /proc/mounts #################"
-echo " "
-$SUDO cat /proc/mounts 2>/dev/null
-
-echo " "
-echo "-- Server Disk Scheduler for Calpont Mounts --"
-echo " "
-for scsi_dev in `mount | awk '/mnt\/tmp/ {print $1}' | awk -F/ '{print $3}' | sed 's/[0-9]*$//'`; do
-        echo '/dev/'$scsi_dev ' scheduler setup is'
-        cat /sys/block/$scsi_dev/queue/scheduler 2>/dev/null
-done
-for scsi_dev in `mount | awk '/Calpont\/data/ {print $1}' | awk -F/ '{print $3}' | sed 's/[0-9]*$//'`; do
-        if [ $scsi_dev != "local" ] ; then
-                echo '/dev/'$scsi_dev ' scheduler setup is'
-                cat /sys/block/$scsi_dev/queue/scheduler 2>/dev/null
-        fi
-done
-
-echo " "
-echo "-- Server Ethernet Configuration --"
-echo " "
-echo "################# ifconfig -a #################"
-echo " "
-ifconfig -a 2>/dev/null
-
-} > /tmp/${MODULE}_hardwareReport.txt
-
-exit 0
\ No newline at end of file
diff --git a/oamapps/calpontSupport/logReport.sh b/oamapps/calpontSupport/logReport.sh
deleted file mode 100755
index 18da759a2..000000000
--- a/oamapps/calpontSupport/logReport.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#! /bin/sh
-#
-# $Id: logReport.sh 421 2007-04-05 15:46:55Z dhill $
-#
-if [ $1 ] ; then
-        MODULE=$1
-else
-        MODULE="pm1"
-fi
-
-if [ $2 ] ; then
-        INSTALLDIR=$2
-else
-        INSTALLDIR="/usr/local/mariadb/columnstore"
-fi
-
-if [ $USER = "root" ]; then
-	SUDO=" "
-else
-	SUDO="sudo"
-fi
-
-$SUDO rm -f /tmp/${MODULE}_logReport.tar.gz
-
-tar -zcf /tmp/${MODULE}_logReport.tar.gz /var/log/mariadb/columnstore > /dev/null 2>&1
-
-exit 0
diff --git a/oamapps/calpontSupport/minMaxCheck.sh b/oamapps/calpontSupport/minMaxCheck.sh
deleted file mode 100755
index 4e36db272..000000000
--- a/oamapps/calpontSupport/minMaxCheck.sh
+++ /dev/null
@@ -1,170 +0,0 @@
-#!/bin/bash
-#
-# $Id: minMaxCheck.sh 1479  2011-07-20 09:53:32Z wweeks $
-#
-
-#
-# This script resets the EM Min/Max values for the coluns defined in the cols array. 
-#
-# Usage:
-#	./minMax.sh
-#		runs against the columns defined in the cols array below.
-#	./minMaxCheck.sh all 
-#		run for all CP columns in the database (will take a long time against a large database).
-#	./minMaxCheck.sh schemaname 
-#		run for CP columns in tables in the schema.  If your schema is named all, you'll get all columns.
-#	./minMaxCheck.sh schemaname tablename
-#		run for CP columns against the given table.
-#	./minMaxCheck.sh schemaname tablename columnname
-#		run against the given column.
-# 
-# The script does the following:
-# 1) Runs editem for the column.
-# 2) Clears the min/max for the column with editem -c.
-# 3) Counts the column so that the min/max get set again.
-# 4) Runs editem for the column again.
-# 5) Diffs the two editem runs and reports / saves the sdiff log files for the column if any of extents had the min/max changed.
-#
-# Notes:
-# 1) An info.log entry will be logged at the end of the script if none of the columns checked had a bad extent map entry.
-#    Example:
-#       Mar 11 14:11:29 srvqaperf8 oamcpp[9872]: 29.091980 |0|0|0| I 08 CAL0000: min-max-monitor: okay
-# 2) Two warning.log entries will be logged at the end of the script if one or min/max EM entries were corrected.
-#    Example:
-#       Mar 11 14:16:36 srvqaperf8 oamcpp[16364]: 36.231731 |0|0|0| W 08 CAL0000: min-max-monitor: some values were reset for oids  3004 3005
-#       Mar 11 14:16:36 srvqaperf8 oamcpp[16365]: 36.263270 |0|0|0| W 08 CAL0000: min-max-monitor: log files are /tmp/idb_mm_mon.sdiff.*.15190
-# 3) The script outputs the results of the selects in #3 above as it's going through the columns and will echo a line when it finds a col that was corrected.
-#    Example:
-#       **** Extent map min/max changed on the scan.  See results in /tmp/idb_mm_mon.sdiff.3039.15190
-
-
-# Define the cols array.  Here's a sql statement that will list the date and datetime cols in the expected format.
-#   idbmysql calpontsys -e "select concat(objectid, ':', \`schema\`, '.', tablename, '.', columnname) from syscolumn where datatype in (8, 11) and tablename not like 'temp%';" > www.txt
-#
-# NOTE:  The objectid will be looked up again when it's going through the columns in case the one in the array becomes stale.
-#
-
-if [ -z "$MYSQLCMD" ]; then
-        MYSQLCMD="/usr/local/mariadb/columnstore/mysql/bin/mysql --defaults-extra-file=/usr/local/mariadb/columnstore/mysql/my.cnf -u root"
-fi
-
-if [ -z "$INSTALLDIR" ]; then
-        INSTALLDIR="/usr/local/mariadb/columnstore"
-fi
-
-if [ -z "$PGMPATH" ]; then
-	PGMPATH=$INSTALLDIR/bin
-fi
-
-cols=(
-1339664:tpch1.orders.o_orderdate
-1339718:tpch1.lineitem.l_shipdate
-1339719:tpch1.lineitem.l_commitdate
-1339720:tpch1.lineitem.l_receiptdate
-1339759:dml.orders.o_orderdate
-1339813:dml.lineitem.l_shipdate
-1339814:dml.lineitem.l_commitdate
-1339815:dml.lineitem.l_receiptdate
-)
-
-#
-# If called with "all", run the script against all of the column types that use CP.
-#
-if [ $# -eq 1 ] && [ "$1" == "all" ]; then
-	$MYSQLCMD --execute="select concat(objectid, ':', \`schema\`, '.', tablename, '.', columnname) from syscolumn where datatype not in (4, 10, 13) and not (datatype = 2 and columnlength > 8) and not (datatype = 12 and columnlength > 7);" calpontsys --skip-column-names > /tmp/idb_mm_mon.cols
-	cols=( $( cat /tmp/idb_mm_mon.cols ) )
-	rm -f /tmp/idb_mm_mon.cols
-
-#
-# Else if one parm passed, run against the columns in the given schema.
-#
-elif [ $# -eq 1 ]; then
-	db=$1
-        $MYSQLCMD --execute="select concat(objectid, ':', \`schema\`, '.', tablename, '.', columnname) from syscolumn where datatype not in (4, 10, 13) and not (datatype = 2 and columnlength > 8) and not (datatype = 12 and columnlength > 7) and \`schema\` = '$db';" calpontsys --skip-column-names > /tmp/idb_mm_mon.cols
-	cols=( $( cat /tmp/idb_mm_mon.cols ) )
-	rm -f /tmp/idb_mm_mon.cols
-
-#
-# Else if two parms passed, run the script against all the columns that use CP for that table.
-#
-elif [ $# -eq 2 ]; then
-	db=$1
-	tbl=$2
-        $MYSQLCMD --execute="select concat(objectid, ':', \`schema\`, '.', tablename, '.', columnname) from syscolumn where datatype not in (4, 10, 13) and not (datatype = 2 and columnlength > 8) and not (datatype = 12 and columnlength > 7) and \`schema\` = '$db' and tablename = '$tbl';" calpontsys --skip-column-names > /tmp/idb_mm_mon.cols
-        cols=( $( cat /tmp/idb_mm_mon.cols ) )
-        rm -f /tmp/idb_mm_mon.cols
-
-#
-# Else if three parms passed, run the script against the column.
-#
-elif [ $# -eq 3 ]; then
-	db=$1
-	tbl=$2
-	col=$3
-        $MYSQLCMD --execute="select concat(objectid, ':', \`schema\`, '.', tablename, '.', columnname) from syscolumn where \`schema\` = '$db' and tablename = '$tbl' and columnname='$col';" calpontsys --skip-column-names > /tmp/idb_mm_mon.cols
-        cols=( $( cat /tmp/idb_mm_mon.cols ) )
-        rm -f /tmp/idb_mm_mon.cols
-fi
-
-i=0
-j=0
-
-if [ ${#cols[@]} -le 0 ]; then
-        $PGMPATH/cplogger -w 0 "min-max-monitor: no qualifying columns" "$badoidlist"
-        echo "min-max-monitor: no qualifying columns" "$badoidlist"
-	exit 1
-fi
-
-badoidlist=
-while [ $i -lt ${#cols[@]} ]; do
-        let row=$i+1
-        echo ""
-        echo "Evaluating $row of  ${#cols[@]} at `date`.  Col is ${cols[$i]}."
-        eval $(echo ${cols[$i]} | awk -F: '{printf "oid=%d\ntcn=%s\n", $1, $2}')
-        eval $(echo $tcn | awk -F. '{printf "schema=%s\ntable=%s\ncolumn=%s\n", $1, $2, $3}')
-
-	#
-	# Look up the oid if the cols array is being used to keep from having to continually update the array if tables are dropped and recreated.
-	#
-	if [ $# -eq 0 ]; then
-		$MYSQLCMD --execute="select concat(objectid, ':', \`schema\`, '.', tablename, '.', columnname) from syscolumn where \`schema\` = '$schema' and tablename='$table' and columnname='$column';" calpontsys --skip-column-names > /tmp/idb_mm_mon.cols
-		results=`wc -l /tmp/idb_mm_mon.cols | awk '{print $1}'`
-		if [ $results -eq 0 ]; then
-			oid=0
-		else
-			oid=`cat /tmp/idb_mm_mon.cols`
-		fi
-	fi	
-
-        $PGMPATH/editem -o$oid | awk '{print $1, $6, $8, $12}' >/tmp/idb_mm_mon.$oid.1.$$
-        $PGMPATH/editem -c$oid
-        $MYSQLCMD --execute="select count($column) from $table" $schema -vvv
-        $PGMPATH/editem -o$oid | awk '{print $1, $6, $8, $12}' >/tmp/idb_mm_mon.$oid.2.$$
-        sdiff /tmp/idb_mm_mon.$oid.1.$$ /tmp/idb_mm_mon.$oid.2.$$ --suppress-common-lines | grep -n -v invalid > /tmp/idb_mm_mon.sdiff.$oid.$$
-        count=`wc -l /tmp/idb_mm_mon.sdiff.$oid.$$ | awk '{print $1}'`
-        if [ $count -ne 0 ]; then
-                badoidlist="$badoidlist $oid"
-                ((j++))
-                echo "**** Extent map min/max changed on the scan.  See results in /tmp/idb_mm_mon.sdiff.$oid.$$"
-	else
-		rm -f /tmp/idb_mm_mon.sdiff.$oid.$$ 
-        fi
-        rm -f /tmp/idb_mm_mon.$oid.*.$$
-        ((i++))
-done
-echo ""
-if [ $j -eq 0 ]; then
-        $PGMPATH/cplogger -i 0 "min-max-monitor: okay"
-        echo "min-max-monitor: okay"
-        echo ""
-	exit 0
-else
-        $PGMPATH/cplogger -w 0 "min-max-monitor: some values were reset for oids" "$badoidlist"
-        $PGMPATH/cplogger -w 0 "min-max-monitor: log files are /tmp/idb_mm_mon.sdiff.*.$$"
-        echo "min-max-monitor: some values were reset for oids" "$badoidlist"
-        echo "min-max-monitor: log files are /tmp/idb_mm_mon.sdiff.*.$$"
-        echo ""
-	exit 1
-fi
-
-
diff --git a/oamapps/calpontSupport/resourceReport.sh b/oamapps/calpontSupport/resourceReport.sh
deleted file mode 100755
index 5beda4a76..000000000
--- a/oamapps/calpontSupport/resourceReport.sh
+++ /dev/null
@@ -1,74 +0,0 @@
-#! /bin/sh
-#
-# $Id: resourceReport.sh 421 2007-04-05 15:46:55Z dhill $
-#
-if [ $1 ] ; then
-        MODULE=$1
-else
-        MODULE="pm1"
-fi
-
-if [ $2 ] ; then
-        INSTALLDIR=$2
-else
-        INSTALLDIR="/usr/local/mariadb/columnstore"
-fi
-
-if [ $USER = "root" ]; then
-	SUDO=" "
-else
-	SUDO="sudo"
-fi
-
-$SUDO rm -f /tmp/${MODULE}_resourceReport.txt
-
-{
-echo " "
-echo "******************** Resource Usage Report for ${MODULE} ********************"
-echo " "
-
-echo " "
-echo "-- Shared Memory --"
-echo " "
-echo "################# ipcs -l #################"
-echo " "
-$SUDO ipcs -l
-
-echo "################# $INSTALLDIR/bin/clearShm -n #################"
-echo " "
-$INSTALLDIR/bin/clearShm -n
-
-echo " "
-echo "-- Disk Usage --"
-echo " "
-echo "################# df -k #################"
-echo " "
-$SUDO df -k
-
-echo " "
-echo "-- Disk BRM Data files --"
-echo " "
-ls -l $INSTALLDIR/data1/systemFiles/dbrm 2> /dev/null
-ls -l $INSTALLDIR/dbrm 2> /dev/null
-
-echo "################# cat $INSTALLDIR/data1/systemFiles/dbrm/BRM_saves_current #################"
-echo " "
-cat $INSTALLDIR/data1/systemFiles/dbrm/BRM_saves_current 2> /dev/null
-
-echo " "
-echo "-- View Table Locks --"
-echo " "
-echo "################# cat bin/viewtablelock #################"
-echo " "
-$INSTALLDIR/bin/viewtablelock 2> /dev/null
-
-echo " "
-echo "-- BRM Extent Map  --"
-echo " "
-echo "################# bin/editem -i #################"
-echo " "
-$INSTALLDIR/bin/editem -i 2>/dev/null
-
-} > /tmp/${MODULE}_resourceReport.txt
-
-exit 0
\ No newline at end of file
diff --git a/oamapps/calpontSupport/sqlLogs.sh b/oamapps/calpontSupport/sqlLogs.sh
deleted file mode 100755
index 818ab546c..000000000
--- a/oamapps/calpontSupport/sqlLogs.sh
+++ /dev/null
@@ -1,225 +0,0 @@
-#!/bin/bash
-
-#
-# Script that does analysis on SQL statements from an InfiniDB debug log.
-#
-DB=idb_idb_sqllogs
-TABLE=statements
-
-if [ -z "$COLUMNSTORE_INSTALL_DIR" ]; then
-	COLUMNSTORE_INSTALL_DIR=/usr/local/mariadb/columnstore
-fi
-
-export COLUMNSTORE_INSTALL_DIR=$COLUMNSTORE_INSTALL_DIR
-
-if [ $COLUMNSTORE_INSTALL_DIR != "/usr/local/mariadb/columnstore" ]; then
-	export PATH=$COLUMNSTORE_INSTALL_DIR/bin:$COLUMNSTORE_INSTALL_DIR/mysql/bin:/bin:/usr/bin
-	export LD_LIBRARY_PATH=$COLUMNSTORE_INSTALL_DIR/lib:$COLUMNSTORE_INSTALL_DIR/mysql/lib
-fi
-
-
-if [ -z "$MYSQLCMD" ]; then
-        MYSQLCMD="$COLUMNSTORE_INSTALL_DIR/mysql/bin/mysql --defaults-extra-file=$COLUMNSTORE_INSTALL_DIR/mysql/my.cnf -u root"
-        export MYSQLCMD
-fi
-
-main()
-{
-	if [ "$option" == "usage" ]; then
-		usage
-		exit
-	elif [ "$option" == "create" ]; then
-		if [ -f $logFile ]; then
-			create
-		else
-			echo ""
-			usage
-			echo ""
-			echo "*** $logFile not found. Pleae specify a valid debug log file.***"
-			echo ""
-			exit
-		fi
-	elif [ "$option" == "list" ]; then
-		list
-	elif [ "$option" == "listAll" ]; then
-		listAll
-	elif [ "$option" == "active" ]; then
-		listActive
-	elif [ "$option" == "activeAll" ]; then
-		listActiveAll
-	else
-		echo ""
-		usage
-		echo "*** $option is not a valid option. ***"
-		echo ""
-		exit	
-	fi
-	
-}
-
-usage ()
-{
-        echo "
-        This script can be used to analyze select statements from an InfiniDB debug log.
-        
-        Usage:
-        
-        ./sqlLogs.sh create [debug log file name - default:debug.log]
-                  Creates an $DB.$TABLE table with the select statements from the debug log.  Must be run before other options can be used.
-        
-        ./sqlLogs.sh list
-                  Lists the SQL statements and run times showing the following:
-                  id                 - statement id in sequential order based on the start time
-                  starttime          - start time of the statement
-                  endtime            - end time of the statement
-                  runtime            - total run time of the statement
-                  sessionid          - the MySQL session id for the statement
-                  sessionstatementid - the sequence of the statement within the session
-        
-        ./sqlLogs.sh listAll
-          Same as list with the addition of the SQL statement.
-        
-        ./sqlLogs.sh active timestamp
-                  Example:  ./sqlLogs.sh active 00:35:50.291408
-                  Lists the id, starttime, endtime, runtime, timeActive, sessionid, and sessionstatementid for the sql statements
-                  that were active at the given timestamp.
-        
-        ./sqlLogs.sh activeAll timestamp
-                  Same as listActive with the addition of the SQL statement.
-      	"
-
-}
-
-create ()
-{
-	echo ""
-	echo "Step 1 of 4.  Building import file with Start SQL log entries."
-	grep "Start SQL" $logFile | grep -v syscolumn | grep -v systable | awk -F '|' '{print NR "|" substr($1,8,6) substr($1,length($1)-9,9) "|" $2 "|" $5}' |
-	sort -t '|' -n -k 3 -k 1 |
-	awk -F '|' '
-	{
-	if(NR == 1)
-	{
-	        prevSession=$3;
-	        val=1;
-	}
-	else if(prevSession == $3)
-	        val++;
-	else
-	{
-	        val=1;
-	        prevSession=$3;
-	}
-	print $0 "|" val "|"
-	}' | sort -t '|' -n -k 1 > /tmp/idbtmp.tbl
-
-	echo "Step 2 of 4.  Populating $DB.start table with Start SQL log entries."
-	sql="
-	create database if not exists $DB;
-	use $DB;
-	drop table if exists start;
-	CREATE TABLE start (
-	  id int,
-	  time char(20),
-	  sessionid int,
-	  statement varchar(8000),
-	  sessionStatementId int
-	) ENGINE=MyISAM ;
-	create index start_idx on start (sessionid, sessionStatementId);
-	load data infile '/tmp/idbtmp.tbl' into table start fields terminated by '|';
-	"
-	$MYSQLCMD -e "$sql"
-
-	echo "Step 3 of 4.  Building import file with End SQL log entries."
-	grep "End SQL" $logFile | grep -v "2147483" | awk -F '|' '{print NR "|" substr($1,8,6) substr($1,length($1)-9,9) "|" $2}' |
-	sort -t '|' -n -k 3 -k 1 |
-	awk -F '|' '
-	{
-	if(NR == 1)
-	{
-	        prevSession=$3;
-	        val=1;
-	}
-	else if(prevSession == $3)
-	        val++;
-	else
-	{
-	        val=1;
-	        prevSession=$3;
-	}
-	print $0 "|" val "|"
-	}' | sort -t '|' -n -k 1 > /tmp/idbtmp.tbl
-	 
-	echo "Step 4 of 4.  Populating $DB.stop table with End SQL log entries."
-	sql="
-	drop table if exists stop;
-	CREATE TABLE stop (
-	  id int,
-	  time char(20),
-	  sessionid int,
-	  sessionStatementId int
-	) ENGINE=MyISAM ;
-	create index stop_idx on stop (sessionid, sessionStatementId);
-	load data infile '/tmp/idbtmp.tbl' into table stop fields terminated by '|';
-	"
-	$MYSQLCMD $DB -e "$sql;"
-
-	echo "Step 5 of 5.  Populating $DB.$TABLE table."
-	sql="
-	drop table if exists $TABLE;
-	create table $TABLE as 
-	(select 
-	a.id id, a.time starttime, b.time endtime, substr(timediff(b.time, a.time), 1, 30) runTime, a.sessionid sessionId, a.sessionstatementid sessionStatementId, a.statement statement 
-	from start a left join stop b 
-	on a.sessionid = b.sessionid and a.sessionstatementid = b.sessionstatementid);
-	"
-	$MYSQLCMD $DB -e "$sql"
-
-	echo "All done."
-	echo ""
-}
-
-list() {
-	sql="select id, starttime, endtime, runtime, sessionid, sessionstatementid from statements;" 
-	$MYSQLCMD $DB -vvv -e "$sql"
-}
-
-listAll() 
-{
-	sql="select id, starttime, endtime, runtime, sessionid, sessionstatementid, trim(statement) statement from statements;" 
-	$MYSQLCMD $DB -vvv -e "$sql"
-}
-
-listActive()
-{
-	dtm=$parm2
-	sql="
-		select id, starttime, endtime, runtime, timediff('$dtm', starttime) timeActive, sessionid, sessionstatementid from statements 
-		where starttime <= '$dtm' and (endtime is null or endtime > '$dtm');
-		" 
-	$MYSQLCMD $DB -vvv -e "$sql"
-}
-
-listActiveAll()
-{
-	dtm=$parm2
-	sql="
-		select id, starttime, endtime, runtime, timediff('$dtm', starttime) timeActive, sessionid, sessionstatementid, trim(statement) statement from statements 
-		where starttime <= '$dtm' and (endtime is null or endtime > '$dtm');
-		" 
-	$MYSQLCMD $DB -vvv -e "$sql"
-}
-
-if [ $# -lt 1 ]; then
-	usage
-	exit
-else
-	option=$1
-	parm2=$2
-	logFile=debug.log
-	if [ $# -ge 2 ]; then
-		logFile=$2
-	fi
-fi
-	
-main
diff --git a/oamapps/columnstoreSupport/alarmReport.sh b/oamapps/columnstoreSupport/alarmReport.sh
index 865ea95a4..098c90705 100755
--- a/oamapps/columnstoreSupport/alarmReport.sh
+++ b/oamapps/columnstoreSupport/alarmReport.sh
@@ -14,7 +14,10 @@ else
         DATE=" "
 fi
 
-rm -f /tmp/logReport.log
+#get temp directory
+tmpDir=`$INSTALLDIR/bin/getConfig SystemConfig SystemTempFileDir`
+
+rm -f ${tmpDir}/logReport.log
 
 {
 echo " "
@@ -31,6 +34,6 @@ if test -f /var/log/mariadb/columnstore/archive/alarm.log-$DATE ; then
 	cat /var/log/mariadb/columnstore/archive/alarm.log-$DATE 2>/dev/null
 fi
 
-} > /tmp/logReport.log
+} > ${tmpDir}/logReport.log
 
-exit 0
\ No newline at end of file
+exit 0
diff --git a/oamapps/columnstoreSupport/bulklogReport.sh b/oamapps/columnstoreSupport/bulklogReport.sh
index 16faeec1e..903ab8002 100755
--- a/oamapps/columnstoreSupport/bulklogReport.sh
+++ b/oamapps/columnstoreSupport/bulklogReport.sh
@@ -14,14 +14,10 @@ else
         INSTALLDIR="/usr/local/mariadb/columnstore"
 fi
 
-USER=`whoami 2>/dev/null`
-if [ $USER = "root" ]; then
-	SUDO=" "
-else
-	SUDO="sudo"
-fi
+#get temp directory
+tmpDir=`$INSTALLDIR/bin/getConfig SystemConfig SystemTempFileDir`
 
-$SUDO rm -f /tmp/${MODULE}_bulklogReport.txt
+rm -f ${tmpDir}/${MODULE}_bulklogReport.txt
 
 {
 
@@ -34,6 +30,6 @@ if test -d $INSTALLDIR/data/bulk ; then
 	egrep '(ERR|CRIT)' $INSTALLDIR/data/bulk/log/*.err 2>/dev/null
 fi
 
-} > /tmp/${MODULE}_bulklogReport.txt
+} > ${tmpDir}/${MODULE}_bulklogReport.txt
 
 exit 0
diff --git a/oamapps/columnstoreSupport/calpontSupport.cpp b/oamapps/columnstoreSupport/calpontSupport.cpp
deleted file mode 100644
index 6dd8f375f..000000000
--- a/oamapps/columnstoreSupport/calpontSupport.cpp
+++ /dev/null
@@ -1,1102 +0,0 @@
-/* Copyright (C) 2013 Columnstore Corp. */
-
-
-/******************************************************************************************
-* $Id: columnstoreSupport.cpp 64 2006-10-12 22:21:51Z dhill $
-*
-*
-*
-******************************************************************************************/
-/**
- * @file
- */
-
-#include <iterator>
-#include <numeric>
-#include <deque>
-#include <iostream>
-#include <ostream>
-#include <fstream>
-#include <cstdlib>
-#include <string>
-#include <limits.h>
-#include <sstream>
-#include <exception>
-#include <stdexcept>
-#include <vector>
-#include "stdio.h"
-#include "ctype.h"
-#include <netdb.h>
-#include <readline/readline.h>
-
-#include "liboamcpp.h"
-#include "configcpp.h"
-#include "installdir.h"
-
-using namespace std;
-using namespace oam;
-using namespace config;
-
-typedef struct Child_Module_struct
-{
-    std::string     moduleName;
-    std::string     moduleIP;
-    std::string     hostName;
-} ChildModule;
-
-typedef std::vector<ChildModule> ChildModuleList;
-
-string currentDate;
-string systemName;
-string localModule;
-string localModuleHostName;
-ChildModuleList childmodulelist;
-ChildModuleList parentmodulelist;
-ChildModule childmodule;
-
-string rootPassword = "";
-string debug_flag = "0";
-string mysqlpw = " ";
-
-int runningThreads = 0;
-pthread_mutex_t mutex1 = PTHREAD_MUTEX_INITIALIZER;
-
-typedef boost::tuple<ChildModuleList::iterator, string > threadInfo_t;
-
-bool LOCAL = false;
-
-void title(string outputFile = "columnstoreSupportReport.txt")
-{
-    string cmd = "echo '%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%' >> " + outputFile;
-    system(cmd.c_str());
-    cmd = "echo ' ' >> " + outputFile;
-    system(cmd.c_str());
-    cmd = "echo ' System " + systemName + "' >> " + outputFile;
-    system(cmd.c_str());
-    cmd = "echo ' columnstoreSupportReport script ran from Module " + localModule + " on " + currentDate + "' >> " + outputFile;
-    system(cmd.c_str());
-    cmd = "echo ' ' >> " + outputFile;
-    system(cmd.c_str());
-    cmd = "echo '%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%' >> " + outputFile;
-    system(cmd.c_str());
-}
-
-void childReportThread(threadInfo_t& st)
-{
-    ChildModuleList::iterator& list = boost::get<0>(st);
-    string reportType = boost::get<1>(st);
-
-    string remoteModuleName = (*list).moduleName;
-    string remoteModuleIP = (*list).moduleIP;
-    string remoteHostName = (*list).hostName;
-
-    string installDir(startup::StartUp::installDir());
-
-    pthread_mutex_lock( &mutex1 );
-    runningThreads++;
-//cout << "++ " << runningThreads << endl;
-    pthread_mutex_unlock( &mutex1 );
-
-    string outputFile;
-
-    if (reportType == "log")
-    {
-        outputFile = remoteModuleName + "_" + reportType + "Report.tar.gz";
-    }
-    else if (reportType == "hadoop")
-    {
-        outputFile = "hadoopReport.txt";
-    }
-    else
-    {
-        outputFile = remoteModuleName + "_" + reportType + "Report.txt";
-
-        title(outputFile);
-
-        string cmd = "echo '=======================================================================' >> " + outputFile;
-        system(cmd.c_str());
-        cmd = "echo '=                    " + reportType + " report                                  =' >> " + outputFile;
-        system(cmd.c_str());
-        cmd = "echo '=======================================================================' >> " + outputFile;
-        system(cmd.c_str());
-    }
-
-    //run remote report script
-    if (reportType == "hadoop")
-        cout << "Get " + reportType + " report data" << endl;
-    else
-        cout << "Get " + reportType + " report data for " +  remoteModuleName + "      " << endl;
-
-    cout.flush();
-
-    string cmd = installDir + "/bin/remote_command.sh " + remoteModuleIP + " " + rootPassword + " '" +
-                 installDir + "/bin/" + reportType + "Report.sh " + remoteModuleName + " " + installDir +
-                 "' " + debug_flag + " - forcetty";
-    int rtnCode = system(cmd.c_str());
-
-    if (WEXITSTATUS(rtnCode) != 0)
-    {
-        cout << "Error with running remote_command.sh, exiting..." << endl;
-    }
-
-    cmd = installDir + "/bin/remote_scp_get.sh " + remoteModuleIP + " " + rootPassword + " /tmp/" + outputFile + " > /dev/null 2>&1";
-    rtnCode = system(cmd.c_str());
-
-    if (WEXITSTATUS(rtnCode) != 0)
-        cout << "ERROR: failed to retrieve /tmp/" << outputFile << " from " + remoteHostName << endl;
-
-    pthread_mutex_lock( &mutex1 );
-    runningThreads--;
-//cout << "-- " << runningThreads << endl;
-    pthread_mutex_unlock( &mutex1 );
-
-    // exit thread
-    pthread_exit(0);
-}
-
-void reportThread(string reporttype)
-{
-    string reportType = reporttype;
-
-    string installDir(startup::StartUp::installDir());
-    Oam oam;
-
-    pthread_mutex_lock( &mutex1 );
-    runningThreads++;
-//cout << "++ " << runningThreads << endl;
-    pthread_mutex_unlock( &mutex1 );
-
-    string outputFile = localModule + "_" + reportType + "Report.txt";
-
-    // run on child servers and get report
-    if (!LOCAL)
-    {
-        ChildModuleList::iterator list1 = childmodulelist.begin();
-
-        for (; list1 != childmodulelist.end() ; list1++)
-        {
-            threadInfo_t* st = new threadInfo_t;
-            *st = boost::make_tuple(list1, reportType);
-
-            pthread_t childreportthread;
-            int status = pthread_create (&childreportthread, NULL, (void* (*)(void*)) &childReportThread, st);
-
-            if ( status != 0 )
-            {
-                cout <<  "ERROR: childreportthread: pthread_create failed, return status = " + oam.itoa(status) << endl;
-            }
-
-            sleep(1);
-        }
-    }
-
-    // run report on local server
-    cout << "Get " + reportType + " report data for " + localModule  << endl;
-
-    if (reportType == "log")
-    {
-        string cmd = installDir + "/bin/logReport.sh " + localModule + " " + installDir;
-        system(cmd.c_str());
-
-        cmd = "mv -f /tmp/" + localModule + "_logReport.tar.gz .";
-        system(cmd.c_str());
-
-        cmd = "tar -zcf " + localModule + "_mysqllogReport.tar.gz " + installDir + "/mysql/db/*.err* 2>/dev/null";
-        system(cmd.c_str());
-
-        // run log config on local server
-        cout << "Get log config data for " + localModule << endl;
-
-        cmd = "echo ' ' >> " + outputFile;
-        system(cmd.c_str());
-        cmd = "echo '******************** Log Configuration  ********************' >> " + outputFile;
-        system(cmd.c_str());
-        cmd = "echo ' ' >> " + outputFile;
-        system(cmd.c_str());
-        cmd = "echo '################# mcsadmin getLogConfig ################# ' >> " + outputFile;
-        system(cmd.c_str());
-        cmd = "echo ' ' >> " + outputFile;
-        system(cmd.c_str());
-        cmd = installDir + "/bin/mcsadmin getLogConfig >> " + outputFile;
-        system(cmd.c_str());
-    }
-    else
-    {
-        //get local report
-        title(outputFile);
-
-        string cmd = "echo '=======================================================================' >> " + outputFile;
-        system(cmd.c_str());
-        cmd = "echo '=                    " + reportType + " report                                  =' >> " + outputFile;
-        system(cmd.c_str());
-        cmd = "echo '=======================================================================' >> " + outputFile;
-        system(cmd.c_str());
-
-        cmd = installDir + "/bin/" + reportType + "Report.sh " + localModule + " " + installDir;
-        system(cmd.c_str());
-        cmd = " mv -f /tmp/" + localModule + "_" + reportType + "Report.txt .";
-        system(cmd.c_str());
-
-        if (reportType == "config" )
-        {
-            cmd = "echo ' ' >> " + outputFile;
-            system(cmd.c_str());
-            cmd = "echo '******************** System Network Configuration ********************' >> " + outputFile;
-            system(cmd.c_str());
-            cmd = "echo ' ' >> " + outputFile;
-            system(cmd.c_str());
-            cmd = "echo '################# mcsadmin getSystemNetworkConfig ################# ' >> " + outputFile;
-            system(cmd.c_str());
-            cmd = "echo ' ' >> " + outputFile;
-            system(cmd.c_str());
-            cmd = installDir + "/bin/mcsadmin getSystemNetworkConfig >> " + outputFile;
-            system(cmd.c_str());
-
-            cmd = "echo ' ' >> " + outputFile;
-            system(cmd.c_str());
-            cmd = "echo '******************** System Module Configure  ********************' >> " + outputFile;
-            system(cmd.c_str());
-            cmd = "echo ' ' >> " + outputFile;
-            system(cmd.c_str());
-            cmd = "echo '################# mcsadmin getModuleTypeConfig ################# ' >> " + outputFile;
-            system(cmd.c_str());
-            cmd = "echo ' ' >> " + outputFile;
-            system(cmd.c_str());
-            cmd = installDir + "/bin/mcsadmin getModuleTypeConfig >> " + outputFile;
-            system(cmd.c_str());
-
-            cmd = "echo ' ' >> " + outputFile;
-            system(cmd.c_str());
-            cmd = "echo '******************** System Storage Configuration  ********************' >> " + outputFile;
-            system(cmd.c_str());
-            cmd = "echo ' ' >> " + outputFile;
-            system(cmd.c_str());
-            cmd = "echo '################# mcsadmin getStorageConfig ################# ' >> " + outputFile;
-            system(cmd.c_str());
-            cmd = "echo ' ' >> " + outputFile;
-            system(cmd.c_str());
-            cmd = installDir + "/bin/mcsadmin getStorageConfig >> " + outputFile;
-            system(cmd.c_str());
-
-            cmd = "echo ' ' >> " + outputFile;
-            system(cmd.c_str());
-            cmd = "echo '******************** System Storage Status  ********************' >> " + outputFile;
-            system(cmd.c_str());
-            cmd = "echo ' ' >> " + outputFile;
-            system(cmd.c_str());
-            cmd = "echo '################# mcsadmin getStorageStatus ################# ' >> " + outputFile;
-            system(cmd.c_str());
-            cmd = "echo ' ' >> " + outputFile;
-            system(cmd.c_str());
-            cmd = installDir + "/bin/mcsadmin getStorageStatus >> " + outputFile;
-            system(cmd.c_str());
-
-            cmd = "echo ' ' >> " + outputFile;
-            system(cmd.c_str());
-            cmd = "echo '******************** System Status  ********************' >> " + outputFile;
-            system(cmd.c_str());
-            cmd = "echo ' ' >> " + outputFile;
-            system(cmd.c_str());
-            cmd = "echo '################# mcsadmin getSystemInfo ################# ' >> " + outputFile;
-            system(cmd.c_str());
-            cmd = "echo ' ' >> " + outputFile;
-            system(cmd.c_str());
-            cmd = installDir + "/bin/mcsadmin getSystemInfo >> " + outputFile;
-            system(cmd.c_str());
-
-            cmd = "echo ' ' >> " + outputFile;
-            system(cmd.c_str());
-            cmd = "echo '******************** System Configuration File  ********************' >> " + outputFile;
-            system(cmd.c_str());
-            cmd = "echo ' ' >> " + outputFile;
-            system(cmd.c_str());
-            cmd = "echo '################# cat /etc/mariadb/columnstore.xml ################# ' >> " + outputFile;
-            system(cmd.c_str());
-            cmd = "echo ' ' >> " + outputFile;
-            system(cmd.c_str());
-            cmd = "cat " + installDir + "/etc/mariadb/columnstore.xml >> " + outputFile;
-            system(cmd.c_str());
-        }
-
-        if (reportType == "resource" )
-        {
-            if (LOCAL)
-            {
-                cmd = "echo '################# mcsadmin getModuleResourceUsage ################# ' >> " + outputFile;
-                system(cmd.c_str());
-                cmd = "echo ' ' >> " + outputFile;
-                system(cmd.c_str());
-                string cmd = installDir + "/bin/mcsadmin getModuleResourceUsage " + localModule + " >> " + outputFile;
-                system(cmd.c_str());
-            }
-            else
-            {
-                cmd = "echo '################# mcsadmin getSystemResourceUsage ################# ' >> " + outputFile;
-                system(cmd.c_str());
-                cmd = "echo ' ' >> " + outputFile;
-                system(cmd.c_str());
-                string cmd = installDir + "/bin/mcsadmin getSystemResourceUsage >> " + outputFile;
-                system(cmd.c_str());
-            }
-        }
-    }
-
-    // exit thread
-    pthread_mutex_lock( &mutex1 );
-    runningThreads--;
-//cout << "-- " << runningThreads << endl;
-    pthread_mutex_unlock( &mutex1 );
-
-    pthread_exit(0);
-}
-
-int main(int argc, char* argv[])
-{
-    Oam oam;
-    string installDir(startup::StartUp::installDir());
-
-    Config* sysConfig = Config::makeConfig();
-    string SystemSection = "SystemConfig";
-    string InstallSection = "Installation";
-
-    bool HARDWARE = false;
-    bool SOFTWARE = false;
-    bool CONFIG = false;
-    bool DBMS = false;
-    bool RESOURCE = false;
-    bool LOG = false;
-    bool BULKLOG = false;
-    bool HADOOP = false;
-
-    //get current time and date
-    time_t now;
-    now = time(NULL);
-    struct tm tm;
-    localtime_r(&now, &tm);
-    char timestamp[200];
-    strftime (timestamp, 200, "%m:%d:%y-%H:%M:%S", &tm);
-    currentDate = timestamp;
-
-    char helpArg[3] = "-h";
-
-    // Get System Name
-    try
-    {
-        oam.getSystemConfig("SystemName", systemName);
-    }
-    catch (...)
-    {
-        systemName = "unassigned";
-    }
-
-    // get Local Module Name and Server Install Indicator
-    string singleServerInstall;
-
-    oamModuleInfo_t st;
-
-    try
-    {
-        st = oam.getModuleInfo();
-        localModule = boost::get<0>(st);
-    }
-    catch (...)
-    {
-        cout << endl << "**** Failed : Failed to read Local Module Name" << endl;
-        exit(-1);
-    }
-
-    try
-    {
-        oam.getSystemConfig("SingleServerInstall", singleServerInstall);
-    }
-    catch (...)
-    {
-        singleServerInstall = "y";
-    }
-
-    if (argc == 1)
-    {
-        argv[1] = &helpArg[0];
-        argc = 2;
-    }
-
-    string DataFilePlugin;
-
-    try
-    {
-        DataFilePlugin = sysConfig->getConfig(SystemSection, "DataFilePlugin");
-    }
-    catch (...)
-    {
-        cout << "ERROR: Problem accessing Columnstore configuration file" << endl;
-        exit(-1);
-    }
-
-    for ( int i = 1; i < argc; i++ )
-    {
-        if ( string("-h") == argv[i] )
-        {
-            cout << endl;
-            cout << "'columnstoreSupport' generates a Set of System Support Report Files in a tar file" << endl;
-            cout << "called columnstoreSupportReport.'system-name'.tar.gz in the local directory." << endl;
-            cout << "It should be run on the server with the DBRM front-end." << endl;
-            cout << "Check the Admin Guide for additional information." << endl;
-            cout << endl;
-            cout << "Usage: columnstoreSupport [-h][-a][-hw][-s][-c][-db][-r][-l][-bl][-lc][-p 'root-password'][-mp 'mysql-root-password'][-de]";
-
-            // if hdfs set up print the hadoop option
-            if (!DataFilePlugin.empty())
-                cout << "[-hd]";
-
-            cout << endl;
-            cout << "			-h  help" << endl;
-            cout << "			-a  Output all Reports (excluding Bulk Logs Reports)" << endl;
-            cout << "			-hw Output Hardware Reports only" << endl;
-            cout << "			-s  Output Software Reports only" << endl;
-            cout << "			-c  Output Configuration/Status Reports only" << endl;
-            cout << "			-db Output DBMS Reports only" << endl;
-            cout << "			-r  Output Resource Reports only" << endl;
-            cout << "			-l  Output Columnstore Log/Alarms Reports only" << endl;
-            cout << "			-bl Output Columnstore Bulk Log Reports only" << endl;
-            cout << "			-lc Output Reports for Local Server only" << endl;
-            cout << "			-p  password (multi-server systems), root-password or 'ssh' to use 'ssh keys'" << endl;
-            cout << "			-mp mysql root user password" << endl;
-            cout << "			-de Debug Flag" << endl;
-
-            // if hdfs set up print the hadoop option
-            if (!DataFilePlugin.empty())
-                cout << "			-hd Output hadoop reports only" << endl;
-
-            exit (0);
-        }
-        else
-        {
-            if ( string("-a") == argv[i] )
-            {
-                HARDWARE = true;
-                SOFTWARE = true;
-                CONFIG = true;
-                DBMS = true;
-                RESOURCE = true;
-                LOG = true;
-                HADOOP = (DataFilePlugin.empty() ? false : true);
-            }
-            else if ( string("-hw") == argv[i] )
-                HARDWARE = true;
-            else if ( string("-s") == argv[i] )
-                SOFTWARE = true;
-            else if ( string("-c") == argv[i] )
-                CONFIG = true;
-            else if ( string("-db") == argv[i] )
-                DBMS = true;
-            else if ( string("-r") == argv[i] )
-                RESOURCE = true;
-            else if ( string("-l") == argv[i] )
-                LOG = true;
-            else if ( string("-bl") == argv[i] )
-                BULKLOG = true;
-            else if ( string("-lc") == argv[i] )
-                LOCAL = true;
-            else if ( string("-p") == argv[i] )
-            {
-                i++;
-
-                if ( argc == i )
-                {
-                    cout << "ERROR: missing root password argument" << endl;
-                    exit(-1);
-                }
-
-                rootPassword = argv[i];
-
-                //add single quote for special characters
-                if ( rootPassword != "ssh" )
-                {
-                    rootPassword = "'" + rootPassword + "'";
-                }
-            }
-            else if ( string("-mp") == argv[i] )
-            {
-                i++;
-
-                if ( argc == i )
-                {
-                    cout << "ERROR: missing mysql root user password argument" << endl;
-                    exit(-1);
-                }
-
-                mysqlpw = argv[i];
-                mysqlpw = "'" + mysqlpw + "'";
-            }
-            else if ( string("-de") == argv[i] )
-                debug_flag = "1";
-            else if ( string("-hd") == argv[i] )
-            {
-                HADOOP = (DataFilePlugin.empty() ? false : true);
-            }
-            else
-            {
-                cout << "Invalid Option of '" << argv[i] << "', run with '-h' for help" << endl;
-                exit (1);
-            }
-        }
-    }
-
-    //default to -a if nothing is set
-    if ( !HARDWARE && !SOFTWARE && !CONFIG && !DBMS && !RESOURCE && !LOG && !BULKLOG && !HADOOP)
-    {
-        HARDWARE = true;
-        SOFTWARE = true;
-        CONFIG = true;
-        DBMS = true;
-        RESOURCE = true;
-        LOG = true;
-        HADOOP = (DataFilePlugin.empty() ? false : true);
-    }
-
-    //get Parent OAM Module Name and setup of it's Custom OS files
-    string PrimaryUMModuleName;
-
-    try
-    {
-        PrimaryUMModuleName = sysConfig->getConfig(SystemSection, "PrimaryUMModuleName");
-    }
-    catch (...)
-    {
-        cout << "ERROR: Problem getting Parent OAM Module Name" << endl;
-        exit(-1);
-    }
-
-    if ( PrimaryUMModuleName == "unassigned" )
-        PrimaryUMModuleName = localModule;
-
-    if ( (localModule != PrimaryUMModuleName) && DBMS )
-    {
-        char* pcommand = 0;
-        char* p;
-        string argument = "n";
-
-        while (true)
-        {
-            cout << endl << "You selected to get the DBMS data." << endl;
-            cout << "You need to run the columnstoreSupport command on module '" << PrimaryUMModuleName << "' to get that information." << endl;
-            cout << "Or you can proceed on to get all data except the DBMS." << endl;
-
-            pcommand = readline("           Do you want to proceed: (y or n) [n]: ");
-
-            if (pcommand && *pcommand)
-            {
-                p = strtok(pcommand, " ");
-                argument = p;
-                free(pcommand);
-                pcommand = 0;
-            }
-
-            if (pcommand)
-            {
-                free(pcommand);
-                pcommand = 0;
-            }
-
-            if ( argument == "y")
-            {
-                cout << endl;
-                break;
-            }
-            else if ( argument == "n")
-                exit (1);
-        }
-    }
-
-    //get number of worker-nodes, will tell us if a single server system
-    //get Parent OAM Module Name and setup of it's Custom OS files
-    try
-    {
-        string NumWorkers = sysConfig->getConfig("DBRM_Controller", "NumWorkers");
-
-        if ( NumWorkers == "1" )
-            singleServerInstall = "y";
-    }
-    catch (...)
-    {}
-
-    if ( singleServerInstall == "n" && !LOCAL)
-        if ( HARDWARE || SOFTWARE || CONFIG || RESOURCE || LOG || HADOOP )
-            if ( rootPassword.empty() )
-            {
-                cout << "ERROR: Multi-Module System, Password Argument required or use '-lc' option, check help for more information" << endl;
-                exit(-1);
-            }
-
-    //get Parent OAM Module Name and setup of it's Custom OS files
-    //string parentOAMModuleName;
-    ChildModule parentOAMModule;
-
-    try
-    {
-        parentOAMModule.moduleName = sysConfig->getConfig(SystemSection, "ParentOAMModuleName");
-    }
-    catch (...)
-    {
-        cout << "ERROR: Problem getting Parent OAM Module Name" << endl;
-        exit(-1);
-    }
-
-    //Get list of configured system modules
-    SystemModuleTypeConfig sysModuleTypeConfig;
-
-    try
-    {
-        oam.getSystemConfig(sysModuleTypeConfig);
-    }
-    catch (...)
-    {
-        cout << "ERROR: Problem reading the Columnstore System Configuration file" << endl;
-        exit(-1);
-    }
-
-    string ModuleSection = "SystemModuleConfig";
-
-    for ( unsigned int i = 0 ; i < sysModuleTypeConfig.moduletypeconfig.size(); i++)
-    {
-        string moduleType = sysModuleTypeConfig.moduletypeconfig[i].ModuleType;
-        int moduleCount = sysModuleTypeConfig.moduletypeconfig[i].ModuleCount;
-
-        if ( moduleCount == 0 )
-            //no modules equipped for this Module Type, skip
-            continue;
-
-        //get IP addresses and Host Names
-        DeviceNetworkList::iterator listPT = sysModuleTypeConfig.moduletypeconfig[i].ModuleNetworkList.begin();
-
-        for ( ; listPT != sysModuleTypeConfig.moduletypeconfig[i].ModuleNetworkList.end() ; listPT++)
-        {
-            string moduleName = (*listPT).DeviceName;
-            HostConfigList::iterator pt1 = (*listPT).hostConfigList.begin();
-            string moduleIPAddr = (*pt1).IPAddr;
-            string moduleHostName = (*pt1).HostName;
-
-            if ( moduleName == localModule)
-            {
-                localModuleHostName = moduleHostName;
-            }
-
-            //save Child modules
-            if ( moduleName != localModule && moduleType != "xm")
-            {
-                childmodule.moduleName = moduleName;
-                childmodule.moduleIP = moduleIPAddr;
-                childmodule.hostName = moduleHostName;
-                childmodulelist.push_back(childmodule);
-            }
-
-            if (moduleName == parentOAMModule.moduleName)
-            {
-                parentOAMModule.moduleIP = moduleIPAddr;
-                parentOAMModule.hostName = moduleHostName;
-                parentOAMModule.moduleName = moduleName;
-            }
-        }
-    } //end of i for loop
-
-    // create a clean Columnstore Support Report
-    system("rm -f *_configReport.txt");
-    system("rm -f *_dbmsReport.txt");
-    system("rm -f *_hardwareReport.txt");
-    system("rm -f *_logReport.txt");
-    system("rm -f *_bulklogReport.txt");
-    system("rm -f *_resourceReport.txt");
-    system("rm -f *_softwareReport.txt");
-    system("rm -f hadoopReport.txt");
-
-    //
-    // Software
-    //
-
-    if ( SOFTWARE )
-    {
-        string reportType = "software";
-        pthread_t reportthread;
-        int status = pthread_create (&reportthread, NULL, (void* (*)(void*)) &reportThread, &reportType);
-
-        if ( status != 0 )
-        {
-            cout <<  "ERROR: reportthread: pthread_create failed, return status = " + oam.itoa(status);
-        }
-
-        sleep(5);
-    }
-
-    //
-    // Configuration
-    //
-
-    if ( CONFIG )
-    {
-        string reportType = "config";
-        pthread_t reportthread;
-        int status = pthread_create (&reportthread, NULL, (void* (*)(void*)) &reportThread, &reportType);
-
-        if ( status != 0 )
-        {
-            cout <<  "ERROR: reportthread: pthread_create failed, return status = " + oam.itoa(status);
-        }
-
-        sleep(5);
-    }
-
-    //
-    // Alarms and Columnstore Logs
-    //
-
-    if ( LOG )
-    {
-        string reportType = "log";
-        pthread_t reportthread;
-        int status = pthread_create (&reportthread, NULL, (void* (*)(void*)) &reportThread, &reportType);
-
-        if ( status != 0 )
-        {
-            cout <<  "ERROR: reportthread: pthread_create failed, return status = " + oam.itoa(status);
-        }
-
-        sleep(5);
-    }
-
-    //
-    // Bulk Logs
-    //
-
-    if ( BULKLOG )
-    {
-        string reportType = "bulklog";
-        pthread_t reportthread;
-        int status = pthread_create (&reportthread, NULL, (void* (*)(void*)) &reportThread, &reportType);
-
-        if ( status != 0 )
-        {
-            cout <<  "ERROR: reportthread: pthread_create failed, return status = " + oam.itoa(status);
-        }
-
-        sleep(5);
-    }
-
-    //
-    // Hardware
-    //
-
-    if ( HARDWARE )
-    {
-        string reportType = "hardware";
-        pthread_t reportthread;
-        int status = pthread_create (&reportthread, NULL, (void* (*)(void*)) &reportThread, &reportType);
-
-        if ( status != 0 )
-        {
-            cout <<  "ERROR: reportthread: pthread_create failed, return status = " + oam.itoa(status);
-        }
-
-        sleep(5);
-    }
-
-    //
-    // Resources
-    //
-
-    if ( RESOURCE )
-    {
-        string reportType = "resource";
-        pthread_t reportthread;
-        int status = pthread_create (&reportthread, NULL, (void* (*)(void*)) &reportThread, &reportType);
-
-        if ( status != 0 )
-        {
-            cout <<  "ERROR: reportthread: pthread_create failed, return status = " + oam.itoa(status);
-        }
-
-        sleep(5);
-    }
-
-    //
-    // DBMS
-    //
-
-    if ( DBMS )
-    {
-        system("rm -f columnstoreSupportReport.txt;touch columnstoreSupportReport.txt");
-        title();
-
-        system("echo '=======================================================================' >> columnstoreSupportReport.txt");
-        system("echo '=                    DBMS Report                                      =' >> columnstoreSupportReport.txt");
-        system("echo '=======================================================================' >> columnstoreSupportReport.txt");
-
-        // run DBMS report on local server
-        cout << "Get dbms report data for " << localModule << endl;
-
-        bool FAILED = false;
-
-        if ( localModule != PrimaryUMModuleName )
-        {
-            cout << "     FAILED: run columnstoreSupport on '" << PrimaryUMModuleName << "' to get the dbrm report" << endl;
-            FAILED = true;
-        }
-        else
-        {
-            // check if mysql is supported and get info
-            string columnstoreMysql = installDir + "/mysql/bin/mysql --defaults-file=" + installDir + "/mysql/my.cnf -u root ";
-            string cmd = columnstoreMysql + " -e 'status' > /tmp/idbmysql.log 2>&1";
-            system(cmd.c_str());
-
-            //check for mysql password set
-            string pwprompt = " ";
-
-            if (oam.checkLogStatus("/tmp/idbmysql.log", "ERROR 1045") )
-            {
-                cout << "NOTE: MySQL root user password is set" << endl;
-
-                //needs a password, was password entered on command line
-                if ( mysqlpw == " " )
-                {
-                    //go check my.cnf
-                    string file = installDir + "/mysql/my.cnf";
-                    ifstream oldFile (file.c_str());
-
-                    vector <string> lines;
-                    char line[200];
-                    string buf;
-
-                    while (oldFile.getline(line, 200))
-                    {
-                        buf = line;
-                        string::size_type pos = buf.find("password", 0);
-
-                        if (pos != string::npos)
-                        {
-                            string::size_type pos1 = buf.find("=", 0);
-
-                            if (pos1 != string::npos)
-                            {
-                                pos = buf.find("#", 0);
-
-                                if (pos == string::npos)
-                                {
-                                    //password arg in my.cnf, go get password
-                                    cout << "NOTE: Using password from my.cnf" << endl;
-                                    mysqlpw = buf.substr(pos1 + 1, 80);
-                                    cout << mysqlpw << endl;
-                                    break;
-                                }
-                            }
-                        }
-                    }
-
-                    oldFile.close();
-
-                    if ( mysqlpw == " " )
-                    {
-                        cout << "NOTE: No password provide on command line or found uncommented in my.cnf" << endl;
-                        cout << endl;
-                        string prompt = " *** Enter MySQL password > ";
-                        mysqlpw = getpass(prompt.c_str());
-                    }
-                }
-
-                //check for mysql password set
-                pwprompt = "--password=" + mysqlpw;
-
-                string cmd = columnstoreMysql + pwprompt + " -e 'status' > /tmp/idbmysql.log 2>&1";
-                system(cmd.c_str());
-
-                if (oam.checkLogStatus("/tmp/idbmysql.log", "ERROR 1045") )
-                {
-                    cout << "FAILED: Failed login using MySQL root user password '" << mysqlpw << "'" << endl;
-                    FAILED = true;
-                }
-            }
-
-            if (!FAILED)
-            {
-                // check if mysql is supported and get info
-                string columnstoreMysql = installDir + "/mysql/bin/mysql --defaults-file=" + installDir + "/mysql/my.cnf -u root " + pwprompt;
-                string cmd = columnstoreMysql + " -V > /dev/null 2>&1";
-                int ret = system(cmd.c_str());
-
-                if ( WEXITSTATUS(ret) == 0)
-                {
-                    // run DBMS report info
-                    system("echo ' ' >> columnstoreSupportReport.txt");
-                    system("echo '******************** DBMS Columnstore Mysql Version ********************' >> columnstoreSupportReport.txt");
-                    system("echo ' ' >> columnstoreSupportReport.txt");
-                    cmd = "echo '################# " + columnstoreMysql + " -e status ################# ' >> columnstoreSupportReport.txt";
-                    system(cmd.c_str());
-                    cmd = "echo ' ' >> columnstoreSupportReport.txt";
-                    system(cmd.c_str());
-                    cmd = columnstoreMysql + " -e 'status' >> columnstoreSupportReport.txt";
-                    system(cmd.c_str());
-
-                    system("echo ' ' >> columnstoreSupportReport.txt");
-                    system("echo '******************** DBMS Mysql Columnstore System Column  ********************' >> columnstoreSupportReport.txt");
-                    system("echo ' ' >> columnstoreSupportReport.txt");
-                    cmd = "echo '################# " + columnstoreMysql + " -e desc calpontsys.syscolumn ################# ' >> columnstoreSupportReport.txt";
-                    system(cmd.c_str());
-                    cmd = "echo ' ' >> columnstoreSupportReport.txt";
-                    system(cmd.c_str());
-                    cmd = columnstoreMysql + " -e 'desc calpontsys.syscolumn;' >> columnstoreSupportReport.txt";
-                    system(cmd.c_str());
-
-                    system("echo ' ' >> columnstoreSupportReport.txt");
-                    system("echo '******************** DBMS Mysql Columnstore System Table  ********************' >> columnstoreSupportReport.txt");
-                    system("echo ' ' >> columnstoreSupportReport.txt");
-                    cmd = "echo '################# " + columnstoreMysql + " -e desc calpontsys.systable ################# ' >> columnstoreSupportReport.txt";
-                    system(cmd.c_str());
-                    cmd = "echo ' ' >> columnstoreSupportReport.txt";
-                    system(cmd.c_str());
-                    cmd = columnstoreMysql + " -e 'desc calpontsys.systable;' >> columnstoreSupportReport.txt";
-                    system(cmd.c_str());
-
-                    system("echo ' ' >> columnstoreSupportReport.txt");
-                    system("echo '******************** DBMS Mysql Columnstore System Catalog Data ********************' >> columnstoreSupportReport.txt");
-                    system("echo ' ' >> columnstoreSupportReport.txt");
-                    cmd = "echo '################# " + columnstoreMysql + " calpontsys < " + installDir + "/mysql/dumpcat_mysql.sql ################# ' >> columnstoreSupportReport.txt";
-                    system(cmd.c_str());
-                    cmd = "echo ' ' >> columnstoreSupportReport.txt";
-                    system(cmd.c_str());
-                    cmd = columnstoreMysql + " calpontsys < " + installDir + "/mysql/dumpcat_mysql.sql >> columnstoreSupportReport.txt";
-                    system(cmd.c_str());
-
-                    system("echo ' ' >> columnstoreSupportReport.txt");
-                    system("echo '******************** DBMS Mysql Columnstore System Table Data ********************' >> columnstoreSupportReport.txt");
-                    system("echo ' ' >> columnstoreSupportReport.txt");
-                    cmd = "echo '################# " + columnstoreMysql + " -e select * from calpontsys.systable ################# ' >> columnstoreSupportReport.txt";
-                    system(cmd.c_str());
-                    cmd = "echo ' ' >> columnstoreSupportReport.txt";
-                    system(cmd.c_str());
-                    cmd = columnstoreMysql + " -e 'select * from calpontsys.systable;' >> columnstoreSupportReport.txt";
-                    system(cmd.c_str());
-
-                    system("echo ' ' >> columnstoreSupportReport.txt");
-                    system("echo '******************** DBMS Mysql Columnstore Usernames ********************' >> columnstoreSupportReport.txt");
-                    system("echo ' ' >> columnstoreSupportReport.txt");
-                    cmd = "echo '################# " + columnstoreMysql + " -e show databases ################# ' >> columnstoreSupportReport.txt";
-                    system(cmd.c_str());
-                    cmd = "echo ' ' >> columnstoreSupportReport.txt";
-                    system(cmd.c_str());
-                    cmd = columnstoreMysql + " -e 'show databases;' >> columnstoreSupportReport.txt";
-                    system(cmd.c_str());
-
-                    system("echo ' ' >> columnstoreSupportReport.txt");
-                    system("echo '******************** DBMS Mysql Columnstore variables ********************' >> columnstoreSupportReport.txt");
-                    system("echo ' ' >> columnstoreSupportReport.txt");
-                    cmd = "echo '################# " + columnstoreMysql + " show variables ################# ' >> columnstoreSupportReport.txt";
-                    system(cmd.c_str());
-                    cmd = "echo ' ' >> columnstoreSupportReport.txt";
-                    system(cmd.c_str());
-                    cmd = columnstoreMysql + " -e 'show variables;' >> columnstoreSupportReport.txt";
-                    system(cmd.c_str());
-                }
-            }
-        }
-
-        system("echo ' ' >> columnstoreSupportReport.txt");
-        system("echo '******************** Database Size Report ********************' >> columnstoreSupportReport.txt");
-        system("echo ' ' >> columnstoreSupportReport.txt");
-        string cmd = "echo '################# /bin/databaseSizeReport ################# ' >> columnstoreSupportReport.txt";
-        system(cmd.c_str());
-        cmd = "echo ' ' >> columnstoreSupportReport.txt";
-        system(cmd.c_str());
-        cmd = installDir + "/bin/databaseSizeReport >> columnstoreSupportReport.txt";
-        system(cmd.c_str());
-
-        system("echo ' ' >> columnstoreSupportReport.txt");
-        system("echo '******************** DBMS Mysql Columnstore config file ********************' >> columnstoreSupportReport.txt");
-        system("echo ' ' >> columnstoreSupportReport.txt");
-        cmd = "echo '################# cat /mysql/my.cnf ################# ' >> columnstoreSupportReport.txt";
-        system(cmd.c_str());
-        cmd = "echo ' ' >> columnstoreSupportReport.txt";
-        system(cmd.c_str());
-        cmd = "cat " + installDir + "/mysql/my.cnf 2>/dev/null >> columnstoreSupportReport.txt";
-        system(cmd.c_str());
-
-        system("echo ' ' >> columnstoreSupportReport.txt");
-        system("echo '******************** Active Queries ********************' >> columnstoreSupportReport.txt");
-        system("echo ' ' >> columnstoreSupportReport.txt");
-        cmd = "echo '################# mcsadmin getActiveSqlStatement ################# ' >> columnstoreSupportReport.txt";
-        system(cmd.c_str());
-        cmd = "echo ' ' >> columnstoreSupportReport.txt";
-        system(cmd.c_str());
-        cmd = installDir + "/bin/mcsadmin getActiveSqlStatement >> columnstoreSupportReport.txt";
-        system(cmd.c_str());
-
-        cmd = "cat columnstoreSupportReport.txt > " + localModule + "_dbmsReport.txt";
-        system(cmd.c_str());
-    }
-
-    //
-    // HADOOP
-    //
-
-    if (HADOOP)
-    {
-        if (LOCAL || childmodulelist.empty())
-        {
-            cout << "Get hadoop report data" << endl;
-            string cmd = installDir + "/bin/hadoopReport.sh " + localModule + " " + installDir + "\n";
-            cmd += " mv -f /tmp/hadoopReport.txt .";
-            FILE* pipe = popen(cmd.c_str(), "r");
-
-            if (!pipe)
-            {
-                cout << "Failed to get a pipe for hadoop health check commands" << endl;
-                exit(-1);
-            }
-
-            pclose(pipe);
-        }
-        else
-        {
-            // only get hadoop report from parentOAMModule, because it's consistant view.
-            parentmodulelist.push_back(parentOAMModule);
-            threadInfo_t* st = new threadInfo_t;
-            ChildModuleList::iterator iter = parentmodulelist.begin();
-            *st = boost::make_tuple(iter, "hadoop");
-
-            pthread_t hdthread;
-            int status = pthread_create (&hdthread, NULL, (void* (*)(void*)) &childReportThread, st);
-
-            if ( status != 0 )
-            {
-                cout <<  "ERROR: childreportthread: pthread_create failed, return status = " + oam.itoa(status) << endl;
-            }
-        }
-    }
-
-    //wait for all threads to complete
-    sleep(5);
-    int wait = 0;
-
-    while (true)
-    {
-//cout << "check " << runningThreads << endl;
-        if (runningThreads < 1)
-            break;
-
-        sleep(2);
-        wait++;
-
-        // give it 60 minutes to complete
-        if ( wait >= 3600 * 5)
-        {
-            cout << "Timed out (60 minutes) waiting for Requests to complete" << endl;
-        }
-    }
-
-    system("rm -f columnstoreSupportReport.txt");
-
-    system("unix2dos *Report.txt > /dev/null 2>&1");
-    system("rm -rf columnstoreSupportReport;mkdir columnstoreSupportReport;mv *Report.txt columnstoreSupportReport/. > /dev/null 2>&1;mv *Report.tar.gz columnstoreSupportReport/. > /dev/null 2>&1");
-    string cmd = "tar -zcf columnstoreSupportReport." + systemName + ".tar.gz columnstoreSupportReport/*";
-    system(cmd.c_str());
-
-
-    cout << endl << "Columnstore Support Script Successfully completed, files located in columnstoreSupportReport." + systemName + ".tar.gz" << endl;
-}
diff --git a/oamapps/columnstoreSupport/columnstoreSupport.cpp b/oamapps/columnstoreSupport/columnstoreSupport.cpp
index 742f81e97..ccf7714c4 100644
--- a/oamapps/columnstoreSupport/columnstoreSupport.cpp
+++ b/oamapps/columnstoreSupport/columnstoreSupport.cpp
@@ -57,6 +57,8 @@ ChildModule childmodule;
 string rootPassword = "";
 string debug_flag = "0";
 string mysqlpw = " ";
+string tmpDir;
+string ProfileFile;
 
 int runningThreads = 0;
 pthread_mutex_t mutex1 = PTHREAD_MUTEX_INITIALIZER;
@@ -129,9 +131,10 @@ void childReportThread(threadInfo_t& st)
 
     cout.flush();
 
-    string cmd = installDir + "/bin/remote_command.sh " + remoteModuleIP + " " + rootPassword + " '" +
+    string cmd = installDir + "/bin/remote_command.sh " + remoteModuleIP + " " + rootPassword + " '. " + ProfileFile + ";" +
                  installDir + "/bin/" + reportType + "Report.sh " + remoteModuleName + " " + installDir +
                  "' " + debug_flag + " - forcetty";
+
     int rtnCode = system(cmd.c_str());
 
     if (WEXITSTATUS(rtnCode) != 0)
@@ -139,11 +142,11 @@ void childReportThread(threadInfo_t& st)
         cout << "Error with running remote_command.sh, exiting..." << endl;
     }
 
-    cmd = installDir + "/bin/remote_scp_get.sh " + remoteModuleIP + " " + rootPassword + " /tmp/" + outputFile + " > /dev/null 2>&1";
+    cmd = installDir + "/bin/remote_scp_get.sh " + remoteModuleIP + " " + rootPassword + " " + tmpDir + "/" + outputFile + " > /dev/null 2>&1";
     rtnCode = system(cmd.c_str());
 
     if (WEXITSTATUS(rtnCode) != 0)
-        cout << "ERROR: failed to retrieve /tmp/" << outputFile << " from " + remoteHostName << endl;
+        cout << "ERROR: failed to retrieve " << tmpDir << "/" << outputFile << " from " + remoteHostName << endl;
 
     pthread_mutex_lock( &mutex1 );
     runningThreads--;
@@ -198,7 +201,7 @@ void reportThread(string reporttype)
         string cmd = installDir + "/bin/logReport.sh " + localModule + " " + installDir;
         system(cmd.c_str());
 
-        cmd = "mv -f /tmp/" + localModule + "_logReport.tar.gz .";
+        cmd = "mv -f " + tmpDir + "/" + localModule + "_logReport.tar.gz .";
         system(cmd.c_str());
 
         cmd = "tar -zcf " + localModule + "_mysqllogReport.tar.gz " + installDir + "/mysql/db/*.err* 2>/dev/null";
@@ -234,7 +237,7 @@ void reportThread(string reporttype)
 
         cmd = installDir + "/bin/" + reportType + "Report.sh " + localModule + " " + installDir;
         system(cmd.c_str());
-        cmd = " mv -f /tmp/" + localModule + "_" + reportType + "Report.txt .";
+        cmd = " mv -f " + tmpDir + "/" + localModule + "_" + reportType + "Report.txt .";
         system(cmd.c_str());
 
         if (reportType == "config" )
@@ -304,6 +307,19 @@ void reportThread(string reporttype)
             cmd = installDir + "/bin/mcsadmin getSystemInfo >> " + outputFile;
             system(cmd.c_str());
 
+            cmd = "echo ' ' >> " + outputFile;
+            system(cmd.c_str());
+            cmd = "echo '******************** System Directories  ********************' >> " + outputFile;
+            system(cmd.c_str());
+            cmd = "echo ' ' >> " + outputFile;
+            system(cmd.c_str());
+            cmd = "echo '################# mcsadmin getSystemDirectories ################# ' >> " + outputFile;
+            system(cmd.c_str());
+            cmd = "echo ' ' >> " + outputFile;
+            system(cmd.c_str());
+            cmd = installDir + "/bin/mcsadmin getSystemDirectories >> " + outputFile;
+            system(cmd.c_str());
+
             cmd = "echo ' ' >> " + outputFile;
             system(cmd.c_str());
             cmd = "echo '******************** System Configuration File  ********************' >> " + outputFile;
@@ -431,6 +447,8 @@ int main(int argc, char* argv[])
         cout << "ERROR: Problem accessing Columnstore configuration file" << endl;
         exit(-1);
     }
+    
+	tmpDir = startup::StartUp::tmpDir();
 
     for ( int i = 1; i < argc; i++ )
     {
@@ -653,6 +671,17 @@ int main(int argc, char* argv[])
         cout << "ERROR: Problem reading the Columnstore System Configuration file" << endl;
         exit(-1);
     }
+    
+    //Get Profile file 
+    try
+    {
+        ProfileFile = sysConfig->getConfig(InstallSection, "ProfileFile");
+    }
+    catch (...)
+    {
+        cout << "ERROR: Problem getting ProfileFile" << endl;
+        exit(-1);
+    }
 
     string ModuleSection = "SystemModuleConfig";
 
@@ -842,14 +871,15 @@ int main(int argc, char* argv[])
         else
         {
             // check if mysql is supported and get info
+            string logFile =  tmpDir + "/idbmysql.log";
             string columnstoreMysql = installDir + "/mysql/bin/mysql --defaults-extra-file=" + installDir + "/mysql/my.cnf -u root ";
-            string cmd = columnstoreMysql + " -e 'status' > /tmp/idbmysql.log 2>&1";
+            string cmd = columnstoreMysql + " -e 'status' > " + logFile + " 2>&1";
             system(cmd.c_str());
 
             //check for mysql password set
             string pwprompt = " ";
 
-            if (oam.checkLogStatus("/tmp/idbmysql.log", "ERROR 1045") )
+            if (oam.checkLogStatus(logFile, "ERROR 1045") )
             {
                 cout << "NOTE: MariaDB Columnstore root user password is set" << endl;
 
@@ -903,10 +933,10 @@ int main(int argc, char* argv[])
                 //check for mysql password set
                 pwprompt = "--password=" + mysqlpw;
 
-                string cmd = columnstoreMysql + pwprompt + " -e 'status' > /tmp/idbmysql.log 2>&1";
+                string cmd = columnstoreMysql + pwprompt + " -e 'status' > " + logFile + " 2>&1";
                 system(cmd.c_str());
 
-                if (oam.checkLogStatus("/tmp/idbmysql.log", "ERROR 1045") )
+                if (oam.checkLogStatus(logFile, "ERROR 1045") )
                 {
                     cout << "FAILED: Failed login using MariaDB Columnstore root user password '" << mysqlpw << "'" << endl;
                     FAILED = true;
@@ -1048,7 +1078,7 @@ int main(int argc, char* argv[])
         {
             cout << "Get hadoop report data" << endl;
             string cmd = installDir + "/bin/hadoopReport.sh " + localModule + " " + installDir + "\n";
-            cmd += " mv -f /tmp/hadoopReport.txt .";
+            cmd += " mv -f " + tmpDir + "/hadoopReport.txt .";
             FILE* pipe = popen(cmd.c_str(), "r");
 
             if (!pipe)
diff --git a/oamapps/columnstoreSupport/configReport.sh b/oamapps/columnstoreSupport/configReport.sh
index b7e0a044a..722935b10 100755
--- a/oamapps/columnstoreSupport/configReport.sh
+++ b/oamapps/columnstoreSupport/configReport.sh
@@ -14,14 +14,10 @@ else
         INSTALLDIR="/usr/local/mariadb/columnstore"
 fi
 
-USER=`whoami 2>/dev/null`
-if [ $USER = "root" ]; then
-	SUDO=" "
-else
-	SUDO="sudo"
-fi
+#get temp directory
+tmpDir=`$INSTALLDIR/bin/getConfig SystemConfig SystemTempFileDir`
 
-$SUDO rm -f /tmp/${MODULE}_configReport.txt
+rm -f ${tmpDir}/${MODULE}_configReport.txt
 
 {
 echo " "
@@ -34,10 +30,10 @@ if [ -n "$chkconfig" ]; then
 	echo " "
 	echo "################# chkconfig --list | grep columnstore #################"
 	echo " "
-	$SUDO chkconfig --list | grep columnstore 2>/dev/null
+	chkconfig --list | grep columnstore 2>/dev/null
 	echo "################# chkconfig --list | grep mysql-Columnstore #################"
 	echo " "
-	$SUDO chkconfig --list | grep mysql-Columnstore 2>/dev/null
+	chkconfig --list | grep mysql-Columnstore 2>/dev/null
 fi
 
 systemctl=`which systemctl 2>/dev/null`
@@ -46,10 +42,10 @@ if [ -n "$systemctl" ]; then
 	echo " "
 	echo "################# systemctl list-unit-files --type=service | grep columnstore #################"
 	echo " "
-	$SUDO systemctl list-unit-files --type=service | grep columnstore 2>/dev/null
+	systemctl list-unit-files --type=service | grep columnstore 2>/dev/null
 	echo "################# systemctl list-unit-files --type=service | grep mysql-Columnstore #################"
 	echo " "
-	$SUDO systemctl list-unit-files --type=service | grep mysql-Columnstore 2>/dev/null
+	systemctl list-unit-files --type=service | grep mysql-Columnstore 2>/dev/null
 fi
 
 updaterc=`which update-rc.d 2>/dev/null`
@@ -58,10 +54,10 @@ if [ -n "$updaterc" ]; then
 	echo " "
 	echo "################# service --status-all | grep columnstore #################"
 	echo " "
-	$SUDO service --status-all | grep columnstore 2>/dev/null
+	service --status-all | grep columnstore 2>/dev/null
 	echo "################# service --status-all | grep mysql-Columnstore #################"
 	echo " "
-	$SUDO service --status-all | grep mysql-Columnstore 2>/dev/null
+	service --status-all | grep mysql-Columnstore 2>/dev/null
 fi
 
 
@@ -70,22 +66,22 @@ echo "-- fstab Configuration --"
 echo " "
 echo "################# cat /etc/fstab #################"
 echo " "
-$SUDO cat /etc/fstab 2>/dev/null
+cat /etc/fstab 2>/dev/null
 
 echo " "
 echo "-- Server Processes --"
 echo " "
 echo "################# ps axu #################"
 echo " "
-$SUDO ps axu
+ps axu
 
 echo " "
 echo "-- Server Processes with resource usage --"
 echo " "
 echo "################# top -b -n 1 #################"
 echo " "
-$SUDO top -b -n 1
+top -b -n 1
 
-} > /tmp/${MODULE}_configReport.txt
+} > ${tmpDir}/${MODULE}_configReport.txt
 
 exit 0
diff --git a/oamapps/columnstoreSupport/hadoopReport.sh b/oamapps/columnstoreSupport/hadoopReport.sh
index 22612fe18..eb80de805 100755
--- a/oamapps/columnstoreSupport/hadoopReport.sh
+++ b/oamapps/columnstoreSupport/hadoopReport.sh
@@ -13,14 +13,10 @@ else
         INSTALLDIR="/usr/local/mariadb/columnstore"
 fi
 
-USER=`whoami 2>/dev/null`
-if [ $USER = "hdfs" ]; then
-	SUDO=" "
-else
-	SUDO="sudo -u hdfs"
-fi
+#get temp directory
+tmpDir=`$INSTALLDIR/bin/getConfig SystemConfig SystemTempFileDir`
 
-sudo rm -f /tmp/hdfsReport.txt
+rm -f ${tmpDir}/hdfsReport.txt
 
 {
 echo 
@@ -30,14 +26,14 @@ echo "-- Hadoop version --"
 echo 
 echo "################# hadoop version  #################"
 echo
-$SUDO hadoop version
+hadoop version
 
 echo 
 echo "-- Data File Plugin --"
 echo 
 echo "######### $INSTALLDIR/bin/getConfig SystemConfig DataFilePlugin ##########"
 echo
-sudo $INSTALLDIR/bin/getConfig SystemConfig DataFilePlugin
+$INSTALLDIR/bin/getConfig SystemConfig DataFilePlugin
 
 echo
 echo
@@ -57,14 +53,14 @@ echo "-- Hadoop Health Check --"
 echo 
 echo "################# hdfs dfsadmin -report #################"
 echo 
-$SUDO hadoop dfsadmin -report 2>/dev/null
+hadoop dfsadmin -report 2>/dev/null
 
 echo 
 echo "-- HDFS check --"
 echo 
 echo "################# hdfs fsck $INSTALLDIR #################"
 echo 
-$SUDO hadoop fsck $INSTALLDIR 2>/dev/null
-} > /tmp/hadoopReport.txt
+hadoop fsck $INSTALLDIR 2>/dev/null
+} > ${tmpDir}/hadoopReport.txt
 
 exit 0
diff --git a/oamapps/columnstoreSupport/hardwareReport.sh b/oamapps/columnstoreSupport/hardwareReport.sh
index dba32e9d2..53e5e7ca3 100755
--- a/oamapps/columnstoreSupport/hardwareReport.sh
+++ b/oamapps/columnstoreSupport/hardwareReport.sh
@@ -14,14 +14,10 @@ else
         INSTALLDIR="/usr/local/mariadb/columnstore"
 fi
 
-USER=`whoami 2>/dev/null`
-if [ $USER = "root" ]; then
-	SUDO=" "
-else
-	SUDO="sudo"
-fi
+#get temp directory
+tmpDir=`$INSTALLDIR/bin/getConfig SystemConfig SystemTempFileDir`
 
-$SUDO rm -f /tmp/${MODULE}_hardwareReport.txt
+rm -f ${tmpDir}/${MODULE}_hardwareReport.txt
 
 {
 echo " "
@@ -32,7 +28,7 @@ echo "-- Server OS Version --"
 echo " "
 echo "################# cat /proc/version #################"
 echo " "
-$SUDO cat /proc/version 2>/dev/null
+cat /proc/version 2>/dev/null
 echo " "
 echo "################# uname -a #################"
 echo " "
@@ -60,35 +56,21 @@ echo "-- Server cpu-info --"
 echo " "
 echo "################# cat /proc/cpuinfo #################"
 echo " "
-$SUDO cat /proc/cpuinfo 2>/dev/null
+cat /proc/cpuinfo 2>/dev/null
 
 echo " "
 echo "-- Server memory-info --"
 echo " "
 echo "################# cat /proc/meminfo #################"
 echo " "
-$SUDO cat /proc/meminfo 2>/dev/null
+$cat /proc/meminfo 2>/dev/null
 
 echo " "
 echo "-- Server mounts --"
 echo " "
 echo "################# cat /proc/mounts #################"
 echo " "
-$SUDO cat /proc/mounts 2>/dev/null
-
-echo " "
-echo "-- Server Disk Scheduler for Columnstore Mounts --"
-echo " "
-for scsi_dev in `mount | awk '/mnt\/tmp/ {print $1}' | awk -F/ '{print $3}' | sed 's/[0-9]*$//'`; do
-        echo '/dev/'$scsi_dev ' scheduler setup is'
-        cat /sys/block/$scsi_dev/queue/scheduler 2>/dev/null
-done
-for scsi_dev in `mount | awk '/MariaDB\/Columnstore\/data/ {print $1}' | awk -F/ '{print $3}' | sed 's/[0-9]*$//'`; do
-        if [ $scsi_dev != "local" ] ; then
-                echo '/dev/'$scsi_dev ' scheduler setup is'
-                cat /sys/block/$scsi_dev/queue/scheduler 2>/dev/null
-        fi
-done
+cat /proc/mounts 2>/dev/null
 
 echo " "
 echo "-- Server Ethernet Configuration --"
@@ -97,6 +79,6 @@ echo "################# ifconfig -a #################"
 echo " "
 ifconfig -a 2>/dev/null
 
-} > /tmp/${MODULE}_hardwareReport.txt
+} > ${tmpDir}/${MODULE}_hardwareReport.txt
 
 exit 0
diff --git a/oamapps/columnstoreSupport/logReport.sh b/oamapps/columnstoreSupport/logReport.sh
index bd1b766af..8655b664c 100755
--- a/oamapps/columnstoreSupport/logReport.sh
+++ b/oamapps/columnstoreSupport/logReport.sh
@@ -14,15 +14,11 @@ else
         INSTALLDIR="/usr/local/mariadb/columnstore"
 fi
 
-USER=`whoami 2>/dev/null`
-if [ $USER = "root" ]; then
-	SUDO=" "
-else
-	SUDO="sudo"
-fi
+#get temp directory
+tmpDir=`$INSTALLDIR/bin/getConfig SystemConfig SystemTempFileDir`
 
-$SUDO rm -f /tmp/${MODULE}_logReport.tar.gz
+rm -f ${tmpDir}/${MODULE}_logReport.tar.gz
 
-tar -zcf /tmp/${MODULE}_logReport.tar.gz /var/log/mariadb/columnstore > /dev/null 2>&1
+tar -zcf ${tmpDir}/${MODULE}_logReport.tar.gz /var/log/mariadb/columnstore > /dev/null 2>&1
 
 exit 0
diff --git a/oamapps/columnstoreSupport/minMaxCheck.sh b/oamapps/columnstoreSupport/minMaxCheck.sh
index 4e36db272..ca6b158e1 100755
--- a/oamapps/columnstoreSupport/minMaxCheck.sh
+++ b/oamapps/columnstoreSupport/minMaxCheck.sh
@@ -32,10 +32,10 @@
 # 2) Two warning.log entries will be logged at the end of the script if one or min/max EM entries were corrected.
 #    Example:
 #       Mar 11 14:16:36 srvqaperf8 oamcpp[16364]: 36.231731 |0|0|0| W 08 CAL0000: min-max-monitor: some values were reset for oids  3004 3005
-#       Mar 11 14:16:36 srvqaperf8 oamcpp[16365]: 36.263270 |0|0|0| W 08 CAL0000: min-max-monitor: log files are /tmp/idb_mm_mon.sdiff.*.15190
+#       Mar 11 14:16:36 srvqaperf8 oamcpp[16365]: 36.263270 |0|0|0| W 08 CAL0000: min-max-monitor: log files are idb_mm_mon.sdiff.*.15190
 # 3) The script outputs the results of the selects in #3 above as it's going through the columns and will echo a line when it finds a col that was corrected.
 #    Example:
-#       **** Extent map min/max changed on the scan.  See results in /tmp/idb_mm_mon.sdiff.3039.15190
+#       **** Extent map min/max changed on the scan.  See results in idb_mm_mon.sdiff.3039.15190
 
 
 # Define the cols array.  Here's a sql statement that will list the date and datetime cols in the expected format.
@@ -56,6 +56,9 @@ if [ -z "$PGMPATH" ]; then
 	PGMPATH=$INSTALLDIR/bin
 fi
 
+#get temp directory
+tmpDir=`$INSTALLDIR/bin/getConfig SystemConfig SystemTempFileDir`
+
 cols=(
 1339664:tpch1.orders.o_orderdate
 1339718:tpch1.lineitem.l_shipdate
@@ -71,18 +74,18 @@ cols=(
 # If called with "all", run the script against all of the column types that use CP.
 #
 if [ $# -eq 1 ] && [ "$1" == "all" ]; then
-	$MYSQLCMD --execute="select concat(objectid, ':', \`schema\`, '.', tablename, '.', columnname) from syscolumn where datatype not in (4, 10, 13) and not (datatype = 2 and columnlength > 8) and not (datatype = 12 and columnlength > 7);" calpontsys --skip-column-names > /tmp/idb_mm_mon.cols
-	cols=( $( cat /tmp/idb_mm_mon.cols ) )
-	rm -f /tmp/idb_mm_mon.cols
+	$MYSQLCMD --execute="select concat(objectid, ':', \`schema\`, '.', tablename, '.', columnname) from syscolumn where datatype not in (4, 10, 13) and not (datatype = 2 and columnlength > 8) and not (datatype = 12 and columnlength > 7);" calpontsys --skip-column-names > ${tmpDir}/idb_mm_mon.cols
+	cols=( $( cat${tmpDir}/idb_mm_mon.cols ) )
+	rm -f ${tmpDir}/idb_mm_mon.cols
 
 #
 # Else if one parm passed, run against the columns in the given schema.
 #
 elif [ $# -eq 1 ]; then
 	db=$1
-        $MYSQLCMD --execute="select concat(objectid, ':', \`schema\`, '.', tablename, '.', columnname) from syscolumn where datatype not in (4, 10, 13) and not (datatype = 2 and columnlength > 8) and not (datatype = 12 and columnlength > 7) and \`schema\` = '$db';" calpontsys --skip-column-names > /tmp/idb_mm_mon.cols
-	cols=( $( cat /tmp/idb_mm_mon.cols ) )
-	rm -f /tmp/idb_mm_mon.cols
+        $MYSQLCMD --execute="select concat(objectid, ':', \`schema\`, '.', tablename, '.', columnname) from syscolumn where datatype not in (4, 10, 13) and not (datatype = 2 and columnlength > 8) and not (datatype = 12 and columnlength > 7) and \`schema\` = '$db';" calpontsys --skip-column-names > ${tmpDir}/idb_mm_mon.cols
+	cols=( $( cat ${tmpDir}/idb_mm_mon.cols ) )
+	rm -f ${tmpDir}/idb_mm_mon.cols
 
 #
 # Else if two parms passed, run the script against all the columns that use CP for that table.
@@ -90,9 +93,9 @@ elif [ $# -eq 1 ]; then
 elif [ $# -eq 2 ]; then
 	db=$1
 	tbl=$2
-        $MYSQLCMD --execute="select concat(objectid, ':', \`schema\`, '.', tablename, '.', columnname) from syscolumn where datatype not in (4, 10, 13) and not (datatype = 2 and columnlength > 8) and not (datatype = 12 and columnlength > 7) and \`schema\` = '$db' and tablename = '$tbl';" calpontsys --skip-column-names > /tmp/idb_mm_mon.cols
-        cols=( $( cat /tmp/idb_mm_mon.cols ) )
-        rm -f /tmp/idb_mm_mon.cols
+        $MYSQLCMD --execute="select concat(objectid, ':', \`schema\`, '.', tablename, '.', columnname) from syscolumn where datatype not in (4, 10, 13) and not (datatype = 2 and columnlength > 8) and not (datatype = 12 and columnlength > 7) and \`schema\` = '$db' and tablename = '$tbl';" calpontsys --skip-column-names > ${tmpDir}/idb_mm_mon.cols
+        cols=( $( cat ${tmpDir}/idb_mm_mon.cols ) )
+        rm -f ${tmpDir}/idb_mm_mon.cols
 
 #
 # Else if three parms passed, run the script against the column.
@@ -101,9 +104,9 @@ elif [ $# -eq 3 ]; then
 	db=$1
 	tbl=$2
 	col=$3
-        $MYSQLCMD --execute="select concat(objectid, ':', \`schema\`, '.', tablename, '.', columnname) from syscolumn where \`schema\` = '$db' and tablename = '$tbl' and columnname='$col';" calpontsys --skip-column-names > /tmp/idb_mm_mon.cols
-        cols=( $( cat /tmp/idb_mm_mon.cols ) )
-        rm -f /tmp/idb_mm_mon.cols
+        $MYSQLCMD --execute="select concat(objectid, ':', \`schema\`, '.', tablename, '.', columnname) from syscolumn where \`schema\` = '$db' and tablename = '$tbl' and columnname='$col';" calpontsys --skip-column-names > ${tmpDir}/idb_mm_mon.cols
+        cols=( $( cat ${tmpDir}/idb_mm_mon.cols ) )
+        rm -f ${tmpDir}/idb_mm_mon.cols
 fi
 
 i=0
@@ -127,29 +130,29 @@ while [ $i -lt ${#cols[@]} ]; do
 	# Look up the oid if the cols array is being used to keep from having to continually update the array if tables are dropped and recreated.
 	#
 	if [ $# -eq 0 ]; then
-		$MYSQLCMD --execute="select concat(objectid, ':', \`schema\`, '.', tablename, '.', columnname) from syscolumn where \`schema\` = '$schema' and tablename='$table' and columnname='$column';" calpontsys --skip-column-names > /tmp/idb_mm_mon.cols
-		results=`wc -l /tmp/idb_mm_mon.cols | awk '{print $1}'`
+		$MYSQLCMD --execute="select concat(objectid, ':', \`schema\`, '.', tablename, '.', columnname) from syscolumn where \`schema\` = '$schema' and tablename='$table' and columnname='$column';" calpontsys --skip-column-names > ${tmpDir}/idb_mm_mon.cols
+		results=`wc -l ${tmpDir}/idb_mm_mon.cols | awk '{print $1}'`
 		if [ $results -eq 0 ]; then
 			oid=0
 		else
-			oid=`cat /tmp/idb_mm_mon.cols`
+			oid=`cat ${tmpDir}/idb_mm_mon.cols`
 		fi
 	fi	
 
-        $PGMPATH/editem -o$oid | awk '{print $1, $6, $8, $12}' >/tmp/idb_mm_mon.$oid.1.$$
+        $PGMPATH/editem -o$oid | awk '{print $1, $6, $8, $12}' >${tmpDir}/idb_mm_mon.$oid.1.$$
         $PGMPATH/editem -c$oid
         $MYSQLCMD --execute="select count($column) from $table" $schema -vvv
-        $PGMPATH/editem -o$oid | awk '{print $1, $6, $8, $12}' >/tmp/idb_mm_mon.$oid.2.$$
-        sdiff /tmp/idb_mm_mon.$oid.1.$$ /tmp/idb_mm_mon.$oid.2.$$ --suppress-common-lines | grep -n -v invalid > /tmp/idb_mm_mon.sdiff.$oid.$$
-        count=`wc -l /tmp/idb_mm_mon.sdiff.$oid.$$ | awk '{print $1}'`
+        $PGMPATH/editem -o$oid | awk '{print $1, $6, $8, $12}' >${tmpDir}/idb_mm_mon.$oid.2.$$
+        sdiff ${tmpDir}/idb_mm_mon.$oid.1.$$ ${tmpDir}/idb_mm_mon.$oid.2.$$ --suppress-common-lines | grep -n -v invalid > ${tmpDir}/idb_mm_mon.sdiff.$oid.$$
+        count=`wc -l ${tmpDir}/idb_mm_mon.sdiff.$oid.$$ | awk '{print $1}'`
         if [ $count -ne 0 ]; then
                 badoidlist="$badoidlist $oid"
                 ((j++))
-                echo "**** Extent map min/max changed on the scan.  See results in /tmp/idb_mm_mon.sdiff.$oid.$$"
+                echo "**** Extent map min/max changed on the scan.  See results in ${tmpDir}/idb_mm_mon.sdiff.$oid.$$"
 	else
-		rm -f /tmp/idb_mm_mon.sdiff.$oid.$$ 
+		rm -f ${tmpDir}/idb_mm_mon.sdiff.$oid.$$ 
         fi
-        rm -f /tmp/idb_mm_mon.$oid.*.$$
+        rm -f ${tmpDir}/idb_mm_mon.$oid.*.$$
         ((i++))
 done
 echo ""
@@ -160,9 +163,9 @@ if [ $j -eq 0 ]; then
 	exit 0
 else
         $PGMPATH/cplogger -w 0 "min-max-monitor: some values were reset for oids" "$badoidlist"
-        $PGMPATH/cplogger -w 0 "min-max-monitor: log files are /tmp/idb_mm_mon.sdiff.*.$$"
+        $PGMPATH/cplogger -w 0 "min-max-monitor: log files are ${tmpDir}/idb_mm_mon.sdiff.*.$$"
         echo "min-max-monitor: some values were reset for oids" "$badoidlist"
-        echo "min-max-monitor: log files are /tmp/idb_mm_mon.sdiff.*.$$"
+        echo "min-max-monitor: log files are ${tmpDir}/idb_mm_mon.sdiff.*.$$"
         echo ""
 	exit 1
 fi
diff --git a/oamapps/columnstoreSupport/resourceReport.sh b/oamapps/columnstoreSupport/resourceReport.sh
index 03f19c2bd..24add52c8 100755
--- a/oamapps/columnstoreSupport/resourceReport.sh
+++ b/oamapps/columnstoreSupport/resourceReport.sh
@@ -14,14 +14,10 @@ else
         INSTALLDIR="/usr/local/mariadb/columnstore"
 fi
 
-USER=`whoami 2>/dev/null`
-if [ $USER = "root" ]; then
-	SUDO=" "
-else
-	SUDO="sudo"
-fi
+#get temp directory
+tmpDir=`$INSTALLDIR/bin/getConfig SystemConfig SystemTempFileDir`
 
-$SUDO rm -f /tmp/${MODULE}_resourceReport.txt
+rm -f ${tmpDir}/${MODULE}_resourceReport.txt
 
 {
 echo " "
@@ -33,7 +29,7 @@ echo "-- Shared Memory --"
 echo " "
 echo "################# ipcs -l #################"
 echo " "
-$SUDO ipcs -l
+ipcs -l
 
 echo "################# $INSTALLDIR/bin/clearShm -n #################"
 echo " "
@@ -44,7 +40,7 @@ echo "-- Disk Usage --"
 echo " "
 echo "################# df -k #################"
 echo " "
-$SUDO df -k
+df -k
 
 echo " "
 echo "-- Disk BRM Data files --"
@@ -70,6 +66,6 @@ echo "################# bin/editem -i #################"
 echo " "
 $INSTALLDIR/bin/editem -i 2>/dev/null
 
-} > /tmp/${MODULE}_resourceReport.txt
+} > ${tmpDir}/${MODULE}_resourceReport.txt
 
 exit 0
diff --git a/oamapps/columnstoreSupport/softwareReport.sh b/oamapps/columnstoreSupport/softwareReport.sh
index b7a6e90b0..a4f2221c2 100755
--- a/oamapps/columnstoreSupport/softwareReport.sh
+++ b/oamapps/columnstoreSupport/softwareReport.sh
@@ -14,14 +14,10 @@ else
         INSTALLDIR="/usr/local/mariadb/columnstore"
 fi
 
-USER=`whoami 2>/dev/null`
-if [ $USER = "root" ]; then
-	SUDO=" "
-else
-	SUDO="sudo"
-fi
+#get temp directory
+tmpDir=`$INSTALLDIR/bin/getConfig SystemConfig SystemTempFileDir`
 
-$SUDO rm -f /tmp/${MODULE}_softwareReport.txt
+rm -f ${tmpDir}/${MODULE}_softwareReport.txt
 
 {
 echo " "
@@ -42,6 +38,6 @@ echo "################# mcsadmin getStorageConfig #################"
 echo " "
 $INSTALLDIR/bin/mcsadmin getStorageConfig
 
-} > /tmp/${MODULE}_softwareReport.txt
+} > ${tmpDir}/${MODULE}_softwareReport.txt
 
 exit 0
diff --git a/oamapps/columnstoreSupport/sqlLogs.sh b/oamapps/columnstoreSupport/sqlLogs.sh
index 564973e7e..e34ebe5b9 100755
--- a/oamapps/columnstoreSupport/sqlLogs.sh
+++ b/oamapps/columnstoreSupport/sqlLogs.sh
@@ -23,6 +23,9 @@ if [ -z "$MYSQLCMD" ]; then
         export MYSQLCMD
 fi
 
+#get temp directory
+tmpDir=`$COLUMNSTORE_INSTALL_DIR/bin/getConfig SystemConfig SystemTempFileDir`
+
 main()
 {
 	if [ "$option" == "usage" ]; then
@@ -111,7 +114,7 @@ create ()
 	        prevSession=$3;
 	}
 	print $0 "|" val "|"
-	}' | sort -t '|' -n -k 1 > /tmp/idbtmp.tbl
+	}' | sort -t '|' -n -k 1 > ${tmpDir}/idbtmp.tbl
 
 	echo "Step 2 of 4.  Populating $DB.start table with Start SQL log entries."
 	sql="
@@ -126,7 +129,7 @@ create ()
 	  sessionStatementId int
 	) ENGINE=MyISAM ;
 	create index start_idx on start (sessionid, sessionStatementId);
-	load data infile '/tmp/idbtmp.tbl' into table start fields terminated by '|';
+	load data infile '${tmpDir}/idbtmp.tbl' into table start fields terminated by '|';
 	"
 	$MYSQLCMD -e "$sql"
 
@@ -148,7 +151,7 @@ create ()
 	        prevSession=$3;
 	}
 	print $0 "|" val "|"
-	}' | sort -t '|' -n -k 1 > /tmp/idbtmp.tbl
+	}' | sort -t '|' -n -k 1 > ${tmpDir}/idbtmp.tbl
 	 
 	echo "Step 4 of 4.  Populating $DB.stop table with End SQL log entries."
 	sql="
@@ -160,7 +163,7 @@ create ()
 	  sessionStatementId int
 	) ENGINE=MyISAM ;
 	create index stop_idx on stop (sessionid, sessionStatementId);
-	load data infile '/tmp/idbtmp.tbl' into table stop fields terminated by '|';
+	load data infile '${tmpDir}/idbtmp.tbl' into table stop fields terminated by '|';
 	"
 	$MYSQLCMD $DB -e "$sql;"
 
diff --git a/oamapps/mcsadmin/mcsadmin.cpp b/oamapps/mcsadmin/mcsadmin.cpp
index 4e0b837ff..060015053 100644
--- a/oamapps/mcsadmin/mcsadmin.cpp
+++ b/oamapps/mcsadmin/mcsadmin.cpp
@@ -67,6 +67,8 @@ string localModule;
 bool rootUser = true;
 string HOME = "/root";
 string SingleServerInstall;
+string tmpDir;
+string installDir;
 
 bool repeatStop;
 
@@ -188,7 +190,10 @@ int main(int argc, char* argv[])
 
     string ccHistoryFile = HOME + "/.cc_history";
 
-    string cf = startup::StartUp::installDir() + "/etc/" + ConsoleCmdsFile;
+    tmpDir = startup::StartUp::tmpDir();
+    installDir = startup::StartUp::installDir();
+
+    string cf = installDir + "/etc/" + ConsoleCmdsFile;
     fConfig = Config::makeConfig(cf);
 
 //	setupSignalHandlers();
@@ -234,7 +239,7 @@ int main(int argc, char* argv[])
 
     if (user != 0)
         rootUser = false;
-
+        
     // create/open command log file if not created
 
     logFile.open(DEFAULT_LOG_FILE.c_str(), ios::app);
@@ -2595,17 +2600,19 @@ int processCommand(string* arguments)
 
                 if ( DBRootStorageType == "hdfs")
                 {
-                    cmd = "pdsh -a '/" + startup::StartUp::installDir() + "/bin/columnstore stop' > /tmp/cc-stop.pdsh 2>&1";
+					string logFile = tmpDir + "/cc-stop.pdsh";
+					
+                    cmd = "pdsh -a '/" + installDir + "/bin/columnstore stop' > " + logFile + " 2>&1";
                     system(cmd.c_str());
 
-                    if (oam.checkLogStatus("/tmp/cc-stop.pdsh", "exit") )
+                    if (oam.checkLogStatus(logFile, "exit") )
                     {
-                        cout << endl << "ERROR: Stopping MariaDB ColumnStore Service failure, check /tmp/cc-stop.pdsh. exit..." << endl;
+                        cout << endl << "ERROR: Stopping MariaDB ColumnStore Service failure, check " << logFile << " exit..." << endl;
                     }
                 }
                 else
                 {
-                    cmd = startup::StartUp::installDir() + "/bin/columnstore stop > /tmp/status.log";
+                    cmd = installDir + "/bin/columnstore stop > " + tmpDir + "/status.log";
                     system(cmd.c_str());
                 }
             }
@@ -2615,7 +2622,7 @@ int processCommand(string* arguments)
 
                 if ( gracefulTemp == FORCEFUL )
                 {
-                    cmd = startup::StartUp::installDir() + "/bin/columnstore stop > /tmp/status.log";
+                    cmd = installDir + "/bin/columnstore stop > " + tmpDir + "/status.log";
                     system(cmd.c_str());
                     cout << endl << "   Successful shutdown of System (stopped local columnstore service) " << endl << endl;
                 }
@@ -2623,7 +2630,7 @@ int processCommand(string* arguments)
                 if (Failed.find("Connection refused") != string::npos)
                 {
                     cout << endl << "**** shutdownSystem Error : ProcessManager not Active, stopping columnstore service" << endl;
-                    cmd = startup::StartUp::installDir() + "/bin/columnstore stop > /tmp/status.log";
+                    cmd = installDir + "/bin/columnstore stop > " + tmpDir + "/status.log";
                     system(cmd.c_str());
                     cout << endl << "   Successful stop of local columnstore service " << endl << endl;
                 }
@@ -2644,12 +2651,13 @@ int processCommand(string* arguments)
 
                 if ( DBRootStorageType == "hdfs")
                 {
-                    cmd = "pdsh -a '" + startup::StartUp::installDir() + "/bin/columnstore stop' > /tmp/cc-stop.pdsh 2>&1";
+					string logFile = tmpDir + "cc-stop.pdsh";
+                    cmd = "pdsh -a '" + installDir + "/bin/columnstore stop' > " + logFile + " 2>&1";
                     system(cmd.c_str());
 
-                    if (oam.checkLogStatus("/tmp/cc-stop.pdsh", "exit") )
+                    if (oam.checkLogStatus(logFile, "exit") )
                     {
-                        cout << endl << "ERROR: Stopping MariaDB ColumnStore Service failure, check /tmp/cc-stop.pdsh. exit..." << endl;
+                        cout << endl << "ERROR: Stopping MariaDB ColumnStore Service failure, check " + logFile + ". exit..." << endl;
                         break;
                     }
                 }
@@ -2677,7 +2685,7 @@ int processCommand(string* arguments)
 
             if (!oam.checkSystemRunning())
             {
-                cout << "startSystem command, 'columnstore' service is down, sending command to" << endl;
+                cout << endl << "startSystem command, 'columnstore' service is down, sending command to" << endl;
                 cout << "start the 'columnstore' service on all modules" << endl << endl;
 
                 SystemModuleTypeConfig systemmoduletypeconfig;
@@ -2750,12 +2758,13 @@ int processCommand(string* arguments)
 
                     if ( DBRootStorageType == "hdfs")
                     {
-                        cmd = "pdsh -a '" + startup::StartUp::installDir() + "/bin/columnstore restart' > /tmp/cc-restart.pdsh 2>&1";
+						string logFile = tmpDir + "/cc-restart.pdsh";
+                        cmd = "pdsh -a '" + installDir + "/bin/columnstore restart' > " + logFile + " 2>&1";
                         system(cmd.c_str());
 
-                        if (oam.checkLogStatus("/tmp/cc-restart.pdsh", "exit") )
+                        if (oam.checkLogStatus(logFile, "exit") )
                         {
-                            cout << endl << "ERROR: Restart MariaDB ColumnStore Service failure, check /tmp/cc-restart.pdsh. exit..." << endl;
+                            cout << endl << "ERROR: Restart MariaDB ColumnStore Service failure, check " << logFile << ". exit..." << endl;
                             break;
                         }
                     }
@@ -2787,7 +2796,7 @@ int processCommand(string* arguments)
 
                                 if ( modulename == localModule )
                                 {
-                                    cmd = startup::StartUp::installDir() + "/bin/columnstore restart > /tmp/start.log 2>&1";
+                                    cmd = installDir + "/bin/columnstore restart > " + tmpDir + "/start.log 2>&1";
                                     int rtnCode = system(cmd.c_str());
 
                                     if (geteuid() == 0 && WEXITSTATUS(rtnCode) != 0)
@@ -2805,7 +2814,7 @@ int processCommand(string* arguments)
                                 for ( ; pt1 != (*pt).hostConfigList.end() ; pt1++)
                                 {
                                     //run remote command script
-                                    cmd = startup::StartUp::installDir() + "/bin/remote_command.sh " + (*pt1).IPAddr + " " + password + " '" + startup::StartUp::installDir() + "/bin/columnstore restart' 0";
+                                    cmd = installDir + "/bin/remote_command.sh " + (*pt1).IPAddr + " " + password + " '" + installDir + "/bin/columnstore restart' 0";
                                     int rtnCode = system(cmd.c_str());
 
                                     if (WEXITSTATUS(rtnCode) < 0)
@@ -2814,7 +2823,7 @@ int processCommand(string* arguments)
                                         cout << endl << "**** startSystem Failed" << endl;
 
                                         // stop local columnstore service
-                                        cmd = startup::StartUp::installDir() + "/bin/columnstore stop > /tmp/stop.log 2>&1";
+                                        cmd = installDir + "/bin/columnstore stop > " + tmpDir + "/stop.log 2>&1";
                                         system(cmd.c_str());
 
                                         FAILED = true;
@@ -2828,7 +2837,7 @@ int processCommand(string* arguments)
                                             cout << endl << "**** startSystem Failed" << endl;
 
                                             // stop local columnstore service
-                                            cmd = startup::StartUp::installDir() + "/bin/columnstore stop > /tmp/stop.log 2>&1";
+                                            cmd = installDir + "/bin/columnstore stop > " + tmpDir + "/stop.log 2>&1";
                                             system(cmd.c_str());
 
                                             FAILED = true;
@@ -2854,7 +2863,7 @@ int processCommand(string* arguments)
                     //just kick off local server
                     cout << endl << "   System being started, please wait...";
                     cout.flush();
-                    cmd = startup::StartUp::installDir() + "/bin/columnstore restart > /tmp/start.log 2>&1";
+                    cmd = installDir + "/bin/columnstore restart > " + tmpDir + "/start.log 2>&1";
                     int rtnCode = system(cmd.c_str());
 
                     if (geteuid() == 0 && WEXITSTATUS(rtnCode) != 0)
@@ -2991,12 +3000,13 @@ int processCommand(string* arguments)
 
                     if ( DBRootStorageType == "hdfs")
                     {
-                        cmd = "pdsh -a '" + startup::StartUp::installDir() + "/bin/columnstore restart' > /tmp/cc-restart.pdsh 2>&1";
+						string logFile = tmpDir + "/cc-restart.pdsh";
+                        cmd = "pdsh -a '" + installDir + "/bin/columnstore restart' > " + logFile + " 2>&1";
                         system(cmd.c_str());
 
-                        if (oam.checkLogStatus("/tmp/cc-restart.pdsh", "exit") )
+                        if (oam.checkLogStatus(logFile, "exit") )
                         {
-                            cout << endl << "ERROR: Restart MariaDB ColumnStore Service failue, check /tmp/cc-restart.pdsh. exit..." << endl;
+                            cout << endl << "ERROR: Restart MariaDB ColumnStore Service failue, check " << logFile << ". exit..." << endl;
                             break;
                         }
                     }
@@ -3034,7 +3044,7 @@ int processCommand(string* arguments)
                                 for ( ; pt1 != (*pt).hostConfigList.end() ; pt1++)
                                 {
                                     //run remote command script
-                                    cmd = startup::StartUp::installDir() + "/bin/remote_command.sh " + (*pt1).IPAddr + " " + password + " '" + startup::StartUp::installDir() + "/bin/columnstore restart' 0";
+                                    cmd = installDir + "/bin/remote_command.sh " + (*pt1).IPAddr + " " + password + " '" + installDir + "/bin/columnstore restart' 0";
 
                                     int rtnCode = system(cmd.c_str());
 
@@ -3044,7 +3054,7 @@ int processCommand(string* arguments)
                                         cout << endl << "**** restartSystem Failed" << endl;
 
                                         // stop local columnstore service
-                                        cmd = startup::StartUp::installDir() + "/bin/columnstore stop > /tmp/stop.log 2>&1";
+                                        cmd = installDir + "/bin/columnstore stop > " + tmpDir + "/stop.log 2>&1";
                                         system(cmd.c_str());
 
                                         FAILED = true;
@@ -3059,7 +3069,7 @@ int processCommand(string* arguments)
                                             FAILED = true;
 
                                             // stop local columnstore service
-                                            cmd = startup::StartUp::installDir() + "/bin/columnstore stop > /tmp/stop.log 2>&1";
+                                            cmd = installDir + "/bin/columnstore stop > " + tmpDir + "/stop.log 2>&1";
                                             system(cmd.c_str());
 
                                             break;
@@ -3075,7 +3085,7 @@ int processCommand(string* arguments)
                                 break;
 
                             //RESTART LOCAL HOST
-                            cmd = startup::StartUp::installDir() + "/bin/columnstore restart > /tmp/start.log 2>&1";
+                            cmd = installDir + "/bin/columnstore restart > " + tmpDir + "/start.log 2>&1";
                             int rtnCode = system(cmd.c_str());
 
                             if (geteuid() == 0 && WEXITSTATUS(rtnCode) != 0)
@@ -3095,7 +3105,7 @@ int processCommand(string* arguments)
                     //just kick off local server
                     cout << "   System being restarted, please wait...";
                     cout.flush();
-                    cmd = startup::StartUp::installDir() + "/bin/columnstore restart > /tmp/start.log 2>&1";
+                    cmd = installDir + "/bin/columnstore restart > " + tmpDir + "/start.log 2>&1";
                     int rtnCode = system(cmd.c_str());
 
                     if (WEXITSTATUS(rtnCode) != 0)
@@ -4916,8 +4926,12 @@ int processCommand(string* arguments)
         }
         break;
 
-        case 39:
+        case 39: // getSystemDirectories
         {
+			cout << endl << "System Installation and Temporary File Directories" << endl << endl;
+			
+			cout << "System Installation Directory = " << installDir << endl;
+			cout << "System Temporary File Directory = " << tmpDir << endl << endl;
         }
         break;
 
@@ -5559,17 +5573,26 @@ int processCommand(string* arguments)
 
             if ( rootUser)
             {
-                int rtnCode = system("rpm -qi mariadb-columnstore-platform > /tmp/columnstore.txt 2>&1");
+				string logFile = tmpDir + "/columnstore.log";
+				string cmd = "rpm -qi mariadb-columnstore-platform > " + logFile + " 2>&1";
+                int rtnCode = system(cmd.c_str());
 
                 if (WEXITSTATUS(rtnCode) == 0)
-                    system("cat /tmp/columnstore.txt");
+                {
+					string cmd = "cat " + logFile;
+                    system(cmd.c_str());
+				}
                 else
                 {
-                    rtnCode = system("dpkg -s mariadb-columnstore-platform > /tmp/columnstore.txt 2>&1");
+					string cmd = "dpkg -s mariadb-columnstore-platform > " + logFile + " 2>&1";
+                    rtnCode =  system(cmd.c_str());
 
                     if (WEXITSTATUS(rtnCode) == 0)
-                        system("cat /tmp/columnstore.txt");
-                    else
+                    {
+						string cmd = "cat " + logFile;
+						system(cmd.c_str());
+					}
+                   else
                     {
                         cout << "SoftwareVersion = " << columnstore_version << endl;
                         cout << "SoftwareRelease = " << columnstore_release << endl;
@@ -5657,7 +5680,7 @@ int processCommand(string* arguments)
             string moduleType;
             string moduleName;
             int moduleCount;
-            string password;
+            string password = "ssh";
             typedef std::vector<string> inputNames;
             inputNames inputnames;
             typedef std::vector<string> umStorageNames;
@@ -5682,7 +5705,7 @@ int processCommand(string* arguments)
                 hostArg = 3;
 
                 //check for a non-distrubuted install setup, dont need password
-                if ( DistributedInstall == "y" )
+                if ( DistributedInstall != "y" )
                 {
                     if (arguments[4] != "")
                         password = arguments[4];
@@ -5713,7 +5736,7 @@ int processCommand(string* arguments)
                 hostArg = 2;
 
                 //check for a non-distrubuted install setup, dont need password
-                if ( DistributedInstall == "y" )
+                if ( DistributedInstall != "y" )
                 {
                     if (arguments[3] != "")
                         password = arguments[3];
@@ -6128,13 +6151,13 @@ int processCommand(string* arguments)
                                         ++it)
                                 {
                                     string deviceName = *it;
-                                    string entry = deviceName + " " + startup::StartUp::installDir() + "/gluster/brick" + oam.itoa(brickID)  + " " + deviceType + " defaults 1 2";
+                                    string entry = deviceName + " " + installDir + "/gluster/brick" + oam.itoa(brickID)  + " " + deviceType + " defaults 1 2";
                                     //send update pm
                                     oam.distributeFstabUpdates(entry, moduleName);
                                 }
                             }
 
-                            string command = startup::StartUp::installDir() + "/bin/remote_command.sh " + (*hostConfigIter).IPAddr + " " + password + " 'mkdir -p " + startup::StartUp::installDir() + "/gluster/brick" + oam.itoa(brickID) + "'";
+                            string command = installDir + "/bin/remote_command.sh " + (*hostConfigIter).IPAddr + " " + password + " 'mkdir -p " + installDir + "/gluster/brick" + oam.itoa(brickID) + "'";
                             system(command.c_str());
                             brickID++;
                         }
@@ -7842,24 +7865,17 @@ int processCommand(string* arguments)
                     {
                         try
                         {
-							cout << endl << "   Restarting System " << endl;
-							gracefulTemp = oam::FORCEFUL;
-							int returnStatus = oam.restartSystem(gracefulTemp, ackTemp);
-							switch (returnStatus)
-							{ 
-								case API_SUCCESS:
-									if ( waitForActive() )
-										cout << endl << "   Successful restart of System " << endl << endl;
-									else
-										cout << endl << "**** restartSystem Failed : check log files" << endl;
-									break;
-								case API_CANCELLED:
-									cout << endl << "   Restart of System canceled" << endl << endl;
-									break;
-								default:
-									cout << endl << "**** restartSystem Failed : Check system logs" << endl;
-									break;
-							}
+
+                            cout << endl << "   Starting Modules" << endl;
+                            oam.startModule(devicenetworklist, ackTemp);
+
+                            //reload DBRM with new configuration, needs to be done here after startModule
+                            cmd = installDir + "/bin/dbrmctl reload > /dev/null 2>&1";
+                            system(cmd.c_str());
+                            sleep(15);
+
+                            cout << "   Successful start of Modules " << endl;
+
                         }
                         catch (exception& e)
                         {
@@ -8171,7 +8187,7 @@ int ProcessSupportCommand(int CommandID, std::string arguments[])
 
                             //run remote command script
                             HostConfigList::iterator pt1 = (*pt).hostConfigList.begin();
-                            cmd = startup::StartUp::installDir() + "/bin/remote_command.sh " + (*pt1).IPAddr + " " + password + " reboot " ;
+                            cmd = installDir + "/bin/remote_command.sh " + (*pt1).IPAddr + " " + password + " reboot " ;
                             int rtnCode = system(cmd.c_str());
 
                             if (WEXITSTATUS(rtnCode) != 0)
@@ -8290,7 +8306,7 @@ int ProcessSupportCommand(int CommandID, std::string arguments[])
                                     HostConfigList::iterator pt1 = (*pt).hostConfigList.begin();
                                     string ipAddr = (*pt1).IPAddr;
                                     //run remote command script
-                                    cmd = startup::StartUp::installDir() + "/bin/remote_command.sh " + ipAddr + " " + password + " reboot " ;
+                                    cmd = installDir + "/bin/remote_command.sh " + ipAddr + " " + password + " reboot " ;
                                     int rtnCode = system(cmd.c_str());
 
                                     if (WEXITSTATUS(rtnCode) != 0)
@@ -8682,11 +8698,11 @@ int ProcessSupportCommand(int CommandID, std::string arguments[])
             catch (exception& e)
             {
                 cout << endl << "**** checkDBFunctional Failed :  " << e.what() << endl;
-                cout << endl << "     can check UM /tmp/dbfunctional.log for possible additional information" << endl << endl;
+                cout << endl << "     can check UM " + tmpDir + "/dbfunctional.log for possible additional information" << endl << endl;
             }
             catch (...)
             {
-                cout << endl << "   checkDBFunctional Failed: check UM /tmp/dbfunctional.log" << endl << endl;
+                cout << endl << "   checkDBFunctional Failed: check UM " + tmpDir + "/dbfunctional.log" << endl << endl;
             }
         }
         break;
@@ -9173,7 +9189,26 @@ void printSystemStatus()
         catch (...) {}
 
         if ( MySQLRep == "y" )
-            cout << "MariaDB ColumnStore Replication Feature is enabled" << endl << endl;
+            cout << "MariaDB ColumnStore Replication Feature is enabled" << endl;
+
+		//display Distributed Install feature
+        if ( SingleServerInstall == "n" )
+        {
+			string DistributedInstall;
+
+			try
+			{
+				oam.getSystemConfig("DistributedInstall", DistributedInstall);
+				
+				if ( DistributedInstall == "y" )
+					cout << "MariaDB ColumnStore set for Distributed Install" << endl;
+				else
+					cout << "MariaDB ColumnStore set for Non-Distributed Install" << endl;
+			}
+			catch (...) {}
+			
+			cout << endl;
+		}
     }
     catch (exception& e)
     {
@@ -9416,7 +9451,7 @@ void printModuleDisk(ModuleDisk moduledisk)
     cout << "Mount Point                    Total Blocks  Used Blocks   Usage %" << endl;
     cout << "-----------------------------  ------------  ------------  -------" << endl;
 
-    string etcdir = startup::StartUp::installDir() + "/etc";
+    string etcdir = installDir + "/etc";
 
     for ( unsigned int i = 0 ; i < moduledisk.diskusage.size(); i++)
     {
@@ -9457,7 +9492,7 @@ void printModuleDisk(ModuleDisk moduledisk)
 void printModuleResources(TopProcessCpuUsers topprocesscpuusers, ModuleCpu modulecpu, TopProcessMemoryUsers topprocessmemoryusers, ModuleMemory modulememory, ModuleDisk moduledisk)
 {
     Oam oam;
-    string etcdir = startup::StartUp::installDir() + "/etc";
+    string etcdir = installDir + "/etc";
 
     cout << endl << "Module '" + topprocesscpuusers.ModuleName + "' Resource Usage" << endl << endl;
 
diff --git a/oamapps/postConfigure/helpers.cpp b/oamapps/postConfigure/helpers.cpp
index f7d418144..3238f9c57 100644
--- a/oamapps/postConfigure/helpers.cpp
+++ b/oamapps/postConfigure/helpers.cpp
@@ -35,7 +35,10 @@ using namespace oam;
 
 #include "helpers.h"
 
-extern string mysqlpw;
+using namespace installer;
+
+#include "installdir.h"
+
 string pwprompt = " ";
 
 string masterLogFile = oam::UnassignedName;
@@ -45,6 +48,7 @@ string prompt;
 const char* pcommand = 0;
 
 extern string installDir;
+
 extern bool noPrompting;
 
 namespace installer
@@ -213,7 +217,7 @@ void dbrmDirCheck()
         cout << "If the files were copied from " << dbrmrootPrevDir << " to " << dbrmrootDir << endl;
         cout << "you will need to edit the file BRM_saves_current to contain the current path of" << endl;
         cout << dbrmrootDir << endl << endl;
-        cout << "Please reference the MariDB Columnstore Installation Guide on Upgrade Installs for" << endl;
+        cout << "Please reference the MariaDB Columnstore Installation Guide on Upgrade Installs for" << endl;
         cout << "addition information, if needed." << endl << endl;
 
         while (true)
@@ -247,12 +251,21 @@ void mysqlSetup()
 {
     Oam oam;
     string cmd;
-    cmd = installDir + "/bin/post-mysqld-install --installdir=" + installDir + " > /tmp/post-mysqld-install.log 2>&1";
+
+	string tmpDir = startup::StartUp::tmpDir();
+
+    string mysqlpw = oam.getMySQLPassword();
+
+	string passwordOption = "";
+	if ( mysqlpw != oam::UnassignedName )
+		passwordOption = " --password=" + mysqlpw;
+
+    cmd = installDir + "/bin/post-mysqld-install --installdir=" + installDir + " " + passwordOption + " --tmpdir=" + tmpDir + " > " + tmpDir + "/post-mysqld-install.log 2>&1";
     int rtnCode = system(cmd.c_str());
 
     if (WEXITSTATUS(rtnCode) != 0)
     {
-        cout << "Error running post-mysqld-install, check /tmp/post-mysqld-install.log" << endl;
+        cout << "Error running post-mysqld-install, check " << tmpDir << "/post-mysqld-install.log" << endl;
         cout << "Exiting..." << endl;
         exit (1);
     }
@@ -275,8 +288,8 @@ void mysqlSetup()
         if (p && *p)
             HOME = p;
     }
-
-    cmd = installDir + "/bin/post-mysql-install --installdir=" + installDir + " > /tmp/post-mysql-install.log";;
+    
+    cmd = installDir + "/bin/post-mysql-install --installdir=" + installDir + " --tmpdir=" + tmpDir + " > " + tmpDir + "/post-mysql-install.log";
     rtnCode = system(cmd.c_str());
 
     if (WEXITSTATUS(rtnCode) == 2)
@@ -287,7 +300,7 @@ void mysqlSetup()
     }
     else if (WEXITSTATUS(rtnCode) == 1)
     {
-        cout << "Error running post-mysql-install, /tmp/post-mysql-install.log" << endl;
+        cout << "Error running post-mysql-install, " + tmpDir + "/post-mysql-install.log" << endl;
         cout << "Exiting..." << endl;
         exit (1);
     }
@@ -339,7 +352,6 @@ int sendUpgradeRequest(int IserverTypeInstall, bool pmwithum)
     ByteStream::byte requestID = RUNUPGRADE;
 
     msg << requestID;
-    msg << mysqlpw;
 
     int returnStatus = oam::API_SUCCESS;
 
@@ -375,7 +387,9 @@ int sendUpgradeRequest(int IserverTypeInstall, bool pmwithum)
 
                         if ( returnStatus != API_SUCCESS)
                         {
-                            cout << "ERROR: Error return in running the MariDB Columnstore Upgrade, check /tmp/upgrade*.logs on " << (*pt).DeviceName << endl;
+							string tmpDir = startup::StartUp::tmpDir();
+
+                            cout << "ERROR: Error return in running the MariaDB Columnstore Upgrade, check " + tmpDir + "/mysql_upgrade.log on " << (*pt).DeviceName << endl;
                             return returnStatus;
                         }
                     }
@@ -404,6 +418,8 @@ int sendReplicationRequest(int IserverTypeInstall, std::string password, bool pm
 
     SystemModuleTypeConfig systemmoduletypeconfig;
 
+	string tmpDir = startup::StartUp::tmpDir();
+
     try
     {
         oam.getSystemConfig(systemmoduletypeconfig);
@@ -478,7 +494,7 @@ int sendReplicationRequest(int IserverTypeInstall, std::string password, bool pm
 
                             if ( returnStatus != API_SUCCESS)
                             {
-                                cout << endl << "ERROR: Error return in running the MariaDB ColumnStore Master DB Distribute, check /tmp/master-dist*.logs on " << masterModule << endl;
+                                cout << endl << "ERROR: Error return in running the MariaDB ColumnStore Master DB Distribute, check " + tmpDir + "/master-dist*.logs on " << masterModule << endl;
                                 return returnStatus;
                             }
 
@@ -491,7 +507,7 @@ int sendReplicationRequest(int IserverTypeInstall, std::string password, bool pm
 
                             if ( returnStatus != API_SUCCESS)
                             {
-                                cout << endl << "ERROR: Error return in running the MariaDB ColumnStore Master replication, check /tmp/master-rep*.logs on " << masterModule << endl;
+                                cout << endl << "ERROR: Error return in running the MariaDB ColumnStore Master replication, check " + tmpDir + "master-rep*.logs on " << masterModule << endl;
                                 return returnStatus;
                             }
 
@@ -526,7 +542,7 @@ int sendReplicationRequest(int IserverTypeInstall, std::string password, bool pm
 
                             if ( returnStatus != API_SUCCESS)
                             {
-                                cout << endl << "ERROR: Error return in running the MariaDB ColumnStore Slave replication, check /tmp/slave-rep*.logs on " << (*pt).DeviceName << endl;
+                                cout << endl << "ERROR: Error return in running the MariaDB ColumnStore Slave replication, check " + tmpDir + "/slave-rep*.logs on " << (*pt).DeviceName << endl;
                                 return returnStatus;
                             }
 
@@ -728,12 +744,14 @@ void checkMysqlPort( std::string& mysqlPort, Config* sysConfig )
 {
     Oam oam;
 
+	string tmpDir = startup::StartUp::tmpDir();
+
     while (true)
     {
-        string cmd = "netstat -na | grep -e :" + mysqlPort + "[[:space:]] | grep LISTEN > /tmp/mysqlport";
+        string cmd = "netstat -na | grep -e :" + mysqlPort + "[[:space:]] | grep LISTEN > " + tmpDir + "/mysqlport";
 
         system(cmd.c_str());
-        string fileName = "/tmp/mysqlport";
+        string fileName = tmpDir + "/mysqlport";
         ifstream oldFile (fileName.c_str());
 
         if (oldFile)
@@ -792,7 +810,7 @@ void checkMysqlPort( std::string& mysqlPort, Config* sysConfig )
 
                 if ( !writeConfig(sysConfig) )
                 {
-                    cout << "ERROR: Failed trying to update MariDB Columnstore System Configuration file" << endl;
+                    cout << "ERROR: Failed trying to update MariaDB Columnstore System Configuration file" << endl;
                     exit(1);
                 }
 
@@ -813,9 +831,11 @@ void checkSystemMySQLPort(std::string& mysqlPort, Config* sysConfig, std::string
 
     bool inUse = false;
 
+	string tmpDir = startup::StartUp::tmpDir();
+
     while (true)
     {
-        string localnetstat = "netstat -na | grep -e :" + mysqlPort + "[[:space:]] | grep LISTEN > /tmp/mysqlport";
+        string localnetstat = "netstat -na | grep -e :" + mysqlPort + "[[:space:]] | grep LISTEN > " + tmpDir + "/mysqlport";
         string remotenetstat = "netstat -na | grep -e :" + mysqlPort + "[[:space:]] | grep LISTEN";
 
         //first check local mysql, if needed
@@ -823,7 +843,7 @@ void checkSystemMySQLPort(std::string& mysqlPort, Config* sysConfig, std::string
                 ( ( IserverTypeInstall != oam::INSTALL_COMBINE_DM_UM_PM ) && pmwithum ) )
         {
             system(localnetstat.c_str());
-            string fileName = "/tmp/mysqlport";
+            string fileName = tmpDir + "/mysqlport";
             ifstream oldFile (fileName.c_str());
 
             if (oldFile)
@@ -935,7 +955,7 @@ void checkSystemMySQLPort(std::string& mysqlPort, Config* sysConfig, std::string
 
             if ( !writeConfig(sysConfig) )
             {
-                cout << "ERROR: Failed trying to update MariDB Columnstore System Configuration file" << endl;
+                cout << "ERROR: Failed trying to update MariaDB Columnstore System Configuration file" << endl;
                 exit(1);
             }
 
diff --git a/oamapps/postConfigure/helpers.h b/oamapps/postConfigure/helpers.h
index 8d79beb64..5f7b1631a 100644
--- a/oamapps/postConfigure/helpers.h
+++ b/oamapps/postConfigure/helpers.h
@@ -38,7 +38,7 @@ extern bool waitForActive();
 extern void dbrmDirCheck();
 extern void mysqlSetup();
 extern int sendMsgProcMon( std::string module, ByteStream msg, int requestID, int timeout );
-extern int sendUpgradeRequest(int IserverTypeInstall, bool pmwithum);
+extern int sendUpgradeRequest(int IserverTypeInstall, bool pmwithum = false);
 extern int sendReplicationRequest(int IserverTypeInstall, std::string password, bool pmwithum);
 extern void checkFilesPerPartion(int DBRootCount, Config* sysConfig);
 extern void checkMysqlPort( string& mysqlPort, Config* sysConfig);
diff --git a/oamapps/postConfigure/installer.cpp b/oamapps/postConfigure/installer.cpp
index aefeb6d99..94850deae 100644
--- a/oamapps/postConfigure/installer.cpp
+++ b/oamapps/postConfigure/installer.cpp
@@ -56,6 +56,8 @@ using namespace config;
 #include "helpers.h"
 using namespace installer;
 
+#include "installdir.h"
+
 typedef struct Module_struct
 {
     std::string     moduleName;
@@ -169,11 +171,13 @@ int main(int argc, char* argv[])
 
     if (p && *p)
         USER = p;
+        
+    string tmpDir = startup::StartUp::tmpDir();
 
     // setup to start on reboot, for non-root amazon installs
     if ( !rootUser )
     {
-    	system("sudo sed -i -e 's/#sudo runuser/sudo runuser/g' /etc/rc.d/rc.local >/dev/null 2>&1");
+    	system("sed -i -e 's/#runuser/runuser/g' /etc/rc.d/rc.local >/dev/null 2>&1");
     }   
 
     //copy Columnstore.xml.rpmsave if upgrade option is selected
@@ -406,10 +410,6 @@ int main(int argc, char* argv[])
         exit(1);
     }
 
-    //store syslog config file in Calpont Config file
-    cmd = installDir + "/bin/syslogSetup.sh install  > /dev/null 2>&1";
-    system(cmd.c_str());
-
     //get PPackage Type
     try
     {
@@ -797,8 +797,6 @@ int main(int argc, char* argv[])
             sleep(5);
         }
 
-        cout << "System Install successfully completed, starting MariaDB ColumnStore" << endl;
-
         //
         // perform start of MariaDB ColumnStore of other servers in the system
         //
@@ -826,8 +824,6 @@ int main(int argc, char* argv[])
 
         if (rtnCode != 0)
             cout << "Error starting MariaDB ColumnStore local module" << endl;
-        else
-            cout << "Start MariaDB ColumnStore request successful" << endl;
     }
     else
     {
@@ -875,37 +871,61 @@ int main(int argc, char* argv[])
 
     // check for system going ACTIVE
     sleep(5);
-    cout << endl << "MariaDB ColumnStore Database Platform Starting, please wait .";
+    cout << endl << "Starting MariaDB ColumnStore Database Platform Starting, please wait .";
     cout.flush();
 
+    string ProfileFile;
+	try
+	{
+		ProfileFile = sysConfig->getConfig(InstallSection, "ProfileFile");
+	}
+	catch (...)
+	{}
+
     if ( waitForActive() )
     {
         cout << " DONE" << endl;
 
-        cmd = installDir + "/bin/dbbuilder 7 > /tmp/dbbuilder.log";
+		string logFile = tmpDir + "/dbbuilder.log";
+        cmd = installDir + "/bin/dbbuilder 7 > " + logFile;
         system(cmd.c_str());
 
-        if (oam.checkLogStatus("/tmp/dbbuilder.log", "System Catalog created") )
+        if (oam.checkLogStatus(logFile, "System Catalog created") )
             cout << endl << "System Catalog Successfull Created" << endl;
         else
         {
-            if ( !oam.checkLogStatus("/tmp/dbbuilder.log", "System catalog appears to exist") )
+            if ( oam.checkLogStatus(logFile, "System catalog appears to exist") )
+            {
+/*				cout << endl << "Run MariaDB Server Upgrade.. ";
+				cout.flush();
+
+				//send message to procmon's to run upgrade script
+				int status = sendUpgradeRequest(IserverTypeInstall);
+	
+				if ( status != 0 ) {
+					cout << endl << "MariaDB Columnstore Install Failed" << endl << endl;
+					exit(1);
+				}
+				else
+					cout << " DONE" << endl;
+*/
+				cout.flush();
+            }
+            else
             {
                 cout << endl << "System Catalog Create Failure" << endl;
-                cout << "Check latest log file in /tmp/dbbuilder.log.*" << endl;
+                cout << "Check latest log file in " << logFile << endl;
                 cout << " IMPORTANT: Once issue has been resolved, rerun postConfigure" << endl << endl;
+
                 exit (1);
             }
-        }
-
+		}
+		
         cout << endl << "MariaDB ColumnStore Install Successfully Completed, System is Active" << endl << endl;
 
         cout << "Enter the following command to define MariaDB ColumnStore Alias Commands" << endl << endl;
 
-		if ( !rootUser )
-			cout << ". /etc/profile.d/columnstoreEnv.sh" << endl;
-
-		cout << ". /etc/profile.d/columnstoreAlias.sh" << endl << endl;
+		cout << ". " << ProfileFile << endl << endl;
 
         cout << "Enter 'mcsmysql' to access the MariaDB ColumnStore SQL console" << endl;
         cout << "Enter 'mcsadmin' to access the MariaDB ColumnStore Admin console" << endl << endl;
@@ -921,10 +941,7 @@ int main(int argc, char* argv[])
         cout << endl << "ERROR: MariaDB ColumnStore Process failed to start, check log files in /var/log/mariadb/columnstore" << endl;
         cout << "Enter the following command to define MariaDB ColumnStore Alias Commands" << endl << endl;
 
-		if ( !rootUser )
-			cout << ". /etc/profile.d/columnstoreEnv.sh" << endl;
-
-		cout << ". /etc/profile.d/columnstoreAlias.sh" << endl << endl;
+		cout << ". " << ProfileFile << endl << endl;
 
         cout << "Enter 'mcsmysql' to access the MariaDB ColumnStore SQL console" << endl;
         cout << "Enter 'mcsadmin' to access the MariaDB ColumnStore Admin console" << endl << endl;
@@ -963,8 +980,6 @@ bool setOSFiles(string parentOAMModuleName, int serverTypeInstall)
         string fileName = "/etc/" + files[i];
 
         //make a backup copy before changing
-        if ( rootUser )
-        {
             cmd = "rm -f " + fileName + ".columnstoreSave";
             system(cmd.c_str());
 
@@ -980,25 +995,6 @@ bool setOSFiles(string parentOAMModuleName, int serverTypeInstall)
 
             cmd = "cp " + installDir + "/local/etc/" + parentOAMModuleName + "/" + files[i] + ".calpont " + installDir + "/local/. > /dev/null 2>&1";
             system(cmd.c_str());
-        }
-        else
-        {
-            cmd = "sudo rm -f " + fileName + ".columnstoreSave";
-            system(cmd.c_str());
-
-            cmd = "sudo cp " + fileName + " " + fileName + ".columnstoreSave > /dev/null 2>&1";
-            system(cmd.c_str());
-
-            cmd = "sudo cat " + installDir + "/local/etc/" + parentOAMModuleName + "/" + files[i] + ".calpont >> " + fileName;
-
-            if (geteuid() == 0) system(cmd.c_str());
-
-            cmd = "sudo rm -f " + installDir + "/local/ " + files[i] + "*.calpont > /dev/null 2>&1";
-            system(cmd.c_str());
-
-            cmd = "sudo cp " + installDir + "/local/etc/" + parentOAMModuleName + "/" + files[i] + ".calpont " + installDir + "/local/. > /dev/null 2>&1";
-            system(cmd.c_str());
-        }
     }
 
     return allfound;
@@ -1136,6 +1132,9 @@ bool updateProcessConfig(int serverTypeInstall)
  */
 bool makeRClocal(string moduleName, int IserverTypeInstall)
 {
+  
+      return true;
+
     string moduleType = moduleName.substr(0, MAX_MODULE_TYPE_SIZE);
 
     vector <string> lines;
diff --git a/oamapps/postConfigure/mycnfUpgrade.cpp b/oamapps/postConfigure/mycnfUpgrade.cpp
index afe59e742..6d2967a43 100644
--- a/oamapps/postConfigure/mycnfUpgrade.cpp
+++ b/oamapps/postConfigure/mycnfUpgrade.cpp
@@ -212,7 +212,14 @@ int main(int argc, char* argv[])
         }
     }
 
-    string cmd = "chown mysql:mysql " + mycnfFile;
+	string USER = "mysql";
+	
+    char* p = getenv("USER");
+
+    if (p && *p)
+        USER = p;
+
+    string cmd = "chown " + USER + ":" + USER + " " + mycnfFile;
     system(cmd.c_str());
 
     exit (0);
diff --git a/oamapps/postConfigure/postConfigure.cpp b/oamapps/postConfigure/postConfigure.cpp
index 2a737861c..bb828b5be 100644
--- a/oamapps/postConfigure/postConfigure.cpp
+++ b/oamapps/postConfigure/postConfigure.cpp
@@ -80,6 +80,7 @@ using namespace config;
 #include "helpers.h"
 using namespace installer;
 
+#include "installdir.h"
 
 typedef struct DBRoot_Module_struct
 {
@@ -114,16 +115,17 @@ string getModuleName();
 bool setModuleName(string moduleName);
 bool updateBash();
 bool makeModuleFile(string moduleName, string parentOAMModuleName);
-bool updateProcessConfig(int serverTypeInstall);
+bool updateProcessConfig();
 bool uncommentCalpontXml( string entry);
 bool makeRClocal(string moduleType, string moduleName, int IserverTypeInstall);
-bool createDbrootDirs(string DBRootStorageType);
+bool createDbrootDirs(string DBRootStorageType, bool amazonInstall);
 bool pkgCheck(std::string columnstorePackage);
 bool storageSetup(bool amazonInstall);
 void setSystemName();
 bool singleServerDBrootSetup();
 bool copyFstab(string moduleName);
 bool attachVolume(string instanceName, string volumeName, string deviceName, string dbrootPath);
+void singleServerConfigSetup(Config* sysConfig);
 
 void remoteInstallThread(void*);
 
@@ -194,14 +196,15 @@ bool amazon_quick_install = false;
 string DataFileEnvFile;
 
 string installDir;
+string tmpDir;
 string HOME = "/root";
-
+string SUDO = "";
 extern string pwprompt;
-string mysqlpw = oam::UnassignedName;
 
 extern const char* pcommand;
 extern string prompt;
 
+
 /* create thread argument struct for thr_func() */
 typedef struct _thread_data_t
 {
@@ -271,9 +274,13 @@ int main(int argc, char* argv[])
     user = getuid();
     usergroup = getgid();
 
-    if (user != 0)
+	string SUDO = "";
+    if (user != 0) 
+    {
         rootUser = false;
-
+		SUDO = "sudo ";
+	}
+	
     char* p = getenv("USER");
 
     if (p && *p)
@@ -286,7 +293,8 @@ int main(int argc, char* argv[])
         if (p && *p)
             HOME = p;
     }
-	
+
+	tmpDir = startup::StartUp::tmpDir();
 
     for ( int i = 1; i < argc; i++ )
     {
@@ -567,18 +575,20 @@ int main(int argc, char* argv[])
 			EEPackageType = "binary";
 	else
 	{
-			int rtnCode = system("rpm -qi mariadb-columnstore-platform > /tmp/columnstore.txt 2>&1");
+		string cmd = "rpm -qi mariadb-columnstore-platform > " + tmpDir + "/columnstore.txt 2>&1";
+		int rtnCode = system(cmd.c_str());
+
+		if (WEXITSTATUS(rtnCode) == 0)
+				EEPackageType = "rpm";
+		else {
+			string cmd = "dpkg -s mariadb-columnstore-platform > " + tmpDir + "/columnstore.txt 2>&1";
+			int rtnCode = system(cmd.c_str());
 
 			if (WEXITSTATUS(rtnCode) == 0)
-					EEPackageType = "rpm";
-			else {
-					rtnCode = system("dpkg -s mariadb-columnstore-platform > /tmp/columnstore.txt 2>&1");
-
-				if (WEXITSTATUS(rtnCode) == 0)
-							EEPackageType = "deb";
-					else
-							EEPackageType = "binary";
-			}
+						EEPackageType = "deb";
+				else
+						EEPackageType = "binary";
+		}
 	}
 
 	try {
@@ -700,11 +710,11 @@ int main(int argc, char* argv[])
     // run my.cnf upgrade script
     if ( reuseConfig == "y" )
     {
-        cmd = installDir + "/bin/mycnfUpgrade  > /tmp/mycnfUpgrade.log 2>&1";
+        cmd = installDir + "/bin/mycnfUpgrade  > " + tmpDir + "/mycnfUpgrade.log 2>&1";
         int rtnCode = system(cmd.c_str());
 
         if (WEXITSTATUS(rtnCode) != 0)
-            cout << "Error: Problem upgrade my.cnf, check /tmp/mycnfUpgrade.log" << endl;
+            cout << "Error: Problem upgrade my.cnf, check " << tmpDir << "/mycnfUpgrade.log" << endl;
         else
             cout << "NOTE: my.cnf file was upgraded based on my.cnf.rpmsave" << endl;
     }
@@ -794,12 +804,16 @@ int main(int argc, char* argv[])
 	{
 		cout << "===== Quick Install Multi-Server Configuration =====" << endl << endl;
 		
+		cout << "Multi-Server install defaulting to using local storage" << endl;
+
 		singleServerInstall = "2";
 	}
 	else if (amazon_quick_install)
 	{
 		cout << "===== Quick Install Amazon Configuration =====" << endl << endl;
 		
+		cout << "Amazon AMI EC2 install defaulting to using local storage" << endl;
+
 		singleServerInstall = "2";
 	}
 	else
@@ -816,9 +830,8 @@ int main(int argc, char* argv[])
 
 		string temp;
 
-
-    try
-    {
+		try
+		{
 			temp = sysConfig->getConfig(InstallSection, "SingleServerInstall");
 		}
 		catch(...)
@@ -829,106 +842,119 @@ int main(int argc, char* argv[])
 		else
 			singleServerInstall = "2";
 
-		while(true) {
+		while(true) 
+		{
 			string temp = singleServerInstall;
 			prompt = "Select the type of System Server install [1=single, 2=multi] (" + singleServerInstall + ") > ";
 			pcommand = callReadline(prompt.c_str());
 
-        if (pcommand)
-        {
-				if (strlen(pcommand) > 0) 
+			if (pcommand)
+			{
+				if (strlen(pcommand) > 0)
 					temp = pcommand;
 				else
 					temp = singleServerInstall;
-					
+
 				callFree(pcommand);
 
-				if (temp == "1") {
-					singleServerInstall = temp;
-					
-					cout << endl << "Performing the Single Server Install." << endl; 
-
+				if (temp == "1")
+				{
+					singleServerInstall = "1";
 					break;
 				}
 				else
 				{
-					if (temp == "2") {
-						singleServerInstall = temp;
+					if (temp == "2")
+					{
+						singleServerInstall = "2";
 						break;
 					}
 				}
 
-				cout << "Invalid Entry, please re-enter (1 or 2)" << endl;
+				cout << "Invalid Entry, please re-enter" << endl;
+
 				if ( noPrompting )
 					exit(1);
 			}
 		}
-	}			
-	
+	}
+
+	// perform single server install
 	if (singleServerInstall == "1")
 	{
-		if ( reuseConfig == "n" ) {
-			//setup to use the single server Columnstore.xml file
+		cout << endl << "Performing the Single Server Install." << endl << endl;
 
-			// we know that our Config instance just timestamped itself in the getConfig
-			// call above.  if postConfigure is running non-interactively we may get here
-			// within the same second which means the changes that are about to happen
-			// when Columnstore.xml gets overwritten will be ignored because of the Config
-			// instance won't know to reload
-			sleep(1);
+		if ( reuseConfig == "n" )
+		{
+			//setup to Columnstore.xml file for single server
+			singleServerConfigSetup(sysConfig);
+		}
+		
+		//module ProcessConfig.xml to setup all apps on the pm
+		if ( !updateProcessConfig() )
+			cout << "Update ProcessConfig.xml error" << endl;
 
-			cmd = "rm -f " + installDir + "/etc/Columnstore.xml.installSave  > /dev/null 2>&1";
-			system(cmd.c_str());
-			cmd = "mv -f " + installDir + "/etc/Columnstore.xml " + installDir + "/etc/Columnstore.xml.installSave  > /dev/null 2>&1";
-			system(cmd.c_str());
-			cmd = "/bin/cp -f " + installDir + "/etc/Columnstore.xml.singleserver " + installDir + "/etc/Columnstore.xml  > /dev/null 2>&1";
-			system(cmd.c_str());
+		try
+		{
+			sysConfig->setConfig(InstallSection, "SingleServerInstall", "y");
+			sysConfig->setConfig(InstallSection, "ServerTypeInstall", "2");
+		}
+		catch (...)
+		{
+			cout << "ERROR: Problem setting SingleServerInstall from the MariaDB ColumnStore System Configuration file" << endl;
+			exit(1);
+		}
+
+		if ( !writeConfig(sysConfig) )
+		{
+			cout << "ERROR: Failed trying to update MariaDB ColumnStore System Configuration file" << endl;
+			exit(1);
 		}
 
 		setSystemName();
+		cout << endl;
 
-		if (!single_server_quick_install)
+		system(cmd.c_str());
+
+		// setup storage
+		if (!storageSetup(false))
 		{
-			cout << endl;
-
-			// setup storage
-			if (!storageSetup(false))
-			{
-				cout << "ERROR: Problem setting up storage" << endl;
-				exit(1);
-			}
-
-			// setup storage
-			if (!singleServerDBrootSetup())
-			{
-				cout << "ERROR: Problem setting up DBRoot IDs" << endl;
-				exit(1);
-			}
-
-			//set system DBRoot count and check 'files per parition' with number of dbroots
-			try {
-				sysConfig->setConfig(SystemSection, "DBRootCount", oam.itoa(DBRootCount));
-			}
-			catch(...)
-			{
-				cout << "ERROR: Problem setting DBRoot Count in the MariaDB ColumnStore System Configuration file" << endl;
-				exit(1);
-			}
-
-			//check if dbrm data resides in older directory path and inform user if it does
-			dbrmDirCheck();
-
-			if (startOfflinePrompt)
-				offLineAppCheck();
+			cout << "ERROR: Problem setting up storage" << endl;
+			exit(1);
 		}
 
+		if (hdfs || !rootUser)
+			if ( !updateBash() )
+				cout << "updateBash error" << endl;
+
+		// setup storage
+		if (!singleServerDBrootSetup())
+		{
+			cout << "ERROR: Problem setting up DBRoot IDs" << endl;
+			exit(1);
+		}
+
+		//set system DBRoot count and check 'files per parition' with number of dbroots
+		try
+		{
+			sysConfig->setConfig(SystemSection, "DBRootCount", oam.itoa(DBRootCount));
+		}
+		catch (...)
+		{
+			cout << "ERROR: Problem setting DBRoot Count in the MariaDB ColumnStore System Configuration file" << endl;
+			exit(1);
+		}
+
+		//check if dbrm data resides in older directory path and inform user if it does
+		dbrmDirCheck();
+
+		if (startOfflinePrompt)
+			offLineAppCheck();
+
 		checkMysqlPort(mysqlPort, sysConfig);
 
-		if (hdfs || !rootUser)
-			if( !updateBash() )
-				cout << "updateBash error" << endl;
-
-		if ( !writeConfig(sysConfig) ) {
+		if ( !writeConfig(sysConfig) )
+		{
 			cout << "ERROR: Failed trying to update MariaDB ColumnStore System Configuration file" << endl;
 			exit(1);
 		}
@@ -940,23 +966,27 @@ int main(int argc, char* argv[])
 		exit(0);
 	}
 
-	try {
-		sysConfig->setConfig(InstallSection, "SingleServerInstall", "n");
-	}
-	catch(...)
-	{
-		cout << "ERROR: Problem setting SingleServerInstall from the MariaDB ColumnStore System Configuration file" << endl;
-		exit(1);
-	}
+	// perform multi-node install
+	
+    try
+    {
+        sysConfig->setConfig(InstallSection, "SingleServerInstall", "n");
+    }
+    catch (...)
+    {
+        cout << "ERROR: Problem setting SingleServerInstall from the MariaDB ColumnStore System Configuration file" << endl;
+        exit(1);
+    }
 
-	if ( !writeConfig(sysConfig) ) {
-		cout << "ERROR: Failed trying to update MariaDB ColumnStore System Configuration file" << endl;
-		exit(1);
-	}
+    if ( !writeConfig(sysConfig) )
+    {
+        cout << "ERROR: Failed trying to update MariaDB ColumnStore System Configuration file" << endl;
+        exit(1);
+    }
 
-	//
-	// Multi-server install
-	//
+    //
+    // Multi-server install
+    //
 	
 	ModuleIP InputModuleIP;
 	ModuleIpList InputModuleIPList;
@@ -1131,8 +1161,8 @@ int main(int argc, char* argv[])
                 cout << "The Server will be configured as a Performance Module." << endl;
                 cout << "All MariaDB ColumnStore Processes will run on the Performance Modules." << endl << endl;
 
-                //module ProcessConfig.xml to setup all apps on the dm
-                if ( !updateProcessConfig(IserverTypeInstall) )
+                //module ProcessConfig.xml to setup all apps on the pm
+                if ( !updateProcessConfig() )
                     cout << "Update ProcessConfig.xml error" << endl;
 
                 //store local query flag
@@ -1323,19 +1353,21 @@ int main(int argc, char* argv[])
 	
 	if (!multi_server_quick_install)
 	{
-		system("aws --version > /tmp/amazon.log 2>&1");
+		string amazonLog = tmpDir + "/amazon.log";
+		string cmd = "aws --version > " + amazonLog + " 2>&1";
+		int rtnCode = system(cmd.c_str());
 
-		ifstream in("/tmp/amazon.log");
+		ifstream in(amazonLog.c_str());
 
 		in.seekg(0, std::ios::end);
 		int size = in.tellg();
 
-		if ( size == 0 || oam.checkLogStatus("/tmp/amazon.log", "not found"))
+		if ( size == 0 || oam.checkLogStatus(amazonLog, "not found"))
 		{
 			// not running on amazon with ec2-api-tools
 			if (amazon_quick_install)
 			{
-				cout << "ERROR: Amazon Quick Installer was specified, bu the AMazon CLI API packages isnt installed, exiting" << endl; 
+				cout << "ERROR: Amazon Quick Installer was specified, bu the Amazon CLI API packages isnt installed, exiting" << endl; 
 				exit(1);
 			}
 
@@ -1343,7 +1375,7 @@ int main(int argc, char* argv[])
 		}
 		else
 		{
-			if ( size == 0 || oam.checkLogStatus("/tmp/amazon.log", "not installed"))
+			if ( size == 0 || oam.checkLogStatus(amazonLog, "not installed"))
 			{
 				// not running on amazon with ec2-api-tools
 				if (amazon_quick_install)
@@ -1439,13 +1471,12 @@ int main(int argc, char* argv[])
                 cout << "Check Amazon Install Documenation for additional information, exiting..." << endl;
                 exit (1);
             }
-        }
 
-        // setup to start on reboot, for non-root amazon installs
-        if ( !rootUser )
-        {
-            system("sudo sed -i -e 's/#sudo runuser/sudo runuser/g' /etc/rc.d/rc.local >/dev/null 2>&1");
-            system("sudo chmod 666 /etc/fstab >/dev/null 2>&1");
+			// setup to start on reboot, for non-root amazon installs
+			if ( !rootUser )
+			{
+				system("sudo sed -i -e 's/#runuser/runuser/g' /etc/rc.d/rc.local >/dev/null 2>&1");
+			}
         }
 
         if ( !writeConfig(sysConfig) )
@@ -1686,7 +1717,13 @@ int main(int argc, char* argv[])
             // are we using settings from previous config file?
             if ( reuseConfig == "n" )
             {
-
+				
+				
+				
+				
+				
+				
+				
                 string numBlocksPct;
 
                 try
@@ -1787,7 +1824,7 @@ int main(int argc, char* argv[])
     //
     // Module Configuration
     //
-    cout << endl;
+    cout << endl << endl;
     cout << "===== Setup the Module Configuration =====" << endl << endl;
 
     if (amazonInstall)
@@ -2799,8 +2836,8 @@ int main(int argc, char* argv[])
                                 callFree(pcommand);
                             }
 
-                            //get device name based on DBRoot ID
-                            deviceName = "/dev/sdf";
+                            //get amazon device name for UM
+                            deviceName = "/dev/xvdf";
                         }
                         else
                         {
@@ -3431,7 +3468,7 @@ int main(int argc, char* argv[])
     }
 
     //create directories on dbroot1
-    if ( !createDbrootDirs(DBRootStorageType) )
+    if ( !createDbrootDirs(DBRootStorageType, amazonInstall) )
     {
         cout << "createDbrootDirs error" << endl;
         exit(1);
@@ -3450,7 +3487,7 @@ int main(int argc, char* argv[])
        ( (IserverTypeInstall != oam::INSTALL_COMBINE_DM_UM_PM) && pmwithum ) )
 	{
         //run the mysql / mysqld setup scripts
-        cout << endl << "===== Running the MariaDB ColumnStore MariaDB Server setup scripts =====" << endl << endl;
+        cout << endl << "===== Running the MariaDB ColumnStore MariaDB Server setup scripts =====" << endl;
 
         checkMysqlPort(mysqlPort, sysConfig);
 
@@ -3466,8 +3503,8 @@ int main(int argc, char* argv[])
             {
                 cout << endl;
                 cout << "Next step is to enter the password to access the other Servers." << endl;
-                cout << "This is either your password or you can default to using a ssh key" << endl;
-                cout << "If using a password, the password needs to be the same on all Servers." << endl << endl;
+                cout << "This is either user password or you can default to using a ssh key" << endl;
+                cout << "If using a user password, the password needs to be the same on all Servers." << endl << endl;
 
                 if ( noPrompting ) {
                     cout << "Enter password, hit 'enter' to default to using a ssh key, or 'exit' > " << endl;
@@ -3554,14 +3591,14 @@ int main(int argc, char* argv[])
             if ( EEPackageType == "rpm" )
             {
                 cout << "Performing a MariaDB ColumnStore System install using RPM packages" << endl;
-                cout << "located in the " + HOME + " directory." << endl << endl;
+                cout << "located in the " + HOME + " directory." << endl;
             }
             else
             {
                 if ( EEPackageType == "binary" )
                 {
                     cout << "Performing a MariaDB ColumnStore System install using a Binary package" << endl;
-                    cout << "located in the " + HOME + " directory." << endl << endl;
+                    cout << "located in the " + HOME + " directory." << endl;
                 }
                 else
                 {
@@ -3602,7 +3639,7 @@ int main(int argc, char* argv[])
 
                 if ( remote_installer_debug == "1" )
                 {
-                    logfile = "/tmp/";
+                    logfile = tmpDir + "/";
                     logfile += remoteModuleName + "_" + EEPackageType + "_install.log";
                     debug_logfile = " > " + logfile;
                 }
@@ -3880,17 +3917,7 @@ int main(int argc, char* argv[])
     //check if local MariaDB ColumnStore system logging is working
     cout << endl << "===== Checking MariaDB ColumnStore System Logging Functionality =====" << endl << endl;
 
-    if ( rootUser)
-        cmd = installDir + "/bin/syslogSetup.sh install  > /dev/null 2>&1";
-    else
-        cmd = "sudo " + installDir + "/bin/syslogSetup.sh --installdir=" + installDir + " install  > /dev/null 2>&1";
-
-    system(cmd.c_str());
-
-    if ( rootUser)
-        cmd = installDir + "/bin/syslogSetup.sh status  > /dev/null 2>&1";
-    else
-        cmd = "sudo " + installDir + "/bin/syslogSetup.sh --installdir=" + installDir + " status  > /dev/null 2>&1";
+    cmd = installDir + "/bin/syslogSetup.sh status  > /dev/null 2>&1";
 
     int ret = system(cmd.c_str());
 
@@ -3919,13 +3946,15 @@ int main(int argc, char* argv[])
 
         if (hdfs && !nonDistribute )
         {
+			string postConfigurePsdhLog = tmpDir + "/postConfigure.pdsh.log";
+
             cout << endl << "----- Starting MariaDB ColumnStore Service on all Modules -----" << endl << endl;
-            string cmd = "pdsh -a '" + installDir + "/bin/columnstore restart' > /tmp/postConfigure.pdsh 2>&1";
+            string cmd = "pdsh -a '" + installDir + "/bin/columnstore restart' > " + postConfigurePsdhLog + " 2>&1";
             system(cmd.c_str());
 
-            if (oam.checkLogStatus("/tmp/postConfigure.pdsh", "exit") )
+            if (oam.checkLogStatus(postConfigurePsdhLog, "exit") )
             {
-                cout << endl << "ERROR: Starting MariaDB ColumnStore Service failue, check /tmp/postConfigure.pdsh. exit..." << endl;
+                cout << endl << "ERROR: Starting MariaDB ColumnStore Service failue, check " + postConfigurePsdhLog + ". exit..." << endl;
                 exit (1);
             }
         }
@@ -3971,6 +4000,14 @@ int main(int argc, char* argv[])
     cout << endl << "MariaDB ColumnStore Database Platform Starting, please wait .";
     cout.flush();
 
+    string ProfileFile;
+	try
+	{
+		ProfileFile = sysConfig->getConfig(InstallSection, "ProfileFile");
+	}
+	catch (...)
+	{}
+
     if ( waitForActive() )
     {
         cout << " DONE" << endl;
@@ -4002,27 +4039,41 @@ int main(int argc, char* argv[])
                 }
             }
         }
+        
+        string dbbuilderLog = tmpDir + "/dbbuilder.log";
 
         if (hdfs)
-            cmd = "bash -c '. " + installDir + "/bin/" + DataFileEnvFile + ";" + installDir + "/bin/dbbuilder 7 > /tmp/dbbuilder.log'";
+            cmd = "bash -c '. " + installDir + "/bin/" + DataFileEnvFile + ";" + installDir + "/bin/dbbuilder 7 > " + dbbuilderLog;
         else
-            cmd = installDir + "/bin/dbbuilder 7 > /tmp/dbbuilder.log";
+            cmd = installDir + "/bin/dbbuilder 7 > " + dbbuilderLog;
 
         system(cmd.c_str());
 
-        if (oam.checkLogStatus("/tmp/dbbuilder.log", "System Catalog created") )
+        if (oam.checkLogStatus(dbbuilderLog, "System Catalog created") )
             cout << endl << "System Catalog Successfully Created" << endl;
         else
         {
-            if ( oam.checkLogStatus("/tmp/dbbuilder.log", "System catalog appears to exist") )
+            if ( oam.checkLogStatus(dbbuilderLog, "System catalog appears to exist") )
             {
+/*				cout << endl << "Run MariaDB Server Upgrade.. ";
+				cout.flush();
 
-                cout.flush();
+				//send message to procmon's to run upgrade script
+				int status = sendUpgradeRequest(IserverTypeInstall, pmwithum);
+	
+				if ( status != 0 ) {
+					cout << endl << "MariaDB Columnstore Install Failed" << endl << endl;
+					exit(1);
+				}
+				else
+					cout << " DONE" << endl;
+*/
+				cout.flush();
             }
             else
             {
                 cout << endl << "System Catalog Create Failure" << endl;
-                cout << "Check latest log file in /tmp/dbbuilder.log.*" << endl;
+                cout << "Check latest log file in " << dbbuilderLog << endl;
                 cout << " IMPORTANT: Once issue has been resolved, rerun postConfigure" << endl << endl;
 
                 exit (1);
@@ -4052,10 +4103,7 @@ int main(int argc, char* argv[])
 
         cout << "Enter the following command to define MariaDB ColumnStore Alias Commands" << endl << endl;
 
-		if ( !rootUser )
-			cout << ". /etc/profile.d/columnstoreEnv.sh" << endl;
-
-		cout << ". /etc/profile.d/columnstoreAlias.sh" << endl << endl;
+		cout << ". " << ProfileFile << endl << endl;
 
         cout << "Enter 'mcsmysql' to access the MariaDB ColumnStore SQL console" << endl;
         cout << "Enter 'mcsadmin' to access the MariaDB ColumnStore Admin console" << endl << endl;
@@ -4072,10 +4120,7 @@ int main(int argc, char* argv[])
 
         cout << "Enter the following command to define MariaDB ColumnStore Alias Commands" << endl << endl;
 
-		if ( !rootUser )
-			cout << ". /etc/profile.d/columnstoreEnv.sh" << endl;
-
-		cout << ". /etc/profile.d/columnstoreAlias.sh" << endl << endl;
+		cout << ". " << ProfileFile << endl << endl;
 
         cout << "Enter 'mcsmysql' to access the MariaDB ColumnStore SQL console" << endl;
         cout << "Enter 'mcsadmin' to access the MariaDB ColumnStore Admin console" << endl << endl;
@@ -4209,19 +4254,7 @@ bool checkSaveConfigFile()
         string cmd;
 
         if ( reuseConfig == "y" )
-        {
-            if ( singleServerInstall == "1")
-            {
-                cmd = "rm -f " + installDir + "/etc/Columnstore.xml.installSave  > /dev/null 2>&1";
-                system(cmd.c_str());
-                cmd = "mv -f " + installDir + "/etc/Columnstore.xml " + installDir + "/etc/Columnstore.xml.installSave  > /dev/null 2>&1";
-                system(cmd.c_str());
-                cmd = "/bin/cp -f " + installDir + "/etc/Columnstore.xml.singleserver " + installDir + "/etc/Columnstore.xml  > /dev/null 2>&1";
-                system(cmd.c_str());
-            }
-
             break;
-        }
 
         if ( reuseConfig == "n" )
         {
@@ -4348,22 +4381,13 @@ bool setOSFiles(string parentOAMModuleName, int serverTypeInstall)
         //make a backup copy before changing
         string cmd = "rm -f " + fileName + ".columnstoreSave";
 
-        if ( !rootUser )
-            cmd = "sudo rm -f " + fileName + ".columnstoreSave";
-
         system(cmd.c_str());
 
         cmd = "cp " + fileName + " " + fileName + ".columnstoreSave > /dev/null 2>&1";
 
-        if ( !rootUser )
-            cmd = "sudo cp " + fileName + " " + fileName + ".columnstoreSave > /dev/null 2>&1";
-
         system(cmd.c_str());
 
-        if ( rootUser )
-            cmd = "cat " + installDir + "/local/etc/" + parentOAMModuleName + "/" + files[i] + ".calpont >> " + fileName;
-        else
-            cmd = "sudo bash -c 'sudo cat " + installDir + "/local/etc/" + parentOAMModuleName + "/" + files[i] + ".calpont >> " + fileName + "'";
+        cmd = "cat " + installDir + "/local/etc/" + parentOAMModuleName + "/" + files[i] + ".calpont >> " + fileName;
 
         int rtnCode = system(cmd.c_str());
 
@@ -4392,38 +4416,14 @@ bool setOSFiles(string parentOAMModuleName, int serverTypeInstall)
 
 /*
  * Update ProcessConfig.xml file for a single server configuration
- * Change the 'um' and 'pm' to 'dm'
+ * Change the 'um' to 'pm'
  */
-bool updateProcessConfig(int serverTypeInstall)
+bool updateProcessConfig()
 {
     vector <string> oldModule;
-    string newModule;
-
-    switch ( serverTypeInstall )
-    {
-        case (oam::INSTALL_COMBINE_DM_UM_PM):
-        {
-            newModule = ">pm";
-            oldModule.push_back(">um");
-            oldModule.push_back(">dm");
-            break;
-        }
-
-        case (oam::INSTALL_COMBINE_DM_UM):
-        {
-            newModule = ">um";
-            oldModule.push_back(">dm");
-            break;
-        }
-
-        case (oam::INSTALL_COMBINE_PM_UM):
-        {
-            newModule = ">pm";
-            oldModule.push_back(">um");
-            break;
-        }
-    }
-
+    string newModule = ">pm";
+	oldModule.push_back(">um");
+ 
     string fileName = installDir + "/etc/ProcessConfig.xml";
 
     //Save a copy of the original version
@@ -4564,6 +4564,9 @@ bool uncommentCalpontXml( string entry)
  */
 bool makeRClocal(string moduleType, string moduleName, int IserverTypeInstall)
 {
+  
+    return true;
+    
     vector <string> lines;
 
     string mount1;
@@ -4652,7 +4655,7 @@ bool makeRClocal(string moduleType, string moduleName, int IserverTypeInstall)
 /*
  * createDbrootDirs
  */
-bool createDbrootDirs(string DBRootStorageType)
+bool createDbrootDirs(string DBRootStorageType, bool amazonInstall)
 {
     int rtnCode;
     string cmd;
@@ -4660,12 +4663,17 @@ bool createDbrootDirs(string DBRootStorageType)
     // mount data1 and create directories if configured with storage
     if ( DBRootStorageType == "external" )
     {
-        string cmd = "mount " + installDir + "/data1 > /tmp/mount.txt 2>&1";
+        string cmd = "mount " + installDir + "/data1 > " + tmpDir + "/mount.log 2>&1";
         system(cmd.c_str());
 
         if ( !rootUser)
         {
-            cmd = "sudo chown -R " + USER + ":" + USER + " " + installDir + "/data1 > /dev/null";
+			//if Amazon, Non-Root, and External EBS, use sudo
+			string SUDO = "";
+			if ( amazonInstall )
+				SUDO = "sudo ";
+
+            cmd = SUDO + "chown -R " + USER + ":" + USER + " " + installDir + "/data1 > /dev/null";
             system(cmd.c_str());
         }
 
@@ -4693,11 +4701,12 @@ bool pkgCheck(string columnstorePackage)
 {
     while (true)
     {
-        string cmd = "ls " + columnstorePackage + " > /tmp/calpontpkgs";
+        string fileName = tmpDir + "/calpontpkgs";
+
+        string cmd = "ls " + columnstorePackage + " > " + fileName;
         system(cmd.c_str());
 
         string pkg = columnstorePackage;
-        string fileName = "/tmp/calpontpkgs";
         ifstream oldFile (fileName.c_str());
 
         if (oldFile)
@@ -4808,7 +4817,7 @@ bool storageSetup(bool amazonInstall)
                 cout.flush();
                 string logdir("/var/log/mariadb/columnstore");
 
-                if (access(logdir.c_str(), W_OK) != 0) logdir = "/tmp";
+                if (access(logdir.c_str(), W_OK) != 0) logdir = tmpDir;
 
                 string hdfslog = logdir + "/hdfsCheck.log1";
 
@@ -5125,10 +5134,7 @@ bool storageSetup(bool amazonInstall)
     //check if gluster is installed
     int rtnCode = 1;
 
-    if (rootUser)
-        rtnCode = system("gluster --version > /tmp/gluster.log 2>&1");
-    else
-        rtnCode = system("sudo gluster --version > /tmp/gluster.log 2>&1");
+	rtnCode = system("gluster --version > /tmp/gluster.log 2>&1");
 
     if (rtnCode == 0)
     {
@@ -5140,14 +5146,17 @@ bool storageSetup(bool amazonInstall)
     }
 
     //check if hadoop is installed
-    system("which hadoop > /tmp/hadoop.log 2>&1");
+    string hadoopLog = tmpDir + "/hadoop.log";
+    
+	string cmd = "which hadoop > " + hadoopLog + " 2>&1";
+    system(cmd.c_str());
 
-    ifstream in("/tmp/hadoop.log");
+    ifstream in(hadoopLog.c_str());
 
     in.seekg(0, std::ios::end);
     int size = in.tellg();
 
-    if ( size == 0 || oam.checkLogStatus("/tmp/hadoop.log", "no hadoop"))
+    if ( size == 0 || oam.checkLogStatus(hadoopLog, "no hadoop"))
         // no hadoop
         size = 0;
     else
@@ -5618,7 +5627,7 @@ bool storageSetup(bool amazonInstall)
                 cout.flush();
                 string logdir("/var/log/mariadb/columnstore");
 
-                if (access(logdir.c_str(), W_OK) != 0) logdir = "/tmp";
+                if (access(logdir.c_str(), W_OK) != 0) logdir = tmpDir;
 
                 string hdfslog = logdir + "/hdfsCheck.log1";
 
@@ -5820,10 +5829,7 @@ bool updateBash()
         string cmd = "echo . " + installDir + "/bin/" + DataFileEnvFile + " >> " + fileName;
         system(cmd.c_str());
 
-        if ( rootUser)
-            cmd = "su - hdfs -c 'hadoop fs -mkdir -p " + installDir + ";hadoop fs -chown root:root " + installDir + "' >/dev/null 2>&1";
-        else
-            cmd = "sudo su - hdfs -c 'hadoop fs -mkdir -p " + installDir + ";hadoop fs -chown " + USER + ":" + USER + " " + installDir + "' >/dev/null 2>&1";
+        cmd = "su - hdfs -c 'hadoop fs -mkdir -p " + installDir + ";hadoop fs -chown root:root " + installDir + "' >/dev/null 2>&1";
 
         system(cmd.c_str());
     }
@@ -6160,14 +6166,14 @@ void remoteInstallThread(void* arg)
             {
                 //failure
                 pthread_mutex_lock(&THREAD_LOCK);
-                cout << endl << "Failure with a remote module install, check install log files in /tmp" << endl;
+                cout << endl << "Failure with a remote module install, check install log files in " << tmpDir << endl;
                 exit(1);
             }
         }
     }
 
     pthread_mutex_lock(&THREAD_LOCK);
-    cout << endl << "Failure with a remote module install, check install log files in /tmp" << endl;
+    cout << endl << "Failure with a remote module install, check install log files in " << tmpDir << endl;
     exit(1);
 }
 
@@ -6271,7 +6277,6 @@ std::string launchInstance(ModuleIP moduleip)
 
 bool glusterSetup(string password)
 {
-
     Oam oam;
     int dataRedundancyCopies = 0;
     int dataRedundancyNetwork = 0;
@@ -6919,5 +6924,73 @@ bool glusterSetup(string password)
     return true;
 }
 
+void singleServerConfigSetup(Config* sysConfig)
+{
+	
+	try
+	{
+		sysConfig->setConfig("ExeMgr1", "IPAddr", "127.0.0.1");
+		sysConfig->setConfig("ExeMgr1", "Module", "pm1");
+		sysConfig->setConfig("ProcMgr", "IPAddr", "127.0.0.1");
+		sysConfig->setConfig("ProcMgr_Alarm", "IPAddr", "127.0.0.1");
+		sysConfig->setConfig("ProcStatusControl", "IPAddr", "127.0.0.1");
+		sysConfig->setConfig("pm1_ProcessMonitor", "IPAddr", "127.0.0.1");
+		sysConfig->setConfig("pm1_ServerMonitor", "IPAddr", "127.0.0.1");
+		sysConfig->setConfig("pm1_WriteEngineServer", "IPAddr", "127.0.0.1");
+		sysConfig->setConfig("DDLProc", "IPAddr", "127.0.0.1");
+		sysConfig->setConfig("DMLProc", "IPAddr", "127.0.0.1");
+		sysConfig->setConfig("PMS1", "IPAddr", "127.0.0.1");
+		sysConfig->setConfig("PMS2", "IPAddr", "127.0.0.1");
+		sysConfig->setConfig("PMS3", "IPAddr", "127.0.0.1");
+		sysConfig->setConfig("PMS4", "IPAddr", "127.0.0.1");
+		sysConfig->setConfig("PMS5", "IPAddr", "127.0.0.1");
+		sysConfig->setConfig("PMS6", "IPAddr", "127.0.0.1");
+		sysConfig->setConfig("PMS7", "IPAddr", "127.0.0.1");
+		sysConfig->setConfig("PMS8", "IPAddr", "127.0.0.1");
+		sysConfig->setConfig("PMS9", "IPAddr", "127.0.0.1");
+		sysConfig->setConfig("PMS10", "IPAddr", "127.0.0.1");
+		sysConfig->setConfig("PMS11", "IPAddr", "127.0.0.1");
+		sysConfig->setConfig("PMS12", "IPAddr", "127.0.0.1");
+		sysConfig->setConfig("PMS13", "IPAddr", "127.0.0.1");
+		sysConfig->setConfig("PMS14", "IPAddr", "127.0.0.1");
+		sysConfig->setConfig("PMS15", "IPAddr", "127.0.0.1");
+		sysConfig->setConfig("PMS16", "IPAddr", "127.0.0.1");
+		sysConfig->setConfig("PMS17", "IPAddr", "127.0.0.1");
+		sysConfig->setConfig("PMS18", "IPAddr", "127.0.0.1");
+		sysConfig->setConfig("PMS19", "IPAddr", "127.0.0.1");
+		sysConfig->setConfig("PMS20", "IPAddr", "127.0.0.1");
+		sysConfig->setConfig("PMS21", "IPAddr", "127.0.0.1");
+		sysConfig->setConfig("PMS22", "IPAddr", "127.0.0.1");
+		sysConfig->setConfig("PMS23", "IPAddr", "127.0.0.1");
+		sysConfig->setConfig("PMS24", "IPAddr", "127.0.0.1");
+		sysConfig->setConfig("PMS25", "IPAddr", "127.0.0.1");
+		sysConfig->setConfig("PMS26", "IPAddr", "127.0.0.1");
+		sysConfig->setConfig("PMS27", "IPAddr", "127.0.0.1");
+		sysConfig->setConfig("PMS28", "IPAddr", "127.0.0.1");
+		sysConfig->setConfig("PMS29", "IPAddr", "127.0.0.1");
+		sysConfig->setConfig("PMS30", "IPAddr", "127.0.0.1");
+		sysConfig->setConfig("PMS31", "IPAddr", "127.0.0.1");
+		sysConfig->setConfig("PMS32", "IPAddr", "127.0.0.1");
+		sysConfig->setConfig("SystemModuleConfig", "ModuleCount2", "0");
+		sysConfig->setConfig("SystemModuleConfig", "ModuleIPAddr1-1-3", "127.0.0.1");
+		sysConfig->setConfig("SystemModuleConfig", "ModuleHostName1-1-3", "localhost");
+		sysConfig->setConfig("DBRM_Controller", "IPAddr", "127.0.0.1");
+		sysConfig->setConfig("DBRM_Worker1", "IPAddr", "127.0.0.1");
+		sysConfig->setConfig("DBRM_Worker1", "Module", "pm1");
+		sysConfig->setConfig("DBBC", "NumBlocksPct", "50");
+		sysConfig->setConfig("Installation", "InitialInstallFlag", "y");
+		sysConfig->setConfig("Installation", "SingleServerInstall", "y");
+		sysConfig->setConfig("HashJoin", "TotalUmMemory", "25%");
+	}
+	catch (...)
+	{
+	cout << "ERROR: Problem setting for Single Server in the MariaDB ColumnStore System Configuration file" << endl;
+	exit(1);
+	}
+
+	return;
+}
+
+
 
 // vim:ts=4 sw=4:
diff --git a/oamapps/postConfigure/quick_installer_amazon.sh b/oamapps/postConfigure/quick_installer_amazon.sh
index a844e0ee8..67f0f2ce1 100755
--- a/oamapps/postConfigure/quick_installer_amazon.sh
+++ b/oamapps/postConfigure/quick_installer_amazon.sh
@@ -55,6 +55,7 @@ else
 fi
 
 if [[ $HOME = "/root" ]]; then
+        echo ""
         echo "${bold}Run post-install script${normal}"
         echo ""
         /usr/local/mariadb/columnstore/bin/post-install
@@ -66,14 +67,19 @@ if [[ $HOME = "/root" ]]; then
 			/usr/local/mariadb/columnstore/bin/postConfigure -qa -pm-count $pmCount -um-count $umCount $systemName -d
 		fi
 else
+        echo ""
         echo "${bold}Run post-install script${normal}"
         echo ""
         $HOME/mariadb/columnstore/bin/post-install --installdir=$HOME/mariadb/columnstore
+
+		export COLUMNSTORE_INSTALL_DIR=$HOME/mariadb/columnstore
+		export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$HOME/mariadb/columnstore/lib:$HOME/mariadb/columnstore/mysql/lib
+		
         echo "${bold}Run postConfigure script${normal}"
         echo ""
         if [[ $umCount = "" ]]; then
-			. /etc/profile.d/columnstoreEnv.sh;$HOME/mariadb/columnstore/bin/postConfigure -i $HOME/mariadb/columnstore -qa -pm-count $pmCount $systemName -d
+			$HOME/mariadb/columnstore/bin/postConfigure -i $HOME/mariadb/columnstore -qa -pm-count $pmCount $systemName -d
 		else
-			. /etc/profile.d/columnstoreEnv.sh;$HOME/mariadb/columnstore/bin/postConfigure -i $HOME/mariadb/columnstore -qa -pm-count $pmCount -um-count $umCount $systemName -d
+			$HOME/mariadb/columnstore/bin/postConfigure -i $HOME/mariadb/columnstore -qa -pm-count $pmCount -um-count $umCount $systemName -d
 		fi
 fi
diff --git a/oamapps/postConfigure/quick_installer_multi_server.sh b/oamapps/postConfigure/quick_installer_multi_server.sh
index b9786f5ef..d47bdaacd 100755
--- a/oamapps/postConfigure/quick_installer_multi_server.sh
+++ b/oamapps/postConfigure/quick_installer_multi_server.sh
@@ -61,6 +61,7 @@ else
 fi
 
 if [[ $HOME = "/root" ]]; then
+        echo ""
         echo "${bold}Run post-install script${normal}"
         echo ""
         /usr/local/mariadb/columnstore/bin/post-install
@@ -72,14 +73,19 @@ if [[ $HOME = "/root" ]]; then
 			/usr/local/mariadb/columnstore/bin/postConfigure -qm -pm-ip-addrs $pmIpAddrs -um-ip-addrs $umIpAddrs $nonDistrubutedInstall $systemName
 		fi
 else
+        echo ""
         echo "${bold}Run post-install script${normal}"
         echo ""
         $HOME/mariadb/columnstore/bin/post-install --installdir=$HOME/mariadb/columnstore
+        
+		export COLUMNSTORE_INSTALL_DIR=$HOME/mariadb/columnstore
+		export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$HOME/mariadb/columnstore/lib:$HOME/mariadb/columnstore/mysql/lib
+
         echo "${bold}Run postConfigure script${normal}"
         echo ""
         if [[ $umIpAddrs = "" ]]; then
-			. /etc/profile.d/columnstoreEnv.sh;$HOME/mariadb/columnstore/bin/postConfigure -i $HOME/mariadb/columnstore -qm -pm-ip-addrs $pmIpAddrs $nonDistrubutedInstall $systemName
+			$HOME/mariadb/columnstore/bin/postConfigure -i $HOME/mariadb/columnstore -qm -pm-ip-addrs $pmIpAddrs $nonDistrubutedInstall $systemName
 		else
-			. /etc/profile.d/columnstoreEnv.sh;$HOME/mariadb/columnstore/bin/postConfigure -i $HOME/mariadb/columnstore -qm -pm-ip-addrs $pmIpAddrs -um-ip-addrs $umIpAddrs $nonDistrubutedInstall $systemName
+			$HOME/mariadb/columnstore/bin/postConfigure -i $HOME/mariadb/columnstore -qm -pm-ip-addrs $pmIpAddrs -um-ip-addrs $umIpAddrs $nonDistrubutedInstall $systemName
 		fi
 fi
diff --git a/oamapps/postConfigure/quick_installer_single_server.sh b/oamapps/postConfigure/quick_installer_single_server.sh
index 432b395c4..1b747adc3 100755
--- a/oamapps/postConfigure/quick_installer_single_server.sh
+++ b/oamapps/postConfigure/quick_installer_single_server.sh
@@ -18,6 +18,7 @@ done
 
 
 if [ $HOME == "/root" ]; then
+        echo ""
         echo "Run post-install script"
         echo ""
         /usr/local/mariadb/columnstore/bin/post-install
@@ -25,10 +26,15 @@ if [ $HOME == "/root" ]; then
         echo ""
         /usr/local/mariadb/columnstore/bin/postConfigure -qs
 else
+        echo ""
         echo "Run post-install script"
         echo ""
         $HOME/mariadb/columnstore/bin/post-install --installdir=$HOME/mariadb/columnstore
+        
+		export COLUMNSTORE_INSTALL_DIR=$HOME/mariadb/columnstore
+		export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$HOME/mariadb/columnstore/lib:$HOME/mariadb/columnstore/mysql/lib
+
         echo "Run postConfigure script"
         echo ""
-        . /etc/profile.d/columnstoreEnv.sh; $HOME/mariadb/columnstore/bin/postConfigure -i $HOME/mariadb/columnstore -qs
+        $HOME/mariadb/columnstore/bin/postConfigure -i $HOME/mariadb/columnstore -qs
 fi
diff --git a/oamapps/resourceMonitor/hardwareMonitor.cpp b/oamapps/resourceMonitor/hardwareMonitor.cpp
index 6877836b4..9ec322b2e 100644
--- a/oamapps/resourceMonitor/hardwareMonitor.cpp
+++ b/oamapps/resourceMonitor/hardwareMonitor.cpp
@@ -34,6 +34,8 @@
 #include "loggingid.h"
 #include "alarmmanager.h"
 
+#include "installdir.h"
+
 using namespace std;
 using namespace oam;
 using namespace alarmmanager;
@@ -80,11 +82,15 @@ int main (int argc, char** argv)
     string highCritical;
     string highFatal;
     char* p;
+    
+    string tmpDir = startup::StartUp::tmpDir();
 
     // loop forever reading the hardware status
     while (TRUE)
     {
-        int returnCode = system("ipmitool sensor list > /tmp/harwareMonitor.txt");
+		string logFile = tmpDir + "/harwareMonitor.txt";
+		string cmd = "ipmitool sensor list > " + logFile;
+        int returnCode = system(cmd.c_str());
 
         if (returnCode)
         {
@@ -95,12 +101,12 @@ int main (int argc, char** argv)
 
         // parse output file
 
-        ifstream File ("/tmp/harwareMonitor.txt");
+        ifstream File (logFile);
 
         if (!File)
         {
             // System error
-            cout << "Error opening /tmp/harwareMonitor.txt!!!" << endl;
+            cout << "Error opening " << logFile << endl;
             exit(-1);
         }
 
diff --git a/oamapps/serverMonitor/cpuMonitor.cpp b/oamapps/serverMonitor/cpuMonitor.cpp
index 873de17c1..49d01ec3f 100644
--- a/oamapps/serverMonitor/cpuMonitor.cpp
+++ b/oamapps/serverMonitor/cpuMonitor.cpp
@@ -47,6 +47,8 @@ const int RESOURCE_DEBUG = false;
 static unsigned int usage[LOG_FREQ / MONITOR_FREQ];
 static int usageCount = 0;
 
+extern string tmpDir;
+
 /*****************************************************************************************
 * @brief	cpuMonitor Thread
 *
@@ -518,10 +520,13 @@ void ServerMonitor::logCPUstat (int usageCount)
 void ServerMonitor::getCPUdata()
 {
     pcl.clear();
+ 
+    string tmpProcessCpu = tmpDir + "/processCpu";
+    
+    string cmd = "top -b -n1 | head -12 | awk '{print $9,$12}' | tail -5 > " + tmpProcessCpu;
+    system(cmd.c_str());
 
-    system("top -b -n1 | head -12 | awk '{print $9,$12}' | tail -5 > /tmp/columnstore_tmp_files/processCpu");
-
-    ifstream oldFile1 ("/tmp/columnstore_tmp_files/processCpu");
+    ifstream oldFile1 (tmpProcessCpu.c_str());
 
     // read top 5 users
     int i = 0;
@@ -547,9 +552,14 @@ void ServerMonitor::getCPUdata()
     //
     // get and check Total CPU usage
     //
-    system("top -b -n 6 -d 1 | awk '{print $5}' | grep %id > /tmp/columnstore_tmp_files/systemCpu");
+    
 
-    ifstream oldFile ("/tmp/columnstore_tmp_files/systemCpu");
+    string tmpsystemCpu = tmpDir + "/processCpu";
+    
+    cmd = "top -b -n 6 -d 1 | awk '{print $5}' | grep %id  > " + tmpsystemCpu;
+    system(cmd.c_str());
+
+    ifstream oldFile (tmpsystemCpu.c_str());
 
     float systemIdle = 0;
     // skip first line in file, and average the next 5 entries which contains idle times
diff --git a/oamapps/serverMonitor/hardwareMonitor.cpp b/oamapps/serverMonitor/hardwareMonitor.cpp
index 7beda22f4..8e6a19dc7 100644
--- a/oamapps/serverMonitor/hardwareMonitor.cpp
+++ b/oamapps/serverMonitor/hardwareMonitor.cpp
@@ -31,6 +31,8 @@ using namespace logging;
 using namespace servermonitor;
 //using namespace procheartbeat;
 
+extern string tmpDir;
+
 
 /************************************************************************************************************
 * @brief	hardwareMonitor function
@@ -72,7 +74,10 @@ void hardwareMonitor(int IPMI_SUPPORT)
 
     if ( IPMI_SUPPORT == 0)
     {
-        int returnCode = system("ipmitool sensor list > /tmp/harwareMonitor.txt");
+		string tmpharwareMonitor = tmpDir + "/harwareMonitor.txt";
+    
+		string cmd = "ipmitool sensor list >  > " + tmpharwareMonitor;
+		int returnCode = system(cmd.c_str());
 
         if (returnCode)
         {
@@ -128,7 +133,7 @@ void hardwareMonitor(int IPMI_SUPPORT)
     {
         // parse output file
 
-        ifstream File ("/tmp/harwareMonitor.txt");
+        ifstream File (tmpharwareMonitor);
 
         if (!File)
         {
@@ -137,7 +142,7 @@ void hardwareMonitor(int IPMI_SUPPORT)
             MessageLog ml(lid);
             Message msg;
             Message::Args args;
-            args.add("Error opening /tmp/harwareMonitor.txt!!!");
+            args.add("Error opening harwareMonitor.txt!!!");
             msg.format(args);
             ml.logWarningMessage(msg);
             sleep(300);
diff --git a/oamapps/serverMonitor/main.cpp b/oamapps/serverMonitor/main.cpp
index a4422aa04..e3fb8e511 100644
--- a/oamapps/serverMonitor/main.cpp
+++ b/oamapps/serverMonitor/main.cpp
@@ -19,6 +19,7 @@
 #include "serverMonitor.h"
 
 #include "crashtrace.h"
+#include "installdir.h"
 
 using namespace std;
 using namespace servermonitor;
@@ -27,6 +28,8 @@ using namespace logging;
 
 extern int swapFlag;
 
+string tmpDir;
+
 /*****************************************************************************
 * @brief	main
 *
@@ -40,6 +43,8 @@ int main (int argc, char** argv)
     ServerMonitor serverMonitor;
     Oam oam;
 
+    tmpDir = startup::StartUp::tmpDir();
+
     struct sigaction ign;
 
     memset(&ign, 0, sizeof(ign));
diff --git a/oamapps/serverMonitor/memoryMonitor.cpp b/oamapps/serverMonitor/memoryMonitor.cpp
index 0e120ed46..b72d17e64 100644
--- a/oamapps/serverMonitor/memoryMonitor.cpp
+++ b/oamapps/serverMonitor/memoryMonitor.cpp
@@ -39,6 +39,8 @@ uint64_t totalMem;
 
 pthread_mutex_t MEMORY_LOCK;
 
+extern string tmpDir;
+
 /*****************************************************************************************
 * @brief	memoryMonitor Thread
 *
@@ -500,9 +502,12 @@ void ServerMonitor::outputProcMemory(bool log)
     // get top 5 Memory users by process
     //
 
-    system("ps -e -orss=1,args= | sort -b -k1,1n |tail -n 5 | awk '{print $1,$2}' > /tmp/columnstore_tmp_files/processMem");
+    string tmpprocessMem = tmpDir + "/processMem";
+    
+    string cmd = "ps -e -orss=1,args= | sort -b -k1,1n |tail -n 5 | awk '{print $1,$2}' > " + tmpprocessMem;
+    system(cmd.c_str());
 
-    ifstream oldFile ("/tmp/columnstore_tmp_files/processMem");
+    ifstream oldFile (tmpprocessMem.c_str());
 
     string process;
     long long memory;
diff --git a/oamapps/serverMonitor/msgProcessor.cpp b/oamapps/serverMonitor/msgProcessor.cpp
index d76dc65b3..48bfaa2f0 100644
--- a/oamapps/serverMonitor/msgProcessor.cpp
+++ b/oamapps/serverMonitor/msgProcessor.cpp
@@ -39,6 +39,8 @@ extern ProcessMemoryList pml;
 extern pthread_mutex_t CPU_LOCK;
 extern pthread_mutex_t MEMORY_LOCK;
 
+extern string tmpDir;
+
 /**
  * constants define
  */
@@ -97,13 +99,10 @@ void msgProcessor()
     {
         Config* sysConfig = Config::makeConfig();
         string port = sysConfig->getConfig(msgPort, "Port");
-        string cmd = "fuser -k " + port + "/tcp";
+        string cmd = "fuser -k " + port + "/tcp >/dev/null 2>&1";
         int user;
         user = getuid();
 
-        if (user != 0)
-            cmd = "sudo fuser -k " + port + "/tcp";
-
         system(cmd.c_str());
     }
     catch (...)
@@ -255,9 +254,12 @@ void msgProcessor()
                                 ByteStream ackmsg;
 
                                 // get cache MEMORY stats
-                                system("cat /proc/meminfo | grep Cached -m 1 | awk '{print $2}' > /tmp/cached");
+								string tmpcached = tmpDir + "/cached";
+								
+								string cmd = "cat /proc/meminfo | grep Cached -m 1 | awk '{print $2}' > " + tmpcached;
+								system(cmd.c_str());
 
-                                ifstream oldFile ("/tmp/cached");
+								ifstream oldFile (tmpcached.c_str());
 
                                 string strCache;
                                 long long cache;
@@ -627,7 +629,7 @@ void msgProcessor()
                                         MessageLog ml(lid);
                                         Message msg;
                                         Message::Args args;
-                                        args.add("RUN_DBHEALTH_CHECK failed, check /tmp/dbhealthTest.log");
+                                        args.add("RUN_DBHEALTH_CHECK failed, check dbhealthTest.log");
                                         msg.format(args);
                                         ml.logDebugMessage(msg);
                                     }
diff --git a/primitives/primproc/primproc.cpp b/primitives/primproc/primproc.cpp
index 1b19ccd0f..0ff38f0de 100644
--- a/primitives/primproc/primproc.cpp
+++ b/primitives/primproc/primproc.cpp
@@ -72,6 +72,7 @@ using namespace idbdatafile;
 #include "cgroupconfigurator.h"
 
 #include "crashtrace.h"
+#include "installdir.h"
 
 namespace primitiveprocessor
 {
@@ -147,7 +148,7 @@ void setupSignalHandlers()
 
 void setupCwd(Config* cf)
 {
-    string workdir = cf->getConfig("SystemConfig", "WorkingDir");
+    string workdir = startup::StartUp::tmpDir();
 
     if (workdir.length() == 0)
         workdir = ".";
diff --git a/procmgr/main.cpp b/procmgr/main.cpp
index 63205f528..c81f5fd69 100644
--- a/procmgr/main.cpp
+++ b/procmgr/main.cpp
@@ -61,6 +61,8 @@ bool HDFS = false;
 string localHostName;
 string PMwithUM = "n";
 string MySQLRep = "n";
+string tmpLogDir;
+
 
 // pushing the ACTIVE_ALARMS_FILE to all nodes every 10 seconds.
 const int ACTIVE_ALARMS_PUSHING_INTERVAL = 10;
@@ -256,6 +258,9 @@ int main(int argc, char** argv)
     freeifaddrs(addrs);
     log.writeLog(__LINE__, "Main Ethernet Port = " + iface_name, LOG_TYPE_DEBUG);
 
+    //get tmp log directory
+    tmpLogDir = startup::StartUp::tmpDir();
+
     //
     //start a thread to ping all system modules
     //
@@ -475,10 +480,6 @@ static void messageThread(Configuration config)
         string port = sysConfig->getConfig("ProcMgr", "Port");
         string cmd = "fuser -k " + port + "/tcp >/dev/null 2>&1";
 
-        if ( !rootUser)
-            cmd = "sudo fuser -k " + port + "/tcp >/dev/null 2>&1";
-
-
         system(cmd.c_str());
     }
     catch (...)
@@ -563,9 +564,6 @@ static void alarmMessageThread(Configuration config)
         string port = sysConfig->getConfig("ProcMgr_Alarm", "Port");
         string cmd = "fuser -k " + port + "/tcp >/dev/null 2>&1";
 
-        if ( !rootUser)
-            cmd = "sudo fuser -k " + port + "/tcp >/dev/null 2>&1";
-
         system(cmd.c_str());
     }
     catch (...)
@@ -2270,18 +2268,7 @@ void pingDeviceThread()
                                             }
 
                                             // add module
-                                            string password = oam::UnassignedName;
-
-                                            try
-                                            {
-                                                oam.getSystemConfig("rpw", password);
-                                            }
-                                            catch (...)
-                                            {
-                                                password = oam::UnassignedName;
-                                            }
-
-                                            ret = processManager.addModule(devicenetworklist, password, false);
+					    ret = processManager.addModule(devicenetworklist, "ssh", false);
 
                                             if ( ret != oam::API_SUCCESS )
                                             {
diff --git a/procmgr/processmanager.cpp b/procmgr/processmanager.cpp
index b3aa195b9..3203c67b2 100644
--- a/procmgr/processmanager.cpp
+++ b/procmgr/processmanager.cpp
@@ -56,6 +56,7 @@ extern bool HDFS;
 extern string localHostName;
 extern string PMwithUM;
 extern string AmazonPMFailover;
+extern string tmpLogDir;
 
 typedef   map<string, int>	moduleList;
 extern moduleList moduleInfoList;
@@ -673,8 +674,8 @@ void processMSG(messageqcpp::IOSocket* cfIos)
 							processManager.recycleProcess(target, true);
 
 							//distribute config file
-							processManager.distributeConfigFile("system");	
-		
+							processManager.distributeConfigFile("system");
+
 							//set query system state ready
 							processManager.setQuerySystemState(true);
 
@@ -916,7 +917,7 @@ void processMSG(messageqcpp::IOSocket* cfIos)
 
                                 //check for SIMPLEX Processes on mate might need to be started
                                 processManager.checkSimplexModule(moduleName);
-								
+
 								processManager.setSystemState(oam::ACTIVE);
 
 								//set query system state ready
@@ -1015,7 +1016,7 @@ void processMSG(messageqcpp::IOSocket* cfIos)
                             {
 								processManager.stopModule(moduleName, graceful, manualFlag);
 								log.writeLog(__LINE__, "stop Module Completed on " + moduleName, LOG_TYPE_INFO);
-								
+
                                 status = processManager.enableModule(moduleName, oam::MAN_OFFLINE);
                                 log.writeLog(__LINE__, "Enable Module Completed on " + moduleName, LOG_TYPE_INFO);
                             }
@@ -1333,7 +1334,7 @@ void processMSG(messageqcpp::IOSocket* cfIos)
                             //now stop local module
                             processManager.stopModule(config.moduleName(), graceful, manualFlag );
 
-                            //run save.brm script
+                            //run save brm script
                             processManager.saveBRM(false);
 
                             log.writeLog(__LINE__, "Stop System Completed Success", LOG_TYPE_INFO);
@@ -1501,6 +1502,15 @@ void processMSG(messageqcpp::IOSocket* cfIos)
                     cmd = "touch " + startup::StartUp::installDir() + "/local/moveDbrootTransactionLog";
                     system(cmd.c_str());
 
+					//clear shared memory
+					cmd = startup::StartUp::installDir() + "/bin/clearShm > /dev/null 2>&1";
+					int rtnCode = system(cmd.c_str());
+
+					if (WEXITSTATUS(rtnCode) != 1)
+						log.writeLog(__LINE__, "Successfully ran DBRM clearShm", LOG_TYPE_DEBUG);
+					else
+						log.writeLog(__LINE__, "Error running DBRM clearShm", LOG_TYPE_ERROR);
+						
                     // now do local module
                     processManager.shutdownModule(config.moduleName(), graceful, manualFlag);
 
@@ -1782,7 +1792,7 @@ void processMSG(messageqcpp::IOSocket* cfIos)
 							pthread_join(startsystemthread, NULL);
 							status = startsystemthreadStatus;
                         }
-						
+
 						// setup MySQL Replication after FORCE restart command
 						if ( (status == API_SUCCESS) &&
 							 (graceful == oam::FORCEFUL) )
@@ -2724,7 +2734,7 @@ void processMSG(messageqcpp::IOSocket* cfIos)
                     // Save the BRM. This command presages a system backup. Best to have a current BRM on disk
                     string logdir("/var/log/mariadb/columnstore");
 
-                    if (access(logdir.c_str(), W_OK) != 0) logdir = "/tmp";
+                    if (access(logdir.c_str(), W_OK) != 0) logdir = tmpLogDir;
 
                     string cmd = startup::StartUp::installDir() + "/bin/save_brm  > " + logdir + "/save_brm.log1 2>&1";
                     int rtnCode = system(cmd.c_str());
@@ -3761,7 +3771,7 @@ void ProcessManager::recycleProcess(string module, bool enableModule)
 	stopProcessType("WriteEngineServer");
 
 	stopProcessType("ExeMgr");
-	
+
 	stopProcessType("PrimProc");
 
 	stopProcessType("DBRMControllerNode");
@@ -3773,13 +3783,13 @@ void ProcessManager::recycleProcess(string module, bool enableModule)
 	stopProcessType("mysqld");
 
 //	restartProcessType("mysqld");
-	
+
 	startProcessType("DBRMControllerNode");
 	startProcessType("DBRMWorkerNode");
 
 	startProcessType("PrimProc");
 	sleep(5);
-	
+
 	startProcessType("WriteEngineServer");
 	sleep(3);
 
@@ -3839,7 +3849,7 @@ int ProcessManager::enableModule(string target, int state, bool failover)
 
     if ( newStandbyModule == target)
         setStandbyModule(newStandbyModule);
-	
+
     log.writeLog(__LINE__, "enableModule request for " + target + " completed", LOG_TYPE_DEBUG);
 
     return API_SUCCESS;
@@ -4151,7 +4161,7 @@ void ProcessManager::setSystemState(uint16_t state)
     if( state == oam::ACTIVE ) {
 		//set query system states ready
 		processManager.setQuerySystemState(true);
-		
+
         //clear alarms if set
         aManager.sendAlarmReport(system.c_str(), SYSTEM_DOWN_AUTO, CLEAR);
         aManager.sendAlarmReport(system.c_str(), SYSTEM_DOWN_MANUAL, CLEAR);
@@ -4693,7 +4703,7 @@ int ProcessManager::restartProcessType( std::string processName, std::string ski
 
 					if ( systemprocessstatus.processstatus[i].ProcessOpState != oam::ACTIVE )
                         continue;
-						
+
                     if ( (processName.find("DDLProc") == 0 || processName.find("DMLProc") == 0) )
                     {
                         string procModuleType = systemprocessstatus.processstatus[i].Module.substr(0, MAX_MODULE_TYPE_SIZE);
@@ -4961,7 +4971,7 @@ int ProcessManager::addModule(oam::DeviceNetworkList devicenetworklist, std::str
     //clear out the known_host file, sometimes causes a failure on amazon during addModule
     if ( amazon )
     {
-        string cmd = "sudo unlink " + homedir + ".ssh/know_hosts > /dev/null 2>&1";
+        string cmd = "unlink " + homedir + ".ssh/know_hosts > /dev/null 2>&1";
         system(cmd.c_str());
     }
 
@@ -4991,24 +5001,6 @@ int ProcessManager::addModule(oam::DeviceNetworkList devicenetworklist, std::str
         // Verify Host IP and Password
         //
 
-        if ( password == "ssh" && amazon )
-        {
-            // check if there is a root password stored
-            string rpw = oam::UnassignedName;
-
-            try
-            {
-                oam.getSystemConfig("rpw", rpw);
-            }
-            catch (...)
-            {
-                rpw = "mariadb1";
-            }
-
-            if (rpw != oam::UnassignedName)
-                password = rpw;
-        }
-
         listPT = devicenetworklist.begin();
 
         for ( ; listPT != devicenetworklist.end() ; listPT++)
@@ -5124,10 +5116,10 @@ int ProcessManager::addModule(oam::DeviceNetworkList devicenetworklist, std::str
                 }
 
                 //wait until login is success until continuing or fail if can't login
-                log.writeLog(__LINE__, "addModule - Successfully Launch of new Instance, retry login test: " + moduleName, LOG_TYPE_DEBUG);
+                log.writeLog(__LINE__, "addModule - Successfully Launch of new Instance, perform login test: " + moduleName, LOG_TYPE_DEBUG);
                 int retry = 0;
 
-                for (  ; retry < 18 ; retry++)
+                for (  ; retry < 30 ; retry++)
                 {
                     IPAddr = oam.getEC2InstanceIpAddress(hostName);
 
@@ -5140,33 +5132,33 @@ int ProcessManager::addModule(oam::DeviceNetworkList devicenetworklist, std::str
 
                     if (IPAddr == "stopped")
                     {
-                        sleep(10);
+                        sleep(5);
                         continue;
                     }
 
-                    string cmd = installDir + "/bin/remote_command.sh " + IPAddr + " " + password + " 'ls' 1  > /tmp/login_test.log";
-                    system(cmd.c_str());
+					string loginTmp = tmpLogDir + "/login_test.log";
+                    string cmd = installDir + "/bin/remote_command.sh " + IPAddr + " " + password + " 'ls' 1  > " + loginTmp;
+                    int rtnCode = system(cmd.c_str());
 
-                    if (!oam.checkLogStatus("/tmp/login_test.log", "README"))
-                    {
+					if (!oam.checkLogStatus(loginTmp, "README")) {
                         //check for RSA KEY ISSUE and fix
-                        if (oam.checkLogStatus("/tmp/login_test.log", "Offending"))
+                        if (oam.checkLogStatus(loginTmp, "Host key verification failed"))
                         {
-                            log.writeLog(__LINE__, "addModule - login failed, Offending key issue, try fixing: " + moduleName, LOG_TYPE_DEBUG);
-                            string file = "/tmp/login_test.log";
-                            oam.fixRSAkey(file);
+                            log.writeLog(__LINE__, "addModule - login failed, Host key verification failed, try fixing: " + moduleName, LOG_TYPE_DEBUG);
+                            cmd = "rm -f " + homedir + "/.ssh/known_hosts";
+                            system(cmd.c_str());
                         }
 
-                        log.writeLog(__LINE__, "addModule - login failed, retry login test: " + moduleName, LOG_TYPE_DEBUG);
-                        sleep(10);
-                        continue;
-                    }
+						log.writeLog(__LINE__, "addModule - login failed, retry login test: " + moduleName, LOG_TYPE_DEBUG);
+						sleep(5);
+						continue;
+					}
 
                     // logged in
                     break;
                 }
 
-                if ( retry >= 18 )
+                if ( retry >= 30 )
                 {
                     log.writeLog(__LINE__, "addModule - Failed to log in to Instance: " + hostName, LOG_TYPE_ERROR);
                     pthread_mutex_unlock(&THREAD_LOCK);
@@ -5558,19 +5550,6 @@ int ProcessManager::addModule(oam::DeviceNetworkList devicenetworklist, std::str
                     setStandbyModule(remoteModuleName, false);
             }
 
-            //set root password
-            if (amazon)
-            {
-                cmd = startup::StartUp::installDir() + "/bin/remote_command.sh " + remoteModuleIP + " " + password + " '/root/.scripts/updatePassword.sh " + password + "' > /tmp/password_change.log";
-                log.writeLog(__LINE__, "addModule - cmd: " + cmd, LOG_TYPE_DEBUG);
-                int rtnCode = system(cmd.c_str());
-
-                if (WEXITSTATUS(rtnCode) == 0)
-                    log.writeLog(__LINE__, "addModule - update root password: " + remoteModuleName, LOG_TYPE_DEBUG);
-                else
-                    log.writeLog(__LINE__, "addModule - ERROR: update root password: " + remoteModuleName, LOG_TYPE_DEBUG);
-            }
-
             //default
             string binaryInstallDir = installDir;
 
@@ -5582,7 +5561,7 @@ int ProcessManager::addModule(oam::DeviceNetworkList devicenetworklist, std::str
                 //run remote installer script
                 if ( packageType != "binary" )
                 {
-                    string logFile = "/tmp/" + remoteModuleName + "_user_installer.log";
+                    string logFile = tmpLogDir + "/" + remoteModuleName + "_user_installer.log";
                     log.writeLog(__LINE__, "addModule - user_installer run for " +  remoteModuleName, LOG_TYPE_DEBUG);
 
                     string cmd = installDir + "/bin/package_installer.sh " + remoteModuleName + " " + remoteModuleIP + " " + password + " " + version + " initial " + AmazonInstall + " " + packageType + " --nodeps 1 > " + logFile;
@@ -5653,7 +5632,7 @@ int ProcessManager::addModule(oam::DeviceNetworkList devicenetworklist, std::str
                 else
                 {
                     // do a binary package install
-                    string logFile = "/tmp/" + remoteModuleName + "_binary_installer.log";
+                    string logFile = tmpLogDir + "/" + remoteModuleName + "_binary_installer.log";
                     log.writeLog(__LINE__, "addModule - binary_installer run for " +  remoteModuleName, LOG_TYPE_DEBUG);
 
                     string binservertype = oam.itoa(config.ServerInstallType());
@@ -5733,7 +5712,7 @@ int ProcessManager::addModule(oam::DeviceNetworkList devicenetworklist, std::str
                 {
                     if ( packageType != "binary" )
                     {
-                        string logFile = "/tmp/" + remoteModuleName + "_package_installer.log";
+                        string logFile = tmpLogDir + "/" + remoteModuleName + "_package_installer.log";
                         log.writeLog(__LINE__, "addModule - package_installer run for " +  remoteModuleName, LOG_TYPE_DEBUG);
                         string cmd = installDir + "/bin/package_installer.sh " + remoteModuleName + " " + remoteModuleIP + " " + password + " " + version + " initial " + AmazonInstall + " " + packageType + + " --nodeps 1 > " + logFile;
                         log.writeLog(__LINE__, "addModule cmd: " + cmd, LOG_TYPE_DEBUG);
@@ -5802,7 +5781,7 @@ int ProcessManager::addModule(oam::DeviceNetworkList devicenetworklist, std::str
                     else
                     {
                         // do a binary package install
-                        string logFile = "/tmp/" + remoteModuleName + "_binary_installer.log";
+                        string logFile = tmpLogDir + "/" + remoteModuleName + "_binary_installer.log";
                         log.writeLog(__LINE__, "addModule - binary_installer run for " +  remoteModuleName, LOG_TYPE_DEBUG);
 
                         string binservertype = oam.itoa(config.ServerInstallType());
@@ -6338,7 +6317,7 @@ int ProcessManager::removeModule(oam::DeviceNetworkList devicenetworklist, bool
                 homedir = p;
         }
 
-        string cmd = "sudo unlink " + homedir + ".ssh/know_hosts > /dev/null 2>&1";
+        string cmd = "unlink " + homedir + ".ssh/know_hosts > /dev/null 2>&1";
         system(cmd.c_str());
     }
 
@@ -7048,7 +7027,7 @@ void ProcessManager::saveBRM(bool skipSession, bool clearshm)
     Oam oam;
     string logdir("/var/log/mariadb/columnstore");
 
-    if (access(logdir.c_str(), W_OK) != 0) logdir = "/tmp";
+    if (access(logdir.c_str(), W_OK) != 0) logdir = tmpLogDir;
 
     log.writeLog(__LINE__, "Running reset_locks", LOG_TYPE_DEBUG);
 
@@ -7739,7 +7718,7 @@ void startSystemThread(oam::DeviceNetworkList Devicenetworklist)
 		// wait some more
 				sleep(2);
 		}
-        
+
         if ( rtn = oam::ACTIVE )
 			//set query system state not ready
 			processManager.setQuerySystemState(true);
@@ -8282,7 +8261,7 @@ void ProcessManager::checkSimplexModule(std::string moduleName)
 												if ( systemprocessconfig.processconfig[j].ProcessName == "DDLProc")
 												{
 													setPMProcIPs((*pt).DeviceName);
-													
+
 													log.writeLog(__LINE__, "Set Primary UM Module = " + (*pt).DeviceName, LOG_TYPE_DEBUG);
 
                                                     oam.setSystemConfig("PrimaryUMModuleName", (*pt).DeviceName);
@@ -8301,7 +8280,7 @@ void ProcessManager::checkSimplexModule(std::string moduleName)
                                                     log.writeLog(__LINE__, "checkSimplexModule: mate process started: " + (*pt).DeviceName + "/" + systemprocessconfig.processconfig[j].ProcessName, LOG_TYPE_DEBUG);
 
 													status = processManager.startProcess((*pt).DeviceName,
-																		"DMLProc", 
+																		"DMLProc",
 																		FORCEFUL);
 													if ( status == API_SUCCESS ) {
 														log.writeLog(__LINE__, "checkSimplexModule: mate process started: " + (*pt).DeviceName + "/DMLProc", LOG_TYPE_DEBUG);
@@ -11121,23 +11100,24 @@ int ProcessManager::mountDBRoot(std::string dbrootID)
     //send msg to ProcMon if not local module
     if ( config.moduleName() == moduleName )
     {
-        string cmd = "export LC_ALL=C;mount " + startup::StartUp::installDir() + "/data" + dbrootID + " > /tmp/mount.txt";
+		string tmpMount = tmpLogDir + "/mount.log";
+        string cmd = "export LC_ALL=C;mount " + startup::StartUp::installDir() + "/data" + dbrootID + " > " + tmpMount;
         system(cmd.c_str());
 
         if ( !rootUser)
         {
-            cmd = "sudo chown -R " + USER + ":" + USER + " " + startup::StartUp::installDir() + "/data" + dbrootID + " > /dev/null";
+            cmd = "chown -R " + USER + ":" + USER + " " + startup::StartUp::installDir() + "/data" + dbrootID + " > /dev/null";
             system(cmd.c_str());
         }
 
-        ifstream in("/tmp/mount.txt");
+        ifstream in(tmpMount.c_str());
 
         in.seekg(0, std::ios::end);
         int size = in.tellg();
 
         if ( size != 0 )
         {
-            if (!oam.checkLogStatus("/tmp/mount.txt", "already"))
+            if (!oam.checkLogStatus(tmpMount, "already"))
             {
                 log.writeLog(__LINE__, "mount failed, dbroot: " + dbrootID);
                 return API_FAILURE;
diff --git a/procmon/main.cpp b/procmon/main.cpp
index 4ff8500ce..0d2d2ab4a 100644
--- a/procmon/main.cpp
+++ b/procmon/main.cpp
@@ -61,13 +61,52 @@ bool mainResumeFlag;
 string USER = "root";
 string PMwithUM = "n";
 bool startProcMon = false;
-
+string tmpLogDir;
+string SUDO = "";
 
 //extern std::string gOAMParentModuleName;
 extern bool gOAMParentModuleFlag;
 
 pthread_mutex_t STATUS_LOCK;
 
+bool getshm(const string &name, int size, bi::shared_memory_object &target) {
+    MonitorLog log;
+    bool created = false;
+    try
+    {
+        bi::permissions perms;
+        perms.set_unrestricted();
+        bi::shared_memory_object shm(bi::create_only, name.c_str(), bi::read_write, perms);
+        created = true;
+        shm.truncate(size);
+        target.swap(shm);
+    }
+    catch (bi::interprocess_exception& biex)
+    {
+        if (biex.get_error_code() == bi::already_exists_error) {
+            try {
+                bi::shared_memory_object shm(bi::open_only, name.c_str(), bi::read_write);
+                target.swap(shm);
+            }
+            catch (exception &e) {
+                ostringstream os;
+                os << "ProcMon failed to attach to the " << name << " shared mem segment, got " << e.what();
+                log.writeLog(__LINE__, os.str(), LOG_TYPE_CRITICAL);
+                exit(1);
+            }
+        }
+        else {
+            ostringstream os;
+            os << "ProcMon failed to create the '" << name << "' shared mem segment, got " << biex.what() << ".";
+            os << "  Check the permissions on /dev/shm; should be 1777";
+            log.writeLog(__LINE__, os.str(), LOG_TYPE_CRITICAL);
+            exit(1);
+        }
+    }
+    return created;
+}
+
+
 /******************************************************************************************
 * @brief	main
 *
@@ -126,9 +165,12 @@ int main(int argc, char** argv)
     int user;
     user = getuid();
 
-    if (user != 0)
+    if (user != 0) 
+	{
         rootUser = false;
-
+		SUDO = "sudo ";
+	}
+	
     char* p = getenv("USER");
 
     if (p && *p)
@@ -139,6 +181,12 @@ int main(int argc, char** argv)
 
     setlocale(LC_ALL, systemLang.c_str());
 
+    //get tmp log directory
+    tmpLogDir = startup::StartUp::tmpDir();
+    
+    string cmd = "mkdir -p " + tmpLogDir;
+    system(cmd.c_str());
+
     // create message thread
     pthread_t MessageThread;
     int ret = pthread_create (&MessageThread, NULL, (void* (*)(void*)) &messageThread, &config);
@@ -194,9 +242,16 @@ int main(int argc, char** argv)
         }
 
         string modType = config.moduleType();
+        
+        string mysqlpw = oam.getMySQLPassword();
+
+		string passwordOption = "";
+		if ( mysqlpw != oam::UnassignedName )
+			passwordOption = " --password=" + mysqlpw;
+
 
         //run the module install script
-        string cmd = startup::StartUp::installDir() + "/bin/module_installer.sh " + " --installdir=" + startup::StartUp::installDir() + " --module=" + modType + " > /tmp/module_installer.log 2>&1";
+        string cmd = startup::StartUp::installDir() + "/bin/module_installer.sh " + " --installdir=" + startup::StartUp::installDir() + " --module=" + modType + " " + passwordOption + " > " + tmpLogDir + "/module_installer.log 2>&1";
         log.writeLog(__LINE__, "run module_installer.sh", LOG_TYPE_DEBUG);
         log.writeLog(__LINE__, cmd, LOG_TYPE_DEBUG);
 
@@ -342,8 +397,9 @@ int main(int argc, char** argv)
                 //Set the alarm
 		//		aMonitor.sendAlarm(config.moduleName().c_str(), STARTUP_DIAGNOTICS_FAILURE, SET);
 		//		sleep (1);
-				
+
                 string cmd = startup::StartUp::installDir() + "/bin/infinidb stop > /dev/null 2>&1";
+
                 system(cmd.c_str());
             }
 
@@ -437,7 +493,7 @@ int main(int argc, char** argv)
                     }
                     catch (...)
                     {
-                        log.writeLog(__LINE__, "wating for good return from getModuleStatus", LOG_TYPE_DEBUG);
+                        log.writeLog(__LINE__, "waiting for good return from getModuleStatus", LOG_TYPE_DEBUG);
                         sleep (1);
                     }
                 }
@@ -553,6 +609,7 @@ int main(int argc, char** argv)
         if ( retry == 20 )
         {
             log.writeLog(__LINE__, "Check DB mounts failed, shutting down", LOG_TYPE_CRITICAL);
+
             //Set the alarm
 		//	aMonitor.sendAlarm(config.moduleName().c_str(), STARTUP_DIAGNOTICS_FAILURE, SET);
 		//	sleep (1);
@@ -582,7 +639,7 @@ int main(int argc, char** argv)
 
         while (!mainResumeFlag)
         {
-            log.writeLog(__LINE__, "WATING FOR mainResumeFlag to be set", LOG_TYPE_DEBUG);
+            log.writeLog(__LINE__, "WAITING FOR mainResumeFlag to be set", LOG_TYPE_DEBUG);
 
             sleep(1);
         }
@@ -1131,9 +1188,6 @@ static void messageThread(MonitorConfig config)
 
     string cmd = "fuser -k " + port + "/tcp >/dev/null 2>&1";
 
-    if ( !rootUser)
-        cmd = "sudo fuser -k " + port + "/tcp >/dev/null 2>&1";
-
     system(cmd.c_str());
 
     for (;;)
@@ -1887,6 +1941,9 @@ static void statusControlThread()
     //
     //Allocate Shared Memory for storing Process Status Data
     //
+
+    string shmLocation = "/dev/shm/";
+
     PROCSTATshmsize = MAX_PROCESS * sizeof(shmProcessStatus);
     bool memInit = true;
 #if 0
@@ -1908,35 +1965,7 @@ static void statusControlThread()
     fShmProcessStatus = static_cast<struct shmProcessStatus*>(shmat(shmid, NULL, 0));
 #endif
     string keyName = BRM::ShmKeys::keyToName(fShmKeys.PROCESSSTATUS_SYSVKEY);
-
-    try
-    {
-#if BOOST_VERSION < 104500
-        bi::shared_memory_object shm(bi::create_only, keyName.c_str(), bi::read_write);
-#ifdef __linux__
-        {
-            string pname = "/dev/shm/" + keyName;
-            chmod(pname.c_str(), 0666);
-        }
-#endif
-#else
-        bi::permissions perms;
-        perms.set_unrestricted();
-        bi::shared_memory_object shm(bi::create_only, keyName.c_str(), bi::read_write, perms);
-#endif
-        shm.truncate(PROCSTATshmsize);
-        fProcStatShmobj.swap(shm);
-    }
-    catch (bi::interprocess_exception& biex)
-    {
-        memInit = false;
-        bi::shared_memory_object shm(bi::open_only, keyName.c_str(), bi::read_write);
-        fProcStatShmobj.swap(shm);
-    }
-    catch (...)
-    {
-        throw;
-    }
+    memInit = getshm(keyName, PROCSTATshmsize, fProcStatShmobj);
 
     bi::mapped_region region(fProcStatShmobj, bi::read_write);
     fProcStatMapreg.swap(region);
@@ -1987,29 +2016,7 @@ static void statusControlThread()
     fShmSystemStatus = static_cast<struct shmDeviceStatus*>(shmat(shmid, NULL, 0));
 #endif
     keyName = BRM::ShmKeys::keyToName(fShmKeys.SYSTEMSTATUS_SYSVKEY);
-
-    try
-    {
-        bi::shared_memory_object shm(bi::create_only, keyName.c_str(), bi::read_write);
-#ifdef __linux__
-        {
-            string pname = "/dev/shm/" + keyName;
-            chmod(pname.c_str(), 0666);
-        }
-#endif
-        shm.truncate(SYSTEMSTATshmsize);
-        fSysStatShmobj.swap(shm);
-    }
-    catch (bi::interprocess_exception& biex)
-    {
-        memInit = false;
-        bi::shared_memory_object shm(bi::open_only, keyName.c_str(), bi::read_write);
-        fSysStatShmobj.swap(shm);
-    }
-    catch (...)
-    {
-        throw;
-    }
+    memInit = getshm(keyName, SYSTEMSTATshmsize, fSysStatShmobj);
 
     bi::mapped_region region2(fSysStatShmobj, bi::read_write);
     fSysStatMapreg.swap(region2);
@@ -2086,49 +2093,9 @@ static void statusControlThread()
     //
     boost::interprocess::shared_memory_object fNICStatShmobj;
     static const int NICSTATshmsize = (MAX_MODULE * MAX_NIC) * sizeof(shmDeviceStatus);
-    memInit = true;
-#if 0
-    shmid = shmget(fShmKeys.NICSTATUS_SYSVKEY, NICSTATshmsize, IPC_EXCL | IPC_CREAT | 0666);
 
-    if (shmid == -1)
-    {
-        // table already exist
-        memInit = false;
-        shmid = shmget(fShmKeys.NICSTATUS_SYSVKEY, NICSTATshmsize, 0666);
-
-        if (shmid == -1)
-        {
-            log.writeLog(__LINE__, "*****NICStatusTable shmget failed.", LOG_TYPE_ERROR);
-            exit(1);
-        }
-    }
-
-    fShmNICStatus = static_cast<struct shmDeviceStatus*>(shmat(shmid, NULL, 0));
-#endif
     keyName = BRM::ShmKeys::keyToName(fShmKeys.NICSTATUS_SYSVKEY);
-
-    try
-    {
-        bi::shared_memory_object shm(bi::create_only, keyName.c_str(), bi::read_write);
-#ifdef __linux__
-        {
-            string pname = "/dev/shm/" + keyName;
-            chmod(pname.c_str(), 0666);
-        }
-#endif
-        shm.truncate(NICSTATshmsize);
-        fNICStatShmobj.swap(shm);
-    }
-    catch (bi::interprocess_exception& biex)
-    {
-        memInit = false;
-        bi::shared_memory_object shm(bi::open_only, keyName.c_str(), bi::read_write);
-        fNICStatShmobj.swap(shm);
-    }
-    catch (...)
-    {
-        throw;
-    }
+    memInit = getshm(keyName, NICSTATshmsize, fNICStatShmobj);
 
     bi::mapped_region fNICStatMapreg(fNICStatShmobj, bi::read_write);
     fShmNICStatus = static_cast<shmDeviceStatus*>(fNICStatMapreg.get_address());
@@ -2184,49 +2151,8 @@ static void statusControlThread()
 
     boost::interprocess::shared_memory_object fExtStatShmobj;
     static const int EXTDEVICESTATshmsize = MAX_EXT_DEVICE * sizeof(shmDeviceStatus);
-    memInit = true;
-#if 0
-    shmid = shmget(fShmKeys.SWITCHSTATUS_SYSVKEY, EXTDEVICESTATshmsize, IPC_EXCL | IPC_CREAT | 0666);
-
-    if (shmid == -1)
-    {
-        // table already exist
-        memInit = false;
-        shmid = shmget(fShmKeys.SWITCHSTATUS_SYSVKEY, EXTDEVICESTATshmsize, 0666);
-
-        if (shmid == -1)
-        {
-            log.writeLog(__LINE__, "*****ExtDeviceStatusTable shmget failed.", LOG_TYPE_ERROR);
-            exit(1);
-        }
-    }
-
-    fShmExtDeviceStatus = static_cast<struct shmDeviceStatus*>(shmat(shmid, NULL, 0));
-#endif
     keyName = BRM::ShmKeys::keyToName(fShmKeys.SWITCHSTATUS_SYSVKEY);
-
-    try
-    {
-        bi::shared_memory_object shm(bi::create_only, keyName.c_str(), bi::read_write);
-#ifdef __linux__
-        {
-            string pname = "/dev/shm/" + keyName;
-            chmod(pname.c_str(), 0666);
-        }
-#endif
-        shm.truncate(EXTDEVICESTATshmsize);
-        fExtStatShmobj.swap(shm);
-    }
-    catch (bi::interprocess_exception& biex)
-    {
-        memInit = false;
-        bi::shared_memory_object shm(bi::open_only, keyName.c_str(), bi::read_write);
-        fExtStatShmobj.swap(shm);
-    }
-    catch (...)
-    {
-        throw;
-    }
+    memInit = getshm(keyName, EXTDEVICESTATshmsize, fExtStatShmobj);
 
     bi::mapped_region fExtStatMapreg(fExtStatShmobj, bi::read_write);
     fShmExtDeviceStatus = static_cast<shmDeviceStatus*>(fExtStatMapreg.get_address());
@@ -2292,31 +2218,8 @@ static void statusControlThread()
 
     boost::interprocess::shared_memory_object fDbrootShmobj;
     static const int DBROOTSTATshmsize = MAX_DBROOT * sizeof(shmDeviceStatus);
-    memInit = true;
     keyName = BRM::ShmKeys::keyToName(fShmKeys.DBROOTSTATUS_SYSVKEY);
-
-    try
-    {
-        bi::shared_memory_object shm(bi::create_only, keyName.c_str(), bi::read_write);
-#ifdef __linux__
-        {
-            string pname = "/dev/shm/" + keyName;
-            chmod(pname.c_str(), 0666);
-        }
-#endif
-        shm.truncate(DBROOTSTATshmsize);
-        fDbrootShmobj.swap(shm);
-    }
-    catch (bi::interprocess_exception& biex)
-    {
-        memInit = false;
-        bi::shared_memory_object shm(bi::open_only, keyName.c_str(), bi::read_write);
-        fDbrootShmobj.swap(shm);
-    }
-    catch (...)
-    {
-        throw;
-    }
+    memInit = getshm(keyName, DBROOTSTATshmsize, fDbrootShmobj);
 
     bi::mapped_region fdDbrootStatMapreg(fDbrootShmobj, bi::read_write);
     fShmDbrootStatus = static_cast<shmDeviceStatus*>(fdDbrootStatMapreg.get_address());
@@ -2366,10 +2269,7 @@ static void statusControlThread()
         string port = sysConfig->getConfig(portName, "Port");
         string cmd = "fuser -k " + port + "/tcp >/dev/null 2>&1";
 
-        if ( !rootUser)
-            cmd = "sudo fuser -k " + port + "/tcp >/dev/null 2>&1";
-
-        system(cmd.c_str());
+	system(cmd.c_str());
     }
     catch (...)
     {
@@ -2407,6 +2307,7 @@ static void statusControlThread()
             log.writeLog(__LINE__, "statusControlThread Thread reading " + portName + " port", LOG_TYPE_DEBUG);
         }
 
+        fIos = NULL;
         try
         {
             //log.writeLog(__LINE__, "***before accept", LOG_TYPE_DEBUG);
@@ -2433,7 +2334,8 @@ static void statusControlThread()
         }
         catch (...)
         {
-            delete fIos;
+            if (fIos)
+                delete fIos;
         }
 
         if ( runStandby )
@@ -2698,6 +2600,23 @@ void processStatusMSG(messageqcpp::IOSocket* cfIos)
                 memcpy(fShmSystemStatus[0].StateChangeDate, oam.getCurrentTime().c_str(), DATESIZE);
                 log.writeLog(__LINE__, "statusControl: REQUEST RECEIVED: Set System State = " + oamState[state], LOG_TYPE_DEBUG);
             }
+
+            //if DMLProc set to ACTIVE, set system state to ACTIVE if in an INIT state
+            if ( processName == "DMLProc" && state == oam::ACTIVE )
+            {
+                if ( fShmSystemStatus[0].OpState == oam::BUSY_INIT ||
+                        fShmSystemStatus[0].OpState == oam::MAN_INIT ||
+                        fShmSystemStatus[0].OpState == oam::AUTO_INIT )
+                {
+                    fShmSystemStatus[0].OpState = state;
+                    memcpy(fShmSystemStatus[0].StateChangeDate, oam.getCurrentTime().c_str(), DATESIZE);
+                    log.writeLog(__LINE__, "statusControl: REQUEST RECEIVED: Set System State = " + oamState[state], LOG_TYPE_DEBUG);
+                }
+
+				BRM::DBRM dbrm;
+				dbrm.setSystemQueryReady(true);
+            }
+
         }
         break;
 
diff --git a/procmon/processmonitor.cpp b/procmon/processmonitor.cpp
index 701c6da2e..752961854 100644
--- a/procmon/processmonitor.cpp
+++ b/procmon/processmonitor.cpp
@@ -53,6 +53,8 @@ extern string USER;
 extern bool HDFS;
 extern string PMwithUM;
 extern bool startProcMon;
+extern string tmpLogDir;
+extern string SUDO;
 
 //std::string gOAMParentModuleName;
 bool gOAMParentModuleFlag;
@@ -908,7 +910,7 @@ void ProcessMonitor::processMessage(messageqcpp::ByteStream msg, messageqcpp::IO
                     {
                         string logdir("/var/log/mariadb/columnstore");
 
-                        if (access(logdir.c_str(), W_OK) != 0) logdir = "/tmp";
+                        if (access(logdir.c_str(), W_OK) != 0) logdir = tmpLogDir;
 
                         string cmd = startup::StartUp::installDir() + "/bin/reset_locks > " + logdir + "/reset_locks.log1 2>&1";
                         system(cmd.c_str());
@@ -1033,10 +1035,20 @@ void ProcessMonitor::processMessage(messageqcpp::ByteStream msg, messageqcpp::IO
                             cacheutils::dropPrimProcFdCache();
                             flushInodeCache();
 
-                            string cmd = "umount " + startup::StartUp::installDir() + "/data* -l > /dev/null 2>&1";
+							try
+							{
+								string DBRootStorageType = "internal";
+								oam.getSystemConfig("DBRootStorageType", DBRootStorageType);
 
-                            system(cmd.c_str());
-                            sleep(1);
+								if ( DBRootStorageType == "external" )
+								{
+									string cmd = SUDO + "umount " + startup::StartUp::installDir() + "/data* -l > /dev/null 2>&1";
+
+									system(cmd.c_str());
+									sleep(1);
+								}
+							}
+							catch (...) {}
 
                             system("rpm -e --nodeps $(rpm -qa | grep '^mariadb-columnstore')");
                             system("dpkg -P $(dpkg --get-selections | grep '^mariadb-columnstore')");
@@ -1058,6 +1070,7 @@ void ProcessMonitor::processMessage(messageqcpp::ByteStream msg, messageqcpp::IO
                     log.writeLog(__LINE__,  "MSG RECEIVED: Start All process request...");
 
                     //start the mysqld daemon
+
                     try
                     {
                         oam.actionMysqlCalpont(MYSQL_START);
@@ -1538,14 +1551,15 @@ void ProcessMonitor::processMessage(messageqcpp::ByteStream msg, messageqcpp::IO
             // install mysqld rpms if being reconfigured as a um
             if ( reconfigureModuleName.find("um") != string::npos )
             {
-                string cmd = startup::StartUp::installDir() + "/bin/post-mysqld-install >> /tmp/rpminstall";
+                string cmd = startup::StartUp::installDir() + "/bin/post-mysqld-install >> " + tmpLogDir + "/rpminstall";
                 system(cmd.c_str());
-                cmd = startup::StartUp::installDir() + "/bin/post-mysql-install >> /tmp/rpminstall";
+                cmd = startup::StartUp::installDir() + "/bin/post-mysql-install >> " + tmpLogDir + "/rpminstall";
                 system(cmd.c_str());
-                cmd = startup::StartUp::installDir() + "/mysql/mysql-Columnstore start > /tmp/mysqldstart";
+                cmd = startup::StartUp::installDir() + "/mysql/mysql-Columnstore start > " + tmpLogDir + "/mysqldstart";
                 system(cmd.c_str());
 
-                ifstream file ("/tmp/mysqldstart");
+				string tmpFile = tmpLogDir + "/mysqldstart";
+                ifstream file (tmpFile.c_str());
 
                 if (!file)
                 {
@@ -1706,27 +1720,23 @@ void ProcessMonitor::processMessage(messageqcpp::ByteStream msg, messageqcpp::IO
             break;
         }
 
+		case RUNUPGRADE:
+		{
+			log.writeLog(__LINE__,  "MSG RECEIVED: Run upgrade script ");
 
-        /*		case RUNUPGRADE:
-        		{
-        			log.writeLog(__LINE__,  "MSG RECEIVED: Run upgrade script ");
+			// run upgrade script
+			int ret = runUpgrade();
 
-        			string mysqlpw;
-        			msg >> mysqlpw;
+			ackMsg << (ByteStream::byte) ACK;
+			ackMsg << (ByteStream::byte) RUNUPGRADE;
+			ackMsg << (ByteStream::byte) ret;
+			mq.write(ackMsg);
 
-        			// run upgrade script
-        			int ret = runUpgrade(mysqlpw);
+			log.writeLog(__LINE__, "RUNUPGRADE: ACK back to ProcMgr return status = " + oam.itoa((int) ret));
 
-        			ackMsg << (ByteStream::byte) ACK;
-        			ackMsg << (ByteStream::byte) RUNUPGRADE;
-        			ackMsg << (ByteStream::byte) ret;
-        			mq.write(ackMsg);
-
-        			log.writeLog(__LINE__, "RUNUPGRADE: ACK back to ProcMgr return status = " + oam.itoa((int) ret));
-
-        			break;
-        		}
-        */
+			break;
+		}
+        
         case PROCUNMOUNT:
         {
             string dbrootID;
@@ -1745,31 +1755,22 @@ void ProcessMonitor::processMessage(messageqcpp::ByteStream msg, messageqcpp::IO
             {
                 int retry = 1;
 
+				string tmpUmount = tmpLogDir + "/umount.log";
                 for ( ; retry < 5 ; retry++)
                 {
-                    string cmd = "export LC_ALL=C;umount " + startup::StartUp::installDir() + "/data" + dbrootID + " > /tmp/umount.txt 2>&1";
+                    string cmd = "export LC_ALL=C;" + SUDO + "umount " + startup::StartUp::installDir() + "/data" + dbrootID + " > " + tmpUmount + " 2>&1";
 
                     system(cmd.c_str());
 
                     return_status = API_SUCCESS;
 
-                    if (!oam.checkLogStatus("/tmp/umount.txt", "busy"))
+                    if (!oam.checkLogStatus(tmpUmount, "busy"))
                         break;
 
-                    if ( rootUser)
-                    {
-                        cmd = "lsof " + startup::StartUp::installDir() + "/data" + dbrootID + " >> /tmp/umount.txt 2>&1";
-                        system(cmd.c_str());
-                        cmd = "fuser -muvf " + startup::StartUp::installDir() + "/data" + dbrootID + " >> /tmp/umount.txt 2>&1";
-                        system(cmd.c_str());
-                    }
-                    else
-                    {
-                        cmd = "sudo lsof " + startup::StartUp::installDir() + "/data" + dbrootID + " >> /tmp/umount.txt 2>&1";
-                        system(cmd.c_str());
-                        cmd = "sudo fuser -muvf " + startup::StartUp::installDir() + "/data" + dbrootID + " >> /tmp/umount.txt 2>&1";
-                        system(cmd.c_str());
-                    }
+					cmd = "lsof " + startup::StartUp::installDir() + "/data" + dbrootID + " >> " + tmpUmount + " 2>&1";
+					system(cmd.c_str());
+					cmd = "fuser -muvf " + startup::StartUp::installDir() + "/data" + dbrootID + " >> " + tmpUmount + " 2>&1";
+					system(cmd.c_str());
 
                     sleep(2);
                     //Flush the cache
@@ -1782,7 +1783,8 @@ void ProcessMonitor::processMessage(messageqcpp::ByteStream msg, messageqcpp::IO
                 {
                     log.writeLog(__LINE__, "unmount failed, device busy, DBRoot: " + dbrootID, LOG_TYPE_ERROR);
                     return_status = API_FAILURE;
-                    system("mv -f /tmp/umount.txt /tmp/umount_failed.txt");
+                    string cmd = "mv -f " + tmpUmount + " " + tmpUmount + "failed";
+                    system(cmd.c_str());
                 }
             }
             else
@@ -1823,28 +1825,30 @@ void ProcessMonitor::processMessage(messageqcpp::ByteStream msg, messageqcpp::IO
 
             if (DataRedundancyConfig == "n")
             {
-                string cmd = "export LC_ALL=C;mount " + startup::StartUp::installDir() + "/data" + dbrootID + " > /tmp/mount.txt 2>&1";
+				string tmpMount = tmpLogDir + "/mount.log";
+                string cmd = SUDO + "export LC_ALL=C;" + SUDO + "mount " + startup::StartUp::installDir() + "/data" + dbrootID + " > " + tmpMount  + "2>&1";
                 system(cmd.c_str());
 
-                if ( !rootUser)
+                if ( !rootUser )
                 {
-                    cmd = "sudo chown -R " + USER + ":" + USER + " " + startup::StartUp::installDir() + "/data" + dbrootID + " > /dev/null";
+                    cmd = SUDO + "chown -R " + USER + ":" + USER + " " + startup::StartUp::installDir() + "/data" + dbrootID + " > /dev/null 2>&1";
                     system(cmd.c_str());
                 }
 
                 return_status = API_SUCCESS;
-                ifstream in("/tmp/mount.txt");
+                ifstream in(tmpMount.c_str());
 
                 in.seekg(0, std::ios::end);
                 int size = in.tellg();
 
                 if ( size != 0 )
                 {
-                    if (!oam.checkLogStatus("/tmp/mount.txt", "already"))
+                    if (!oam.checkLogStatus(tmpMount, "already"))
                     {
                         log.writeLog(__LINE__, "mount failed, DBRoot: " + dbrootID, LOG_TYPE_ERROR);
                         return_status = API_FAILURE;
-                        system("mv -f /tmp/mount.txt /tmp/mount_failed.txt");
+						string cmd = "mv -f " + tmpMount + " " + tmpMount + "failed";
+						system(cmd.c_str());
                     }
                 }
             }
@@ -1870,15 +1874,10 @@ void ProcessMonitor::processMessage(messageqcpp::ByteStream msg, messageqcpp::IO
 
             if (WEXITSTATUS(status) != 0 )
             {
-                if ( rootUser)
-                {
-                    cmd = "echo " + entry + " >> /etc/fstab";
-                }
-                else
-                {
-                    cmd = "sudo echo " + entry + " >> /etc/fstab";
-                }
+				//chmod before update, used on amazon ami EBS. not other systems
+				system("sudo chmod 666 /etc/fstab");
 
+                cmd = "echo " + entry + " >> /etc/fstab";
                 system(cmd.c_str());
 
                 log.writeLog(__LINE__, "Add line entry to /etc/fstab : " + entry);
@@ -1890,14 +1889,7 @@ void ProcessMonitor::processMessage(messageqcpp::ByteStream msg, messageqcpp::IO
 
             if (WEXITSTATUS(status) != 0 )
             {
-                if ( rootUser)
-                {
-                    cmd = "echo " + entry + " >> " + startup::StartUp::installDir() + "/local/etc/pm1/fstab";
-                }
-                else
-                {
-                    cmd = "sudo echo " + entry + " >> " + startup::StartUp::installDir() + "/local/etc/pm1/fstab";
-                }
+                cmd = "echo " + entry + " >> " + startup::StartUp::installDir() + "/local/etc/pm1/fstab";
 
                 system(cmd.c_str());
 
@@ -1909,14 +1901,7 @@ void ProcessMonitor::processMessage(messageqcpp::ByteStream msg, messageqcpp::IO
             string::size_type pos1 = entry.find(" ", pos + 1);
             string directory = entry.substr(pos + 1, pos1 - pos);
 
-            if ( rootUser)
-            {
-                cmd = "mkdir " + directory;
-            }
-            else
-            {
-                cmd = "sudo mkdir " + directory;
-            }
+            cmd = "mkdir " + directory;
 
             system(cmd.c_str());
             log.writeLog(__LINE__, "create directory: " + directory);
@@ -2607,7 +2592,7 @@ pid_t ProcessMonitor::startProcess(string processModuleType, string processName,
 
                 string logdir("/var/log/mariadb/columnstore");
 
-                if (access(logdir.c_str(), W_OK) != 0) logdir = "/tmp";
+                if (access(logdir.c_str(), W_OK) != 0) logdir = tmpLogDir;
 
                 string cmd = startup::StartUp::installDir() + "/bin/reset_locks > " + logdir + "/reset_locks.log1 2>&1";
                 system(cmd.c_str());
@@ -2679,7 +2664,7 @@ pid_t ProcessMonitor::startProcess(string processModuleType, string processName,
 
     string logdir("/var/log/mariadb/columnstore");
 
-    if (access(logdir.c_str(), W_OK) != 0) logdir = "/tmp";
+    if (access(logdir.c_str(), W_OK) != 0) logdir = tmpLogDir;
 
     string outFileName = logdir + "/" + processName + ".out";
     string errFileName = logdir + "/" + processName + ".err";
@@ -2689,16 +2674,16 @@ pid_t ProcessMonitor::startProcess(string processModuleType, string processName,
 
     if ( LogFile == "off" )
     {
-        string cmd = "mv " + outFileName + " " + saveoutFileName;
+        string cmd = "mv " + outFileName + " " + saveoutFileName + " > /dev/null 2>&1";
         system(cmd.c_str());
-        cmd = "mv " + errFileName + " " + saveerrFileName;
+        cmd = "mv " + errFileName + " " + saveerrFileName + " > /dev/null 2>&1";
         system(cmd.c_str());
     }
     else
     {
-        string cmd = "mv " + outFileName + " " + saveoutFileName;
+        string cmd = "mv " + outFileName + " " + saveoutFileName + " > /dev/null 2>&1";
         system(cmd.c_str());
-        cmd = "mv " + errFileName + " " + saveerrFileName;
+        cmd = "mv " + errFileName + " " + saveerrFileName + " > /dev/null 2>&1";
         system(cmd.c_str());
     }
 
@@ -3128,7 +3113,7 @@ int ProcessMonitor::updateLog(std::string action, std::string level)
     //if non-root, change file permissions so we can update it
     if ( !rootUser)
     {
-        string cmd = "sudo chmod 666 " + fileName + " > /dev/null";
+        string cmd = "chmod 666 " + fileName + " > /dev/null 2>&1";
         system(cmd.c_str());
     }
 
@@ -3855,7 +3840,7 @@ int ProcessMonitor::buildSystemTables()
     {
         string logdir("/var/log/mariadb/columnstore");
 
-        if (access(logdir.c_str(), W_OK) != 0) logdir = "/tmp";
+        if (access(logdir.c_str(), W_OK) != 0) logdir = tmpLogDir;
 
         string cmd = startup::StartUp::installDir() + "/bin/dbbuilder 7 > " + logdir + "/dbbuilder.log &";
         system(cmd.c_str());
@@ -4708,7 +4693,7 @@ int ProcessMonitor::runStartupTest()
     //run startup test script
     string logdir("/var/log/mariadb/columnstore");
 
-    if (access(logdir.c_str(), W_OK) != 0) logdir = "/tmp";
+    if (access(logdir.c_str(), W_OK) != 0) logdir = tmpLogDir;
 
     string cmd = startup::StartUp::installDir() + "/bin/startupTests.sh > " + logdir + "/startupTests.log1 2>&1";
     system(cmd.c_str());
@@ -4777,7 +4762,7 @@ int ProcessMonitor::runHDFSTest()
 
     string logdir("/var/log/mariadb/columnstore");
 
-    if (access(logdir.c_str(), W_OK) != 0) logdir = "/tmp";
+    if (access(logdir.c_str(), W_OK) != 0) logdir = tmpLogDir;
 
     string hdfslog = logdir + "/hdfsCheck.log1";
 
@@ -4885,7 +4870,7 @@ std::string ProcessMonitor::sendMsgProcMon1( std::string module, ByteStream msg,
     string IPAddr = sysConfig->getConfig(msgPort, "IPAddr");
 
     string cmdLine = "ping ";
-    string cmdOption = " -c 1 -w 5 >> /dev/null";
+    string cmdOption = " -c 1 -w 5 >> /dev/null 2>&1";
     string cmd = cmdLine + IPAddr + cmdOption;
 
     if ( system(cmd.c_str()) != 0 )
@@ -4998,7 +4983,7 @@ void ProcessMonitor::checkModuleFailover( std::string processName)
 
 						oam::DeviceNetworkConfig devicenetworkconfig;
 						oam::DeviceNetworkList devicenetworklist;
-	
+
 						devicenetworkconfig.DeviceName = config.moduleName();
 						devicenetworklist.push_back(devicenetworkconfig);
 
@@ -5039,48 +5024,6 @@ void ProcessMonitor::checkModuleFailover( std::string processName)
     }
 }
 
-/******************************************************************************************
-* @brief	runUpgrade
-*
-* purpose:	run upgrade script
-*
-******************************************************************************************/
-/*int ProcessMonitor::runUpgrade(std::string mysqlpw)
-{
-	Oam oam;
-
-	for ( int i = 0 ; i < 10 ; i++ )
-	{
-		//run upgrade script
-		string cmd = startup::StartUp::installDir() + "/bin/upgrade-columnstore.sh doupgrade --password=" +
-			mysqlpw + " --installdir=" +  startup::StartUp::installDir() + "  > " + "/tmp/upgrade-columnstore.log 2>&1";
-		system(cmd.c_str());
-
-		cmd = "/tmp/upgrade-columnstore.log";
-		if (oam.checkLogStatus(cmd, "OK")) {
-			log.writeLog(__LINE__, "upgrade-columnstore.sh: Successful return", LOG_TYPE_DEBUG);
-			return oam::API_SUCCESS;
-		}
-		else {
-			if (oam.checkLogStatus(cmd, "ERROR 1045") ) {
-				log.writeLog(__LINE__, "upgrade-columnstore.sh: Missing Password error, return success", LOG_TYPE_DEBUG);
-				return oam::API_SUCCESS;
-			}
-
-			log.writeLog(__LINE__, "upgrade-columnstore.sh: Error return, check log /tmp/upgrade-status.log", LOG_TYPE_ERROR);
-			//restart mysqld and retry
-			try {
-				oam.actionMysqlCalpont(MYSQL_RESTART);
-			}
-			catch(...)
-			{}
-			sleep(1);
-		}
-	}
-	return oam::API_FAILURE;
-}
-*/
-
 /******************************************************************************************
 * @brief	changeMyCnf
 *
@@ -5217,15 +5160,9 @@ int ProcessMonitor::changeMyCnf(std::string type)
     // set owner and permission
     string cmd = "chmod 664 " + mycnfFile + " >/dev/null 2>&1";
 
-    if ( !rootUser)
-        cmd = "sudo chmod 644 " + mycnfFile + " >/dev/null 2>&1";
-
     system(cmd.c_str());
 
-    cmd = "chown mysql:mysql " + mycnfFile + " >/dev/null 2>&1";
-
-    if ( !rootUser)
-        cmd = "sudo chown mysql:mysql " + mycnfFile + " >/dev/null 2>&1";
+    cmd = "chown " + USER + ":" + USER + " " + mycnfFile + " >/dev/null 2>&1";
 
     system(cmd.c_str());
 
@@ -5269,13 +5206,13 @@ int ProcessMonitor::runMariaDBCommandLine(std::string command)
     if ( MySQLPort.empty() )
         MySQLPort = "3306";
 
-    string cmd = startup::StartUp::installDir() + "/bin/mariadb-command-line.sh --installdir=" + startup::StartUp::installDir() + " --command='" + command + "' --port=" + MySQLPort + "  > /tmp/mariadb-command-line.sh.log 2>&1";
+    string cmd = startup::StartUp::installDir() + "/bin/mariadb-command-line.sh --installdir=" + startup::StartUp::installDir() + " --command='" + command + "' --port=" + MySQLPort + " --tmpdir=" + tmpLogDir + " > " + tmpLogDir + "/mariadb-command-line.sh.log 2>&1";
 
     log.writeLog(__LINE__, "cmd = " + cmd, LOG_TYPE_DEBUG);
 
     system(cmd.c_str());
 
-    string logFile = "/tmp/mariadb-command-line.sh.log";
+    string logFile = tmpLogDir + "/mariadb-command-line.sh.log";
 
     if (oam.checkLogStatus(logFile, "ERROR 1045") )
     {
@@ -5291,7 +5228,7 @@ int ProcessMonitor::runMariaDBCommandLine(std::string command)
         }
         else
         {
-            log.writeLog(__LINE__, "mariadb-command-line.sh: Error return, check log /tmp/mariadb-command-line.sh.log", LOG_TYPE_ERROR);
+            log.writeLog(__LINE__, "mariadb-command-line.sh: Error return, check log " + tmpLogDir + "/mariadb-command-line.sh.log", LOG_TYPE_ERROR);
             return oam::API_FAILURE;
         }
     }
@@ -5379,8 +5316,8 @@ int ProcessMonitor::runMasterRep(std::string& masterLogFile, std::string& master
             {
                 string ipAddr = (*pt1).IPAddr;
 
-                string logFile = "/tmp/master-rep-columnstore-" + moduleName + ".log";
-                string cmd = startup::StartUp::installDir() + "/bin/master-rep-columnstore.sh --installdir=" + startup::StartUp::installDir() + " --hostIP=" + ipAddr + " --port=" + MySQLPort + "  > " + logFile + " 2>&1";
+                string logFile = tmpLogDir + "/master-rep-columnstore-" + moduleName + ".log";
+                string cmd = startup::StartUp::installDir() + "/bin/master-rep-columnstore.sh --installdir=" + startup::StartUp::installDir() + " --hostIP=" + ipAddr + " --port=" + MySQLPort + " --tmpdir=" + tmpLogDir + "  > " + logFile + " 2>&1";
                 log.writeLog(__LINE__, "cmd = " + cmd, LOG_TYPE_DEBUG);
 
                 system(cmd.c_str());
@@ -5418,13 +5355,14 @@ int ProcessMonitor::runMasterRep(std::string& masterLogFile, std::string& master
     //	File	Position	Binlog_Do_DB	Binlog_Ignore_DB
     //	mysql-bin.000006	2921
     //
-    // in log - /tmp/show-master-status.log
+    // in log - show-master-status.log
 
-    ifstream file ("/tmp/show-master-status.log");
+	string masterLog = tmpLogDir + "/show-master-status.log";
+    ifstream file (masterLog.c_str());
 
     if (!file)
     {
-        log.writeLog(__LINE__, "runMasterRep - show master status log file doesn't exist - /tmp/show-master-status.log", LOG_TYPE_ERROR);
+        log.writeLog(__LINE__, "runMasterRep - show master status log file doesn't exist - " + masterLog, LOG_TYPE_ERROR);
         return oam::API_FAILURE;
     }
     else
@@ -5469,7 +5407,7 @@ int ProcessMonitor::runMasterRep(std::string& masterLogFile, std::string& master
         file.close();
     }
 
-    log.writeLog(__LINE__, "runMasterRep - 'mysql-bin not found in log file - /tmp/show-master-status.log", LOG_TYPE_ERROR);
+    log.writeLog(__LINE__, "runMasterRep - 'mysql-bin not found in log file - " + masterLog, LOG_TYPE_ERROR);
 
     return oam::API_FAILURE;
 }
@@ -5521,14 +5459,14 @@ int ProcessMonitor::runSlaveRep(std::string& masterLogFile, std::string& masterL
 
     while (true)
     {
-        string cmd = startup::StartUp::installDir() + "/bin/slave-rep-columnstore.sh --installdir=" + startup::StartUp::installDir() + " --masteripaddr=" + masterIPAddress + " --masterlogfile=" + masterLogFile  + " --masterlogpos=" + masterLogPos + " --port=" + MySQLPort + "  >   /tmp/slave-rep-columnstore.log 2>&1";
+        string logFile = tmpLogDir + "/slave-rep-columnstore.log";
+
+        string cmd = startup::StartUp::installDir() + "/bin/slave-rep-columnstore.sh --installdir=" + startup::StartUp::installDir() + " --masteripaddr=" + masterIPAddress + " --masterlogfile=" + masterLogFile  + " --masterlogpos=" + masterLogPos + " --port=" + MySQLPort + " --tmpdir=" + tmpLogDir + "  > " + logFile + " 2>&1";
 
         log.writeLog(__LINE__, "cmd = " + cmd, LOG_TYPE_DEBUG);
 
         system(cmd.c_str());
 
-        string logFile = "/tmp/slave-rep-columnstore.log";
-
         if (oam.checkLogStatus(logFile, "ERROR 1045") )
         {
             if ( passwordError )
@@ -5549,7 +5487,7 @@ int ProcessMonitor::runSlaveRep(std::string& masterLogFile, std::string& masterL
             }
             else
             {
-                log.writeLog(__LINE__, "slave-rep-columnstore.sh: Error return, check log /tmp/slave-rep-columnstore.log", LOG_TYPE_ERROR);
+                log.writeLog(__LINE__, "slave-rep-columnstore.sh: Error return, check log " + logFile, LOG_TYPE_ERROR);
                 return oam::API_FAILURE;
             }
         }
@@ -5585,15 +5523,15 @@ int ProcessMonitor::runDisableRep()
     if ( MySQLPort.empty() )
         MySQLPort = "3306";
 
-    string cmd = startup::StartUp::installDir() + "/bin/disable-rep-columnstore.sh --installdir=" + startup::StartUp::installDir() + "  >   /tmp/disable-rep-columnstore.log 2>&1";
+    string logFile = tmpLogDir + "/disable-rep-columnstore.log";
+
+    string cmd = startup::StartUp::installDir() + "/bin/disable-rep-columnstore.sh --installdir=" + startup::StartUp::installDir() + " --tmpdir=" + tmpLogDir + "  >  " + logFile + " 2>&1";
 
     log.writeLog(__LINE__, "cmd = " + cmd, LOG_TYPE_DEBUG);
 
     system(cmd.c_str());
 
-    cmd = "/tmp/disable-rep-columnstore.log";
-
-    if (oam.checkLogStatus(cmd, "OK"))
+    if (oam.checkLogStatus(logFile, "OK"))
     {
         log.writeLog(__LINE__, "disable-rep-columnstore.sh: Successful return", LOG_TYPE_DEBUG);
         return oam::API_SUCCESS;
@@ -5606,7 +5544,7 @@ int ProcessMonitor::runDisableRep()
             return oam::API_SUCCESS;
         }
 
-        log.writeLog(__LINE__, "disable-rep-columnstore.sh: Error return, check log /tmp/disable-rep-columnstore.log", LOG_TYPE_ERROR);
+        log.writeLog(__LINE__, "disable-rep-columnstore.sh: Error return, check log " + logFile, LOG_TYPE_ERROR);
         return oam::API_FAILURE;
     }
 
@@ -5677,12 +5615,12 @@ int ProcessMonitor::runMasterDist(std::string& password, std::string& slaveModul
                 {
                     string ipAddr = (*pt1).IPAddr;
 
-                    string cmd = startup::StartUp::installDir() + "/bin/rsync.sh " + ipAddr + " " + password + " " + startup::StartUp::installDir() + " 1 > /tmp/master-dist_" + moduleName + ".log";
+                    string logFile = tmpLogDir + "/master-dist_" + moduleName + ".log";
+                    string cmd = startup::StartUp::installDir() + "/bin/rsync.sh " + ipAddr + " " + password + " " + startup::StartUp::installDir() + " 1 > " + logFile;
 
                     log.writeLog(__LINE__, "cmd = " + cmd, LOG_TYPE_DEBUG);
                     system(cmd.c_str());
 
-                    string logFile = "/tmp/master-dist_" + moduleName + ".log";
 
                     if (!oam.checkLogStatus(logFile, "FAILED"))
                     {
@@ -5716,10 +5654,10 @@ int ProcessMonitor::runMasterDist(std::string& password, std::string& slaveModul
             HostConfigList::iterator pt1 = moduleconfig.hostConfigList.begin();
             string ipAddr = (*pt1).IPAddr;
 
-            string cmd = startup::StartUp::installDir() + "/bin/rsync.sh " + ipAddr + " " + password + " " + startup::StartUp::installDir() + " 1 > /tmp/master-dist_" + slaveModule + ".log";
-            system(cmd.c_str());
+            string logFile = tmpLogDir + "/master-dist_" + slaveModule + ".log";
 
-            string logFile = "/tmp/master-dist_" + slaveModule + ".log";
+            string cmd = startup::StartUp::installDir() + "/bin/rsync.sh " + ipAddr + " " + password + " " + startup::StartUp::installDir() + " 1 > " + logFile;
+            system(cmd.c_str());
 
             if (!oam.checkLogStatus(logFile, "FAILED"))
                 log.writeLog(__LINE__, "runMasterDist: Success rsync to module: " + slaveModule, LOG_TYPE_DEBUG);
@@ -5752,7 +5690,8 @@ bool ProcessMonitor::amazonIPCheck()
     log.writeLog(__LINE__, "amazonIPCheck function called", LOG_TYPE_DEBUG);
 
     // delete description file so it will create a new one
-    unlink("/tmp/describeInstance.txt");
+    string tmpLog = tmpLogDir + "/describeInstance.log";
+    unlink(tmpLog.c_str());
 
     //
     // Get Module Info
@@ -5978,16 +5917,13 @@ bool ProcessMonitor::amazonVolumeCheck(int dbrootID)
         if ( status == "attached" )
         {
             string cmd;
-
-            if ( rootUser)
-                cmd = "mount " + deviceName + " " + startup::StartUp::installDir() + "/mysql/db -t ext2 -o defaults > /tmp/um_mount.log";
-            else
-                cmd = "sudo mount " + deviceName + " " + startup::StartUp::installDir() + "/mysql/db -t ext2 -o defaults > /tmp/um_mount.log";
+			string mountLog = tmpLogDir + "/um_mount.log";
+            cmd = SUDO + "mount " + deviceName + " " + startup::StartUp::installDir() + "/mysql/db -t ext2 -o noatime,nodiratime,user > " + mountLog;
 
             system(cmd.c_str());
             log.writeLog(__LINE__, "mount cmd: " + cmd, LOG_TYPE_DEBUG);
 
-            cmd = "chown mysql:mysql -R " + startup::StartUp::installDir() + "/mysql/db";
+            cmd = SUDO + "chown -R " + USER + ":" + USER + " " + startup::StartUp::installDir() + "/mysql/db";
             system(cmd.c_str());
 
             log.writeLog(__LINE__, "amazonVolumeCheck function successfully completed, volume attached: " + volumeName, LOG_TYPE_DEBUG);
@@ -6016,11 +5952,11 @@ bool ProcessMonitor::amazonVolumeCheck(int dbrootID)
 
             if (oam.attachEC2Volume(volumeName, deviceName, instanceName))
             {
-                string cmd = "mount " + deviceName + " " + startup::StartUp::installDir() + "/mysql/db -t ext2 -o defaults > /dev/null";
+                string cmd = SUDO + "mount " + deviceName + " " + startup::StartUp::installDir() + "/mysql/db -t ext2 -o noatime,nodiratime,user > /dev/null 2>&1";
                 system(cmd.c_str());
                 log.writeLog(__LINE__, "mount cmd: " + cmd, LOG_TYPE_DEBUG);
 
-                cmd = "chown mysql:mysql -R " + startup::StartUp::installDir() + "/mysql/db";
+                cmd = SUDO + "chown -R " + USER + ":" + USER + " " + startup::StartUp::installDir() + "/mysql/db";
                 system(cmd.c_str());
 
                 return true;
@@ -6089,9 +6025,14 @@ bool ProcessMonitor::amazonVolumeCheck(int dbrootID)
             {
 				log.writeLog(__LINE__, "amazonVolumeCheck function , volume to attached: " + volumeName, LOG_TYPE_DEBUG);
 
-                string cmd = "mount " + startup::StartUp::installDir() + "/data" + oam.itoa(dbrootID) + " > /dev/null";
+                string cmd = SUDO + "mount " + startup::StartUp::installDir() + "/data" + oam.itoa(dbrootID) + " > /dev/null";
+
                 system(cmd.c_str());
 				log.writeLog(__LINE__, "amazonVolumeCheck function , volume to mounted: " + volumeName, LOG_TYPE_DEBUG);
+
+                cmd = SUDO + "chown -R " + USER + ":" + USER + " " + startup::StartUp::installDir() + "/data" + oam.itoa(dbrootID);
+                system(cmd.c_str());
+
                 return true;
             }
             else
@@ -6171,7 +6112,7 @@ void ProcessMonitor::unmountExtraDBroots()
                 {
                     if ( DataRedundancyConfig == "n" )
                     {
-                        string cmd = "umount " + startup::StartUp::installDir() + "/data" + oam.itoa(id) + " > /dev/null 2>&1";
+                        string cmd = SUDO + "umount " + startup::StartUp::installDir() + "/data" + oam.itoa(id) + " > /dev/null 2>&1";
                         system(cmd.c_str());
                     }
                     else
@@ -6353,7 +6294,7 @@ int ProcessMonitor::checkDataMount()
         if ( DataRedundancyConfig == "n" )
         {
             //remove any local check flag for starters
-            string cmd = "umount " + dbroot + " > /tmp/umount.txt 2>&1";
+            string cmd = SUDO + "umount " + dbroot + " > " + tmpLogDir + "/umount.log 2>&1";
             system(cmd.c_str());
 
             unlink(fileName.c_str());
@@ -6366,17 +6307,18 @@ int ProcessMonitor::checkDataMount()
             if (WEXITSTATUS(status) != 0 )
             {
                 // not mounted, mount
-                cmd = "export LC_ALL=C;mount " + dbroot + " > /tmp/mount.txt 2>&1";
+                string mountLog = tmpLogDir + "/mount.log";
+                cmd = "export LC_ALL=C;" + SUDO + "mount " + dbroot + " > " + mountLog + " 2>&1";
                 system(cmd.c_str());
 
-                ifstream in("/tmp/mount.txt");
+                ifstream in(mountLog.c_str());
 
                 in.seekg(0, std::ios::end);
                 int size = in.tellg();
 
                 if ( size != 0 )
                 {
-                    if (!oam.checkLogStatus("/tmp/mount.txt", "already"))
+                    if (!oam.checkLogStatus(mountLog, "already"))
                     {
                         log.writeLog(__LINE__, "checkDataMount: mount failed, DBRoot: " + dbroot, LOG_TYPE_ERROR);
 
@@ -6394,7 +6336,7 @@ int ProcessMonitor::checkDataMount()
 
             if ( !rootUser)
             {
-                cmd = "sudo chown -R " + USER + ":" + USER + " " + dbroot + " > /dev/null";
+                cmd = SUDO + "chown -R " + USER + ":" + USER + " " + dbroot + " > /dev/null 2>&1";
                 system(cmd.c_str());
             }
 
@@ -6568,16 +6510,8 @@ int ProcessMonitor::glusterAssign(std::string dbrootID)
         moduleIPAddr = sysConfig->getConfig("SystemModuleConfig", dataDupIPaddr);
     }
 
-    if ( rootUser)
-    {
-        command = "mount -tglusterfs -odirect-io-mode=enable " + moduleIPAddr + ":/dbroot" +
-                  dbrootID + " " + startup::StartUp::installDir() + "/data" + dbrootID + " > /tmp/glusterAssign.txt 2>&1";
-    }
-    else
-    {
-        command = "sudo mount -tglusterfs -odirect-io-mode=enable " + moduleIPAddr + ":/dbroot" +
-                  dbrootID + " " + startup::StartUp::installDir() + "/data" + dbrootID + " > /tmp/glusterAssign.txt 2>&1";
-    }
+	string tmpLog = tmpLogDir + "/glusterAssign.log";
+    command = SUDO + "mount -tglusterfs -odirect-io-mode=enable " + moduleIPAddr + ":/dbroot" + dbrootID + " " + startup::StartUp::installDir() + "/data" + dbrootID + " > " + tmpLog + " 2>&1";
 
     int ret = system(command.c_str());
 
@@ -6585,16 +6519,17 @@ int ProcessMonitor::glusterAssign(std::string dbrootID)
     {
 		log.writeLog(__LINE__, "glusterAssign mount failure: dbroot: " + dbrootID + " error: " + oam.itoa(WEXITSTATUS(ret)), LOG_TYPE_ERROR);
 
-        ifstream in("/tmp/glusterAssign.txt");
+        ifstream in(tmpLog.c_str());
         in.seekg(0, std::ios::end);
         int size = in.tellg();
 
         if ( size != 0 )
         {
-            if (!oam.checkLogStatus("/tmp/glusterAssign.txt", "already"))
+            if (!oam.checkLogStatus(tmpLog, "already"))
             {
                 log.writeLog(__LINE__, "glusterAssign failed.", LOG_TYPE_ERROR);
-                system("mv -f /tmp/glusterAssign.txt /tmp/glusterAssign_failed.txt");
+                string cmd = "mv -f " + tmpLog + " " + tmpLog + "failed";
+                system(cmd.c_str());
                 return oam::API_FAILURE;
             }
         }
@@ -6619,14 +6554,9 @@ int ProcessMonitor::glusterUnassign(std::string dbrootID)
 
     log.writeLog(__LINE__, "glusterUnassign called: " + dbrootID, LOG_TYPE_DEBUG);
 
-    if ( rootUser)
-    {
-        command = "umount -f " + startup::StartUp::installDir() + "/data" + dbrootID + " > /tmp/glusterUnassign.txt 2>&1";
-    }
-    else
-    {
-        command = "sudo umount -f " + startup::StartUp::installDir() + "/data" + dbrootID + " > /tmp/glusterUnassign.txt 2>&1";
-    }
+	string tmpLog = tmpLogDir + "/glusterUnassign.log";
+
+    command = SUDO + "umount -f " + startup::StartUp::installDir() + "/data" + dbrootID + " > " + tmpLog + " 2>&1";
 
     int ret = system(command.c_str());
 
@@ -6634,16 +6564,18 @@ int ProcessMonitor::glusterUnassign(std::string dbrootID)
     {
 		log.writeLog(__LINE__, "glusterUnassign mount failure: dbroot: " + dbrootID + " error: " + oam.itoa(WEXITSTATUS(ret)), LOG_TYPE_ERROR);
 
-        ifstream in("/tmp/glusterUnassign.txt");
+        ifstream in(tmpLog.c_str());
         in.seekg(0, std::ios::end);
         int size = in.tellg();
 
         if ( size != 0 )
         {
-            if (!oam.checkLogStatus("/tmp/glusterUnassign.txt", "not mounted"))
+            if (!oam.checkLogStatus(tmpLog, "not mounted"))
             {
                 log.writeLog(__LINE__, "glusterUnassign failed.", LOG_TYPE_ERROR);
-                system("mv -f /tmp/glusterUnassign.txt /tmp/glusterUnassign_failed.txt");
+
+                string cmd = "mv -f " + tmpLog + " " + tmpLog + "failed";
+                system(cmd.c_str());
                 return oam::API_FAILURE;
             }
         }
@@ -6652,6 +6584,54 @@ int ProcessMonitor::glusterUnassign(std::string dbrootID)
     return oam::API_SUCCESS;
 }
 
+/******************************************************************************************
+* @brief	runUpgrade
+*
+* purpose:	run upgrade script
+*
+******************************************************************************************/
+int ProcessMonitor::runUpgrade()
+{
+	Oam oam;
+
+	string tmpLog = tmpLogDir + "/mysql_upgrade.log";
+
+	string mysqlpw = oam.getMySQLPassword();
+
+	string passwordOption = "";
+	if ( mysqlpw != oam::UnassignedName )
+		passwordOption = " --password=" + mysqlpw;
+
+	for ( int i = 0 ; i < 10 ; i++ )
+	{
+		//run upgrade script
+		string cmd = startup::StartUp::installDir() + "/mysql/bin/mysql_upgrade --defaults-file=" + startup::StartUp::installDir() + "/mysql/my.cnf " +
+			passwordOption + " > " + tmpLog + " 2>&1";
+
+		log.writeLog(__LINE__, "runUpgrade, cmd = " + cmd, LOG_TYPE_DEBUG);
+		int retCode = system(cmd.c_str());
+		if ( retCode == 0 ) {
+			log.writeLog(__LINE__, "mysql_upgrade.sh: Successful return", LOG_TYPE_DEBUG);
+			return oam::API_SUCCESS;
+		}
+		else {
+			if (oam.checkLogStatus(cmd, "ERROR 1045") ) {
+				log.writeLog(__LINE__, "mysql_upgrade.sh: Missing Password error, return success", LOG_TYPE_DEBUG);
+				return oam::API_SUCCESS;
+			}
+
+			log.writeLog(__LINE__, "mysql_upgrade.sh: Error return, check log " + tmpLog, LOG_TYPE_ERROR);
+			//restart mysqld and retry
+			try {
+				oam.actionMysqlCalpont(MYSQL_RESTART);
+			}
+			catch(...)
+			{}
+			sleep(1);
+		}
+	}
+	return oam::API_FAILURE;
+}
 
 
 } //end of namespace
diff --git a/procmon/processmonitor.h b/procmon/processmonitor.h
index 5ec131d42..e8c458006 100644
--- a/procmon/processmonitor.h
+++ b/procmon/processmonitor.h
@@ -493,7 +493,7 @@ public:
     /**
      *@brief run upgrade script
      */
-//	int runUpgrade(std::string mysqlpw);
+	int runUpgrade();
 
     /**
      *@brief change my.cnf
diff --git a/tools/clearShm/main.cpp b/tools/clearShm/main.cpp
index 02cc0a0cf..e883bc0f6 100644
--- a/tools/clearShm/main.cpp
+++ b/tools/clearShm/main.cpp
@@ -220,7 +220,6 @@ int main(int argc, char** argv)
         shmDoit(BrmKeys.PROCESSSTATUS_SYSVKEY, "PROC_STAT  ");
         shmDoit(BrmKeys.SYSTEMSTATUS_SYSVKEY,  "SYS_STAT   ");
         shmDoit(BrmKeys.SWITCHSTATUS_SYSVKEY,  "SW_STAT    ");
-        shmDoit(BrmKeys.STORAGESTATUS_SYSVKEY, "STORE_STAT ");
         shmDoit(BrmKeys.NICSTATUS_SYSVKEY,     "NIC_STAT   ");
         shmDoit(BrmKeys.DBROOTSTATUS_SYSVKEY,  "DBROOT_STAT");
     }
@@ -239,7 +238,6 @@ int main(int argc, char** argv)
         semDoit(BrmKeys.PROCESSSTATUS_SYSVKEY, "PROC_STAT  ");
         semDoit(BrmKeys.SYSTEMSTATUS_SYSVKEY,  "SYS_STAT   ");
         semDoit(BrmKeys.SWITCHSTATUS_SYSVKEY,  "SW_STAT    ");
-        semDoit(BrmKeys.STORAGESTATUS_SYSVKEY, "STORE_STAT ");
         semDoit(BrmKeys.NICSTATUS_SYSVKEY,     "NIC_STAT   ");
         shmDoit(BrmKeys.DBROOTSTATUS_SYSVKEY,  "DBROOT_STAT");
     }
diff --git a/tools/configMgt/autoConfigure.cpp b/tools/configMgt/autoConfigure.cpp
index 3de4e6de2..659192b6d 100644
--- a/tools/configMgt/autoConfigure.cpp
+++ b/tools/configMgt/autoConfigure.cpp
@@ -48,6 +48,8 @@
 
 #include "liboamcpp.h"
 #include "configcpp.h"
+#include "installdir.h"
+
 
 using namespace std;
 using namespace oam;
@@ -2034,13 +2036,11 @@ int main(int argc, char* argv[])
 
         if ( !AllowDiskBasedJoin.empty() )
         {
-            TempFilePath = sysConfigOld->getConfig("HashJoin", "TempFilePath");
             TempFileCompression = sysConfigOld->getConfig("HashJoin", "TempFileCompression");
 
             try
             {
                 sysConfigNew->setConfig("HashJoin", "AllowDiskBasedJoin", AllowDiskBasedJoin);
-                sysConfigNew->setConfig("HashJoin", "TempFilePath", TempFilePath);
                 sysConfigNew->setConfig("HashJoin", "TempFileCompression", TempFileCompression);
             }
             catch (...)
@@ -2116,6 +2116,26 @@ int main(int argc, char* argv[])
     catch (...)
     {}
 
+    try
+    {
+        string LockFileDirectory = sysConfigOld->getConfig("Installation", "LockFileDirectory");
+
+        if ( !LockFileDirectory.empty() )
+        {
+            try
+            {
+                sysConfigNew->setConfig("Installation", "LockFileDirectory", LockFileDirectory);
+            }
+            catch (...)
+            {
+                cout << "ERROR: Problem setting LockFileDirectory in the Calpont System Configuration file" << endl;
+                exit(-1);
+            }
+        }
+    }
+    catch (...)
+    {}
+    
     try
     {
         string DistributedInstall = sysConfigOld->getConfig("Installation", "DistributedInstall");
@@ -2136,6 +2156,7 @@ int main(int argc, char* argv[])
     catch (...)
     {}
 
+
     // add entries from tuning guide
 
     string ColScanReadAheadBlocks;
diff --git a/tools/dbbuilder/dbbuilder.cpp b/tools/dbbuilder/dbbuilder.cpp
index 2dc73082d..aec094b89 100644
--- a/tools/dbbuilder/dbbuilder.cpp
+++ b/tools/dbbuilder/dbbuilder.cpp
@@ -43,6 +43,9 @@ using namespace execplan;
 
 #include "installdir.h"
 
+string tmpDir;
+string logFile;
+
 enum BUILD_OPTION
 {
     SYSCATALOG_ONLY = 7, //Create systables only
@@ -54,8 +57,10 @@ namespace
 int setUp()
 {
 #ifndef _MSC_VER
-    (void)system("/bin/rm -f /tmp/dbbuilder.status >/dev/null 2>&1");
-    (void)system("/bin/touch /tmp/dbbuilder.status >/dev/null 2>&1");
+	string cmd = "/bin/rm -f " + logFile + " >/dev/null 2>&1";
+    (void)system(cmd.c_str());
+    cmd = "/bin/touch -f " + logFile + " >/dev/null 2>&1";
+    (void)system(cmd.c_str());
 #endif
     return 0;
 }
@@ -69,7 +74,8 @@ int checkNotThere(WriteEngine::FID fid)
 
 void tearDown()
 {
-    unlink("/tmp/oidbitmap");
+	string file = tmpDir + "/oidbitmap";
+    unlink(file.c_str());
 }
 
 void usage()
@@ -173,6 +179,10 @@ int main(int argc, char* argv[])
         return 1;
     }
 
+	//get tmp log directory
+    tmpDir = startup::StartUp::tmpDir();
+    logFile = tmpDir + "/dbbuilder.status";
+
     buildOption = atoi(argv[optind++]);
 
     if (buildOption != 7 && !fFlg)
@@ -187,7 +197,7 @@ int main(int argc, char* argv[])
 
         bool canWrite = true;
 
-        if (access("/tmp/dbbuilder.status", W_OK) != 0)
+        if (access(logFile.c_str(), W_OK) != 0)
             canWrite = false;
 
         try
@@ -196,7 +206,7 @@ int main(int argc, char* argv[])
             {
                 string cmd = "echo 'FAILED: buildOption=" +
                              oam.itoa(buildOption) +
-                             "' > /tmp/dbbuilder.status";
+                             "' > " + logFile;
 
                 if (canWrite)
                     (void)system(cmd.c_str());
@@ -230,7 +240,7 @@ int main(int argc, char* argv[])
             }
             catch (const exception& ex)
             {
-                string cmd(string("echo 'FAILED: ") + ex.what() + "' > /tmp/dbbuilder.status");
+                string cmd(string("echo 'FAILED: ") + ex.what() + "' > " + logFile);
 
                 if (canWrite)
                     (void)system(cmd.c_str());
@@ -242,7 +252,7 @@ int main(int argc, char* argv[])
             }
             catch (...)
             {
-                string cmd = "echo 'FAILED:  HDFS checking.' > /tmp/dbbuilder.status";
+                string cmd = "echo 'FAILED:  HDFS checking.' > " + logFile;
 
                 if (canWrite)
                     (void)system(cmd.c_str());
@@ -261,7 +271,7 @@ int main(int argc, char* argv[])
             SystemCatalog sysCatalog;
             sysCatalog.build();
 
-            std::string cmd = "echo 'OK: buildOption=" + oam.itoa(buildOption) + "' > /tmp/dbbuilder.status";
+            std::string cmd = "echo 'OK: buildOption=" + oam.itoa(buildOption) + "' > " + logFile;
 
             if (canWrite)
                 (void)system(cmd.c_str());
@@ -296,7 +306,7 @@ int main(int argc, char* argv[])
         }
         catch (exception& ex)
         {
-            string cmd = "echo 'FAILED: buildOption=" + oam.itoa(buildOption) + "' > /tmp/dbbuilder.status";
+            string cmd = "echo 'FAILED: buildOption=" + oam.itoa(buildOption) + "' > " + logFile;
 
             if (canWrite)
                 (void)system(cmd.c_str());
@@ -307,7 +317,7 @@ int main(int argc, char* argv[])
         }
         catch (...)
         {
-            string cmd = "echo 'FAILED: buildOption=" + oam.itoa(buildOption) + "' > /tmp/dbbuilder.status";
+            string cmd = "echo 'FAILED: buildOption=" + oam.itoa(buildOption) + "' > " + logFile;
 
             if (canWrite)
                 (void)system(cmd.c_str());
diff --git a/tools/evalidx/checkidx.py b/tools/evalidx/checkidx.py
index 2ca213520..c58b68dd3 100755
--- a/tools/evalidx/checkidx.py
+++ b/tools/evalidx/checkidx.py
@@ -6,7 +6,7 @@ def find_paths():
   
   """Find DBRoot and BulkRoot."""
   try:
-    config_file = os.environ['CALPONT_CONFIG_FILE']
+    config_file = os.environ['COLUMNSTORE_CONFIG_FILE']
   except KeyError:
     try:
       config_file = '/usr/local/mariadb/columnstore/etc'
diff --git a/tools/hdfsCheck/hdfsCheck.cpp b/tools/hdfsCheck/hdfsCheck.cpp
index e3469668d..7790c9916 100644
--- a/tools/hdfsCheck/hdfsCheck.cpp
+++ b/tools/hdfsCheck/hdfsCheck.cpp
@@ -28,6 +28,10 @@
 using namespace idbdatafile;
 using namespace std;
 
+#include "installdir.h"
+
+string tmpDir;
+
 size_t BLK_SIZE = 2048;
 const size_t MAX_BLK_SIZE = 1048576;
 size_t MAX_BLOCK = 1024;
@@ -189,7 +193,7 @@ bool TestRunner::runTest( IDBDataFile::Types filetype, unsigned open_opts )
     // build the file name we are going to use
     ostringstream oss;
     // embed pid so that this is a new directory path
-    oss << "/tmp/idbdf-dir-" << getpid() << "-" << m_id;
+    oss << tmpDir << "/idbdf-dir-" << getpid() << "-" << m_id;
     string dir = oss.str();
     m_fname = dir + "/foobar";
 
@@ -541,7 +545,7 @@ bool TestRunner::hdfsRdwrExhaustTest()
     // choose a new filename that is specific to our thread
     ostringstream oss;
     // embed pid so that this is a new directory path
-    oss << "/tmp/hdfsrdwr-" << getpid() << "-" << m_id;
+    oss << tmpDir << "/hdfsrdwr-" << getpid() << "-" << m_id;
     string newpath = oss.str();
 
     // open a file with arbitrarily small buffer
@@ -755,13 +759,15 @@ int main(int argc, char** argv)
         logFailure("missing hdfs-plugin argument");
         return 1;
     }
+    
+    tmpDir = startup::StartUp::tmpDir();
 
     opts.pluginFile = argv[optind];
 
     try
     {
         // init the library with logging enabled
-        std::string hdfsRdwrScratch = "/tmp/rdwr_scratch";
+        std::string hdfsRdwrScratch = tmpDir + "/rdwr_scratch";
         IDBPolicy::init( true, true, hdfsRdwrScratch, 2147483648 );
 
         if ( !IDBPolicy::installPlugin(opts.pluginFile) )
diff --git a/utils/clusterTester/columnstoreClusterTester.sh b/utils/clusterTester/columnstoreClusterTester.sh
index f68d16c55..887ed9af7 100755
--- a/utils/clusterTester/columnstoreClusterTester.sh
+++ b/utils/clusterTester/columnstoreClusterTester.sh
@@ -18,6 +18,9 @@ if [ -z "$COLUMNSTORE_INSTALL_DIR" ]; then
 	COLUMNSTORE_INSTALL_DIR=/usr/local/mariadb/columnstore
 fi
 
+#get temp directory
+tmpDir=`$COLUMNSTORE_INSTALL_DIR/bin/getConfig SystemConfig SystemTempFileDir`
+
 checkContinue() {
 
   if [ "$CHECK" = false ]; then
@@ -69,7 +72,6 @@ helpPrint () {
     echo  "	Firewall settings"
     echo  "     Date/time settings"
     echo  "	Dependent packages installed"
-    echo  "     For non-root user install - test permissions on /tmp and /dev/shm"
     echo ""
     echo  "Usage: $0 [options]" 
     echo "OPTIONS:"
@@ -203,23 +205,23 @@ checkLocalOS()
   echo ""
 
   #get local OS
-  `$COLUMNSTORE_INSTALL_DIR/bin/os_detect.sh > /tmp/os_detect 2>&1`
+  `$COLUMNSTORE_INSTALL_DIR/bin/os_detect.sh > ${tmpDir}/os_detect 2>&1`
   if [ "$?" -eq 0 ]; then
-    localOS=`cat /tmp/os_detect | grep "Operating System name" | cut -f2 -d '"'`
+    localOS=`cat ${tmpDir}/os_detect | grep "Operating System name" | cut -f2 -d '"'`
     echo "Local Node OS System Name : $localOS"
 
     if [ "$OS" != "" ] ; then
       echo ""
       echo "Local Node OS Versions doesn't match the command line OS argument"
       echo "Contining using the Detected Local Node OS Version"
-      OS=`cat /tmp/os_detect | grep "Operating System tag" | cut -f4 -d " "`
+      OS=`cat ${tmpDir}/os_detect | grep "Operating System tag" | cut -f4 -d " "`
     
       echo "Local Node OS Version : $OS"
     else
-      OS=`cat /tmp/os_detect | grep "Operating System tag" | cut -f4 -d " "`
+      OS=`cat ${tmpDir}/os_detect | grep "Operating System tag" | cut -f4 -d " "`
     fi
   else
-    localOS=`cat /tmp/os_detect | grep "Operating System name" | cut -f2 -d '"'`
+    localOS=`cat ${tmpDir}/os_detect | grep "Operating System name" | cut -f2 -d '"'`
     echo "Local Node OS System Name : $localOS"
 
     if [ "$OS" == "" ] ; then
@@ -265,31 +267,17 @@ checkLocalDir()
       # Non-root User directory permissions check
       #
       echo ""
-      echo "** Run Non-root User directory permissions check on Local Node"
+      echo "** Run Non-root User directory permissions check on Local Node (dev/shm)"
       echo ""
       
-      #remove any check tmp files from previous runs
-      `sudo rm -f /tmp/*_check > /dev/null 2>&1`
-      
-      #check /tmp and /dev/shm
-      pass=true
-      `touch /tmp/cs_check > /dev/null 2>&1`
-      if [ "$?" -eq 0 ]; then
-	echo "Local Node permission test on /tmp : Passed"
-	`rm -f /tmp/cs_check`
-      else
-	echo "Local Node permission test on /tmp : ${bold}Failed${normal}, change permissions to 777 and re-test"
-	exit 1
-      fi
-
       `touch /dev/shm/cs_check > /dev/null 2>&1`
       if [ "$?" -eq 0 ]; then
-	echo "Local Node permission test on /dev/shm : Passed"
-	`rm -f /dev/shm/cs_check`
+		echo "Local Node permission test on /dev/shm : Passed"
+		`rm -f /dev/shm/cs_check`
       else
-	echo "Local Node permission test on /dev/shm : ${bold}Failed${normal}, change permissions to 777 and re-test"
-	pass=false
-	REPORTPASS=false
+		echo "Local Node permission test on /dev/shm : ${bold}Failed${normal}, change permissions to 777 and re-test"
+		pass=false
+		REPORTPASS=false
       fi
     fi
 }
@@ -346,43 +334,18 @@ checkSSH()
 
 checkRemoteDir()
 {
-  #
-  # remove old _check tmp files from remote servers
-  
-  `sudo rm -f /tmp/*_check > /dev/null 2>&1`
-  
-  for ipadd in "${NODE_IPADDRESS[@]}"; do
-    `$COLUMNSTORE_INSTALL_DIR/bin/remote_command.sh $ipadd $PASSWORD 'sudo rm -f /tmp/*_check > /dev/null 2>&1' 1 > /tmp/remote_command_check 2>&1`
-  done
 
   if [ "$USER" != "root" ]; then
     # Non-root User directory permissions check
     #
     echo ""
-    echo "** Run Non-root User directory permissions check on remote nodes"
+    echo "** Run Non-root User directory permissions check on remote nodes (/dev/shm)"
     echo ""
 
-    for ipadd in "${NODE_IPADDRESS[@]}"; do
-      `$COLUMNSTORE_INSTALL_DIR/bin/remote_command.sh $ipadd $PASSWORD 'touch /tmp/cs_check' 1 > /tmp/remote_command_check 2>&1`
+      `$COLUMNSTORE_INSTALL_DIR/bin/remote_command.sh $ipadd $PASSWORD 'touch /dev/shm/cs_check' 1 > ${tmpDir}/remote_command_check 2>&1`
       rc="$?"
       if  [ $rc -eq 0 ] || ( [ $rc -eq 2 ] && [ $OS == "suse12" ] ) ; then
-	`grep "Permission denied" /tmp/remote_command_check  > /dev/null 2>&1`
-	if [ "$?" -eq 0 ]; then
-	  echo "$ipadd Node permission test on /tmp : ${bold}Failed${normal}, change permissions to 777 and re-test"
-	  exit 1
-	else
-	  echo "$ipadd Node permission test on /tmp : Passed"
-	fi
-      else
-	  echo "Error running remote_command.sh to $ipadd Node, check /tmp/remote_command_check"
-	  pass=false
-	  REPORTPASS=false
-      fi
-
-      `$COLUMNSTORE_INSTALL_DIR/bin/remote_command.sh $ipadd $PASSWORD 'touch /dev/shm/cs_check' 1 > /tmp/remote_command_check 2>&1`
-      rc="$?"
-      if  [ $rc -eq 0 ] || ( [ $rc -eq 2 ] && [ $OS == "suse12" ] ) ; then
-	`grep "Permission denied" /tmp/remote_command_check  > /dev/null 2>&1`
+	`grep "Permission denied" ${tmpDir}/remote_command_check  > /dev/null 2>&1`
 	if [ "$?" -eq 0 ]; then
 	  echo "$ipadd Node permission test on /dev/shm : ${bold}Failed${normal}, change permissions to 777 and re-test"
 	  pass=false
@@ -391,7 +354,7 @@ checkRemoteDir()
 	  echo "$ipadd Node permission test on /dev/shm : Passed"
 	fi
       else
-	echo "Error running remote_command.sh to $ipadd Node, check /tmp/remote_command_check"
+	echo "Error running remote_command.sh to $ipadd Node, check ${tmpDir}/remote_command_check"
 	pass=false
 	REPORTPASS=false
       fi
@@ -415,20 +378,20 @@ checkOS()
   echo ""
   
   pass=true
-  `/bin/cp -f $COLUMNSTORE_INSTALL_DIR/bin/os_detect.sh /tmp/.`
+  `/bin/cp -f $COLUMNSTORE_INSTALL_DIR/bin/os_detect.sh ${tmpDir}/.`
   for ipadd in "${NODE_IPADDRESS[@]}"; do
-    `$COLUMNSTORE_INSTALL_DIR/bin/remote_scp_put.sh $ipadd $PASSWORD /tmp/os_detect.sh 1 > /tmp/remote_scp_put_check 2>&1`
+    `$COLUMNSTORE_INSTALL_DIR/bin/remote_scp_put.sh $ipadd $PASSWORD ${tmpDir}/os_detect.sh 1 > ${tmpDir}/remote_scp_put_check 2>&1`
     if [ "$?" -ne 0 ]; then
-      echo "Error running remote_scp_put.sh to $ipadd Node, check /tmp/remote_scp_put_check"
+      echo "Error running remote_scp_put.sh to $ipadd Node, check ${tmpDir}/remote_scp_put_check"
       exit 1
     else
-      `$COLUMNSTORE_INSTALL_DIR/bin/remote_command.sh $ipadd $PASSWORD /tmp/os_detect.sh 1 > /tmp/remote_command_check`
+      `$COLUMNSTORE_INSTALL_DIR/bin/remote_command.sh $ipadd $PASSWORD ${tmpDir}/os_detect.sh 1 > ${tmpDir}/remote_command_check`
       rc="$?"
       if [ "$?" -ne 0 ]; then
-	echo "Error running remote_command.sh /tmp/os_detect.sh on $ipadd Node, check /tmp/remote_command_check"
+	echo "Error running remote_command.sh ${tmpDir}/os_detect.sh on $ipadd Node, check ${tmpDir}/remote_command_check"
 	exit 1
       else
-	  remoteOS=`cat /tmp/remote_command_check | grep "Operating System name" | cut -f2 -d '"'`
+	  remoteOS=`cat ${tmpDir}/remote_command_check | grep "Operating System name" | cut -f2 -d '"'`
 	  echo "$ipadd Node OS Version : $remoteOS"
 	  if [ $localOS != $remoteOS ]; then
 	    echo "${bold}Failed${normal}, $ipadd has a different OS than local node"
@@ -453,25 +416,25 @@ checkLocale()
   echo ""
   
   #get local Locale
-  `locale | grep LANG= > /tmp/locale_check 2>&1`
+  `locale | grep LANG= > ${tmpDir}/locale_check 2>&1`
   if [ "$?" -eq 0 ]; then
-    echo "Local Node Locale : `cat /tmp/locale_check`"
+    echo "Local Node Locale : `cat ${tmpDir}/locale_check`"
   else
     echo "Error running 'locale' command on local node"
   fi
   
   pass=true
   for ipadd in "${NODE_IPADDRESS[@]}"; do
-    `$COLUMNSTORE_INSTALL_DIR/bin/remote_command.sh $ipadd $PASSWORD 'locale | grep LANG= > /tmp/locale_check 2>&1' 1 > /tmp/remote_command_check`
+    `$COLUMNSTORE_INSTALL_DIR/bin/remote_command.sh $ipadd $PASSWORD 'locale | grep LANG= > locale_check 2>&1' 1 > ${tmpDir}/remote_command_check`
     rc="$?"
      if  [ $rc -eq 0 ] || ( [ $rc -eq 2 ] && [ $OS == "suse12" ] ) ; then
-      `$COLUMNSTORE_INSTALL_DIR/bin/remote_scp_get.sh $ipadd $PASSWORD /tmp/locale_check > /tmp/remote_scp_get_check 2>&1`
+      `$COLUMNSTORE_INSTALL_DIR/bin/remote_scp_get.sh $ipadd $PASSWORD locale_check > ${tmpDir}/remote_scp_get_check 2>&1`
       if [ "$?" -ne 0 ]; then
-	echo "Error running remote_scp_get.sh to $ipadd Node, check /tmp/remote_scp_get_check"
+	echo "Error running remote_scp_get.sh to $ipadd Node, check ${tmpDir}/remote_scp_get_check"
 	exit 1
       else
 	echo "$ipadd Node Locale : `cat locale_check`"
-	`diff /tmp/locale_check locale_check > /dev/null 2>&1`
+	`diff ${tmpDir}/locale_check locale_check > /dev/null 2>&1`
 	if [ "$?" -ne 0 ]; then
 	  echo "${bold}Failed${normal}, $ipadd has a different Locale setting than local node"
 	  pass=false
@@ -480,7 +443,7 @@ checkLocale()
 	`rm -f locale_check`
       fi
     else
-      echo "Error running remote_command.sh to $ipadd Node, check /tmp/remote_command_check"
+      echo "Error running remote_command.sh to $ipadd Node, check ${tmpDir}/remote_command_check"
       exit 1
       pass=false
       REPORTPASS=false
@@ -538,7 +501,7 @@ checkLocalSELINUX()
   pass=true
   #check local SELINUX
   if [ -f /etc/selinux/config ]; then
-    `cat /etc/selinux/config | grep SELINUX | grep enforcing > /tmp/selinux_check 2>&1`
+    `cat /etc/selinux/config | grep SELINUX | grep enforcing > ${tmpDir}/selinux_check 2>&1`
     if [ "$?" -eq 0 ]; then
       echo "${bold}Warning${normal}, Local Node SELINUX setting is Enabled, check port test results"
       pass=false
@@ -565,9 +528,9 @@ checkUMASK()
   pass=true
   
 	  for ipadd in "${NODE_IPADDRESS[@]}"; do
-		`$COLUMNSTORE_INSTALL_DIR/bin/remote_command.sh $ipadd $PASSWORD 'rm -f UMASKtest;touch UMASKtest;echo $(stat -c "%A" "UMASKtest") > test.log' > /tmp/remote_command_check 2>&1`
+		`$COLUMNSTORE_INSTALL_DIR/bin/remote_command.sh $ipadd $PASSWORD 'rm -f UMASKtest;touch UMASKtest;echo $(stat -c "%A" "UMASKtest") > test.log' > ${tmpDir}/remote_command_check 2>&1`
 		if [ "$?" -eq 0 ]; then
-		  `$COLUMNSTORE_INSTALL_DIR/bin/remote_scp_get.sh $ipadd Calpont1 test.log >> /tmp/remote_scp_get 2>&1`
+		  `$COLUMNSTORE_INSTALL_DIR/bin/remote_scp_get.sh $ipadd Calpont1 test.log >> ${tmpDir}/remote_scp_get 2>&1`
 			if [ "$?" -eq 0 ]; then
 				permission=`cat test.log`
 			    result=${permission:4:1}
@@ -584,11 +547,11 @@ checkUMASK()
 					pass=false
 				fi
 			else
-				echo "${bold}Warning${normal}, $ipadd UMASK test failed, remote_scp_get.sh error, check /tmp/remote_scp_get"
+				echo "${bold}Warning${normal}, $ipadd UMASK test failed, remote_scp_get.sh error, check ${tmpDir}/remote_scp_get"
 				pass=false
 			fi
 		else
-			echo "${bold}Warning${normal}, $ipadd UMASK test failed, remote_command.sh error, check /tmp/remote_command_check"
+			echo "${bold}Warning${normal}, $ipadd UMASK test failed, remote_command.sh error, check ${tmpDir}/remote_command_check"
 			pass=false
 		fi
 		`rm -f test.log`
@@ -611,11 +574,11 @@ checkSELINUX()
   
   pass=true
 	  for ipadd in "${NODE_IPADDRESS[@]}"; do
-		`$COLUMNSTORE_INSTALL_DIR/bin/remote_scp_get.sh $ipadd $PASSWORD /etc/selinux/config > /tmp/remote_scp_get_check 2>&1`
+		`$COLUMNSTORE_INSTALL_DIR/bin/remote_scp_get.sh $ipadd $PASSWORD /etc/selinux/config > ${tmpDir}/remote_scp_get_check 2>&1`
 		if [ "$?" -ne 0 ]; then
 		  echo "$ipadd Node SELINUX setting is Not Enabled"
 		else
-		 `cat config | grep SELINUX | grep enforcing > /tmp/selinux_check 2>&1`
+		 `cat config | grep SELINUX | grep enforcing > ${tmpDir}/selinux_check 2>&1`
 		if [ "$?" -eq 0 ]; then
 		  echo "${bold}Warning${normal}, $ipadd SELINUX setting is Enabled, check port test results"
 		  pass=false
@@ -644,12 +607,12 @@ checkFirewalls()
   #check local FIREWALLS
   for firewall in "${FIREWALL_LIST[@]}"; do
     pass=true
-    `service  $firewall status > /tmp/firewall1_check 2>&1`
+    `service  $firewall status > ${tmpDir}/firewall1_check 2>&1`
     if [ "$?" -eq 0 ]; then
       echo "${bold}Warning${normal}, Local Node $firewall service is Active, check port test results"
       pass=false
     else
-      `systemctl status $firewall > /tmp/firewall1_check 2>&1`
+      `systemctl status $firewall > ${tmpDir}/firewall1_check 2>&1`
       if [ "$?" -eq 0 ]; then
         echo "${bold}Warning${normal}, Local Node $firewall service is Active, check port test results"
         pass=false
@@ -667,12 +630,12 @@ checkFirewalls()
       # 'sysconfig not on remote node
       for firewall in "${FIREWALL_LIST[@]}"; do
 	pass=true
-        `$COLUMNSTORE_INSTALL_DIR/bin/remote_command.sh $ipadd $PASSWORD "service '$firewall' status > /tmp/firewall_check 2>&1" 1 > /tmp/remote_command_check`
+        `$COLUMNSTORE_INSTALL_DIR/bin/remote_command.sh $ipadd $PASSWORD "service '$firewall' status > ${tmpDir}/firewall_check 2>&1" 1 > ${tmpDir}/remote_command_check`
         if [ "$?" -eq 0 ]; then
               echo "${bold}Warning${normal}, $ipadd Node $firewall service is Active, check port test results"
               pass=false
         else
-	  `$COLUMNSTORE_INSTALL_DIR/bin/remote_command.sh $ipadd $PASSWORD "systemctl status '$firewall' > /tmp/firewall_check 2>&1" 1 > /tmp/remote_command_check`
+	  `$COLUMNSTORE_INSTALL_DIR/bin/remote_command.sh $ipadd $PASSWORD "systemctl status '$firewall' > ${tmpDir}/firewall_check 2>&1" 1 > ${tmpDir}/remote_command_check`
 	  if [ "$?" -eq 0 ]; then
 	      echo "${bold}Warning${normal}, $ipadd Node $firewall service is Active, check port test results"
 	      pass=false
@@ -696,7 +659,7 @@ checkFirewalls()
     
     pass=true
     #check local IPTABLES
-    `/sbin/rcSuSEfirewall2 status > /tmp/rcSuSEfirewall2_check 2>&1`
+    `/sbin/rcSuSEfirewall2 status > ${tmpDir}/rcSuSEfirewall2_check 2>&1`
     if [ "$?" -eq 0 ]; then
       echo "${bold}Failed${normal}, Local Node rcSuSEfirewall2 service is Enabled, check port test results"
       pass=false
@@ -705,7 +668,7 @@ checkFirewalls()
     fi
 
     for ipadd in "${NODE_IPADDRESS[@]}"; do
-      `$COLUMNSTORE_INSTALL_DIR/bin/remote_command.sh $ipadd $PASSWORD '/sbin/rcSuSEfirewall2 status > /tmp/rcSuSEfirewall2_check 2>&1' 1 > /tmp/remote_command_check`
+      `$COLUMNSTORE_INSTALL_DIR/bin/remote_command.sh $ipadd $PASSWORD '/sbin/rcSuSEfirewall2 status > ${tmpDir}/rcSuSEfirewall2_check 2>&1' 1 > ${tmpDir}/remote_command_check`
       rc="$?"
       if  [ $rc -eq 0 ] ; then
 	echo "${bold}Failed${normal}, $ipadd Node rcSuSEfirewall2 service is Enabled, check port test results"
@@ -728,12 +691,12 @@ checkPorts()
   pass=true
   for ipadd in "${NODE_IPADDRESS[@]}"; do
 
-    `sudo nmap $ipadd -p 8600-8630,8700,8800,3306 | grep 'filtered' > /tmp/port_test`
+    `nmap $ipadd -p 8600-8630,8700,8800,3306 | grep 'filtered' > ${tmpDir}/port_test`
     if [ "$?" -ne 0 ]; then
       echo $ipadd " Node Passed port test"
     else
       echo $ipadd " Node ${bold}Failed${normal} port test, check and disable any firewalls or open ports in firewall"
-      cat /tmp/port_test
+      cat ${tmpDir}/port_test
       pass=false
       REPORTPASS=false
     fi
@@ -756,16 +719,16 @@ checkTime()
   #get local epoch time
   localTime=`date +%s`
   for ipadd in "${NODE_IPADDRESS[@]}"; do
-     `$COLUMNSTORE_INSTALL_DIR/bin/remote_command.sh $ipadd $PASSWORD 'date +%s > /tmp/time_check' > /tmp/time_check`
+     `$COLUMNSTORE_INSTALL_DIR/bin/remote_command.sh $ipadd $PASSWORD 'date +%s > time_check' > ${tmpDir}/time_check`
       rc="$?"
       if  [ $rc -ne 0 ] ; then
-	  echo $ipadd " Node ${bold}Failed${normal} date/time check failed, check /tmp/time_check"
+	  echo $ipadd " Node ${bold}Failed${normal} date/time check failed, check ${tmpDir}/time_check"
 	  pass=false
 	  REPORTPASS=false
       else
-	`$COLUMNSTORE_INSTALL_DIR/bin/remote_scp_get.sh $ipadd $PASSWORD /tmp/time_check > /tmp/remote_scp_get_check 2>&1`
+	`$COLUMNSTORE_INSTALL_DIR/bin/remote_scp_get.sh $ipadd $PASSWORD time_check > ${tmpDir}/remote_scp_get_check 2>&1`
 	if [ "$?" -ne 0 ]; then
-	  echo "Error running remote_scp_get.sh to $ipadd Node, check /tmp/remote_scp_get_check"
+	  echo "Error running remote_scp_get.sh to $ipadd Node, check ${tmpDir}/remote_scp_get_check"
 	else
 	  remoteTime=`cat time_check`
 	  timeDiff=`echo "$(($remoteTime-$localTime))"`
@@ -803,17 +766,17 @@ checkMysqlPassword()
   fi
   
   if [ "$IPADDRESSES" != "" ]; then
-    `/bin/cp -f $COLUMNSTORE_INSTALL_DIR/bin/mariadb-command-line.sh /tmp/.`
+    `/bin/cp -f $COLUMNSTORE_INSTALL_DIR/bin/mariadb-command-line.sh ${tmpDir}/.`
 
     for ipadd in "${NODE_IPADDRESS[@]}"; do
       `$COLUMNSTORE_INSTALL_DIR/bin/remote_command.sh $ipadd $PASSWORD $COLUMNSTORE_INSTALL_DIR/mysql/mysql-Columnstore start > /dev/null 2>&1`
-      `$COLUMNSTORE_INSTALL_DIR/bin/remote_scp_put.sh $ipadd $PASSWORD /tmp/mariadb-command-line.sh 1 > /tmp/remote_scp_put_check 2>&1`
+      `$COLUMNSTORE_INSTALL_DIR/bin/remote_scp_put.sh $ipadd $PASSWORD ${tmpDir}/mariadb-command-line.sh 1 > ${tmpDir}/remote_scp_put_check 2>&1`
       if [ "$?" -ne 0 ]; then
-	echo "Error running remote_scp_put.sh to $ipadd Node, check /tmp/remote_scp_put_check"
+	echo "Error running remote_scp_put.sh to $ipadd Node, check ${tmpDir}/remote_scp_put_check"
 	exit 1
       else
-	`$COLUMNSTORE_INSTALL_DIR/bin/remote_command.sh $ipadd $PASSWORD /tmp/mariadb-command-line.sh 1 > /tmp/remote_command_check`
-	    `cat /tmp/remote_command_check | grep "ERROR - PASSWORD" > /dev/null 2>&1`
+	`$COLUMNSTORE_INSTALL_DIR/bin/remote_command.sh $ipadd $PASSWORD ${tmpDir}/mariadb-command-line.sh 1 > ${tmpDir}/remote_command_check`
+	    `cat ${tmpDir}/remote_command_check | grep "ERROR - PASSWORD" > /dev/null 2>&1`
 	    if [ "$?" -eq 0 ]; then
 	      echo "${bold}Failed${normal}, $ipadd Node MariaDB login failed with missing password file, /root/.my.cnf"
 	      pass=false
@@ -839,7 +802,8 @@ checkPackages()
   echo "** Run MariaDB ColumnStore Dependent Package Check"
   echo ""
 
-  declare -a CENTOS_PKG=("expect" "perl" "perl-DBI" "openssl" "zlib" "file" "sudo" "libaio" "rsync" "snappy" "net-tools" "numactl-libs")
+
+  declare -a CENTOS_PKG=("expect" "perl" "perl-DBI" "openssl" "zlib" "file" "libaio" "rsync" "snappy" "net-tools" "numactl-libs")
   declare -a CENTOS_PKG_NOT=("mariadb-libs")
 
   if [ "$OS" == "centos6" ] || [ "$OS" == "centos7" ]; then
@@ -859,8 +823,8 @@ checkPackages()
 	    REPORTPASS=false
 	  fi
 	else
-	  `yum list installed "$PKG" > /tmp/pkg_check 2>&1`
-	  `cat /tmp/pkg_check | grep Installed > /dev/null 2>&1`
+	  `yum list installed "$PKG" > ${tmpDir}/pkg_check 2>&1`
+	  `cat ${tmpDir}/pkg_check | grep Installed > /dev/null 2>&1`
 	  if [ "$?" -ne 0 ]; then
 	    echo "${bold}Failed${normal}, Local Node package ${bold}${PKG}${normal} is not installed, please install"
 	    pass=false
@@ -879,8 +843,8 @@ checkPackages()
     #check for package that shouldnt be installed
     pass=true
     for PKG in "${CENTOS_PKG_NOT[@]}"; do
-      `yum list installed "$PKG" > /tmp/pkg_check 2>&1`
-      `cat /tmp/pkg_check | grep Installed > /dev/null 2>&1`
+      `yum list installed "$PKG" > ${tmpDir}/pkg_check 2>&1`
+      `cat ${tmpDir}/pkg_check | grep Installed > /dev/null 2>&1`
       if [ "$?" -eq 0 ]; then
 	echo "${bold}Failed${normal}, Local Node package ${bold}${PKG}${normal} is installed, please un-install"
 	pass=false
@@ -900,14 +864,14 @@ checkPackages()
       for ipadd in "${NODE_IPADDRESS[@]}"; do
 	for PKG in "${CENTOS_PKG[@]}"; do
 	  if [ $OS == "centos6" ] && [ $PKG == "boost" ]; then
-	    `$COLUMNSTORE_INSTALL_DIR/bin/remote_command.sh $ipadd $PASSWORD 'ls /usr/lib/libboost_regex.so > /dev/null 2>&1' 1 > /tmp/remote_command_check 2>&1`
+	    `$COLUMNSTORE_INSTALL_DIR/bin/remote_command.sh $ipadd $PASSWORD 'ls /usr/lib/libboost_regex.so > /dev/null 2>&1' 1 > ${tmpDir}/remote_command_check 2>&1`
 	    if  [ $? -ne 0 ] ; then
 	      echo "${bold}Failed${normal}, $ipadd Node ${bold}boost libraries${normal} not installed"
 	      pass=false
 	      REPORTPASS=false
 	    fi
 	  else
-	    `$COLUMNSTORE_INSTALL_DIR/bin/remote_command.sh $ipadd $PASSWORD "yum list installed '$PKG' > /tmp/pkg_check 2>&1" 1 > /tmp/remote_command_check 2>&1`
+	    `$COLUMNSTORE_INSTALL_DIR/bin/remote_command.sh $ipadd $PASSWORD "yum list installed '$PKG' > ${tmpDir}/pkg_check 2>&1" 1 > ${tmpDir}/remote_command_check 2>&1`
 	    rc="$?"
 	    if  [ $rc -eq 2 ] ; then
               echo "${bold}Failed${normal}, $ipadd Node, 'yum' not installed"
@@ -932,7 +896,7 @@ checkPackages()
 	
 	#check for package that shouldnt be installed
 	for PKG in "${CENTOS_PKG_NOT[@]}"; do
-	  `$COLUMNSTORE_INSTALL_DIR/bin/remote_command.sh $ipadd $PASSWORD "yum list installed '$PKG' > /tmp/pkg_check 2>&1" 1 > /tmp/remote_command_check 2>&1`
+	  `$COLUMNSTORE_INSTALL_DIR/bin/remote_command.sh $ipadd $PASSWORD "yum list installed '$PKG' > ${tmpDir}/pkg_check 2>&1" 1 > ${tmpDir}/remote_command_check 2>&1`
 	  rc="$?"
 	  if  [ $rc -eq 2 ] ; then
 	    echo "${bold}Failed${normal}, $ipadd Node, 'yum' not installed"
@@ -958,7 +922,8 @@ checkPackages()
     fi
   fi
 
-  declare -a SUSE_PKG=("boost-devel" "expect" "perl" "perl-DBI" "openssl" "file" "sudo" "libaio1" "rsync" "libsnappy1" "net-tools" "libnuma1")
+
+  declare -a SUSE_PKG=("boost-devel" "expect" "perl" "perl-DBI" "openssl" "file" "libaio1" "rsync" "libsnappy1" "net-tools" "libnuma1")
   declare -a SUSE_PKG_NOT=("mariadb" , "libmariadb18")
 
   if [ "$OS" == "suse12" ]; then
@@ -970,8 +935,8 @@ checkPackages()
       pass=true
       #check centos packages on local node
       for PKG in "${SUSE_PKG[@]}"; do
-	`rpm -qi "$PKG" > /tmp/pkg_check 2>&1`
-	`cat /tmp/pkg_check | grep "not installed" > /dev/null 2>&1`
+	`rpm -qi "$PKG" > ${tmpDir}/pkg_check 2>&1`
+	`cat ${tmpDir}/pkg_check | grep "not installed" > /dev/null 2>&1`
 	if [ "$?" -eq 0 ]; then
 	  echo "${bold}Failed${normal}, Local Node package ${bold}${PKG}${normal} is not installed, please install"
 	  pass=false
@@ -988,8 +953,8 @@ checkPackages()
       #check for package that shouldnt be installed
       pass=true
       for PKG in "${SUSE_PKG_NOT[@]}"; do
-	`rpm -qi "$PKG" > /tmp/pkg_check 2>&1`
-	`cat /tmp/pkg_check | grep "not installed" > /dev/null 2>&1`
+	`rpm -qi "$PKG" > ${tmpDir}/pkg_check 2>&1`
+	`cat ${tmpDir}/pkg_check | grep "not installed" > /dev/null 2>&1`
 	if [ "$?" -ne 0 ]; then
 	  echo "${bold}Failed${normal}, Local Node package ${bold}${PKG}${normal} is installed, please un-install"
 	  pass=false
@@ -1009,7 +974,7 @@ checkPackages()
     if [ "$IPADDRESSES" != "" ]; then
       for ipadd in "${NODE_IPADDRESS[@]}"; do
 	for PKG in "${SUSE_PKG[@]}"; do
-	  `$COLUMNSTORE_INSTALL_DIR/bin/remote_command.sh $ipadd $PASSWORD "rpm -qi '$PKG' > /tmp/pkg_check 2>&1" 1 > /tmp/remote_command_check 2>&1`
+	  `$COLUMNSTORE_INSTALL_DIR/bin/remote_command.sh $ipadd $PASSWORD "rpm -qi '$PKG' > ${tmpDir}/pkg_check 2>&1" 1 > ${tmpDir}/remote_command_check 2>&1`
 	  rc="$?"
 	  if  [ $rc -ne 0 ] ; then
 	    echo "${bold}Failed${normal}, $ipadd Node package ${bold}${PKG}${normal} is not installed, please install"
@@ -1028,7 +993,7 @@ checkPackages()
 	
 	#check for package that shouldnt be installed
 	for PKG in "${SUSE_PKG_NOT[@]}"; do
-	  `$COLUMNSTORE_INSTALL_DIR/bin/remote_command.sh $ipadd $PASSWORD "rpm -qi '$PKG' > /tmp/pkg_check 2>&1" 1 > /tmp/remote_command_check 2>&1`
+	  `$COLUMNSTORE_INSTALL_DIR/bin/remote_command.sh $ipadd $PASSWORD "rpm -qi '$PKG' > ${tmpDir}/pkg_check 2>&1" 1 > ${tmpDir}/remote_command_check 2>&1`
 	  rc="$?"
 	  if  [ $rc -eq 0 ] ; then
 	    echo "${bold}Failed${normal}, $ipadd Node package ${bold}${PKG}${normal} is installed, please un-install"
@@ -1049,7 +1014,7 @@ checkPackages()
     fi
   fi  
 
-  declare -a UBUNTU_PKG=("libboost-all-dev" "expect" "libdbi-perl" "perl" "openssl" "file" "sudo" "libreadline-dev" "rsync" "libsnappy1V5" "net-tools" "libnuma1" )
+  declare -a UBUNTU_PKG=("libboost-all-dev" "expect" "libdbi-perl" "perl" "openssl" "file" "libreadline-dev" "rsync" "libsnappy1V5" "net-tools" "libnuma1" )
   declare -a UBUNTU_PKG_NOT=("mariadb-server" "libmariadb18")
 
   if [ "$OS" == "ubuntu16" ] || [ "$OS" == "ubuntu18" ]; then
@@ -1061,8 +1026,8 @@ checkPackages()
       pass=true
       #check centos packages on local node
       for PKG in "${UBUNTU_PKG[@]}"; do
-	`dpkg -s "$PKG" > /tmp/pkg_check 2>&1`
-	`cat /tmp/pkg_check | grep 'install ok installed' > /dev/null 2>&1`
+	`dpkg -s "$PKG" > ${tmpDir}/pkg_check 2>&1`
+	`cat ${tmpDir}/pkg_check | grep 'install ok installed' > /dev/null 2>&1`
 	if [ "$?" -ne 0 ]; then
 	  echo "${bold}Failed${normal}, Local Node package ${bold}${PKG}${normal} is not installed, please install"
 	  pass=false
@@ -1079,8 +1044,8 @@ checkPackages()
       #check for package that shouldnt be installed
       pass=true
       for PKG in "${UBUNTU_PKG_NOT[@]}"; do
-	`dpkg -s "$PKG" > /tmp/pkg_check 2>&1`
-	`cat /tmp/pkg_check | grep 'install ok installed' > /dev/null 2>&1`
+	`dpkg -s "$PKG" > ${tmpDir}/pkg_check 2>&1`
+	`cat ${tmpDir}/pkg_check | grep 'install ok installed' > /dev/null 2>&1`
 	if [ "$?" -eq 0 ]; then
 	  echo "${bold}Failed${normal}, Local Node package ${bold}${PKG}${normal} is installed, please un-install"
 	  pass=false
@@ -1100,12 +1065,12 @@ checkPackages()
     if [ "$IPADDRESSES" != "" ]; then
      for ipadd in "${NODE_IPADDRESS[@]}"; do
       for PKG in "${UBUNTU_PKG[@]}"; do
-        `$COLUMNSTORE_INSTALL_DIR/bin/remote_command.sh $ipadd $PASSWORD "dpkg -s '$PKG' > /tmp/pkg_check 2>&1" 1 > /tmp/remote_command_check 2>&1`
-          `$COLUMNSTORE_INSTALL_DIR/bin/remote_scp_get.sh $ipadd $PASSWORD /tmp/pkg_check > /tmp/remote_scp_get_check 2>&1`
+        `$COLUMNSTORE_INSTALL_DIR/bin/remote_command.sh $ipadd $PASSWORD "dpkg -s '$PKG' > ${tmpDir}/pkg_check 2>&1" 1 > ${tmpDir}/remote_command_check 2>&1`
+          `$COLUMNSTORE_INSTALL_DIR/bin/remote_scp_get.sh $ipadd $PASSWORD ${tmpDir}/pkg_check > ${tmpDir}/remote_scp_get_check 2>&1`
             if [ "$?" -ne 0 ]; then
-              echo "Error running remote_scp_get.sh to $ipadd Node, check /tmp/remote_scp_get_check"
+              echo "Error running remote_scp_get.sh to $ipadd Node, check ${tmpDir}/remote_scp_get_check"
             else
-              `cat /tmp/remote_command_check | grep 'command not found' > /dev/null 2>&1`
+              `cat ${tmpDir}/remote_command_check | grep 'command not found' > /dev/null 2>&1`
               if [ "$?" -eq 0 ]; then
                 echo "${bold}Failed${normal}, $ipadd Node ${bold}dpkg${normal} package not installed"
                 pass=false
@@ -1132,12 +1097,12 @@ checkPackages()
       
       #check for package that shouldnt be installed
       for PKG in "${UBUNTU_PKG_NOT[@]}"; do
-        `$COLUMNSTORE_INSTALL_DIR/bin/remote_command.sh $ipadd $PASSWORD "dpkg -s '$PKG' > /tmp/pkg_check 2>&1" 1 > /tmp/remote_command_check 2>&1`
-	`$COLUMNSTORE_INSTALL_DIR/bin/remote_scp_get.sh $ipadd $PASSWORD /tmp/pkg_check > /tmp/remote_scp_get_check 2>&1`
+        `$COLUMNSTORE_INSTALL_DIR/bin/remote_command.sh $ipadd $PASSWORD "dpkg -s '$PKG' > ${tmpDir}/pkg_check 2>&1" 1 > ${tmpDir}/remote_command_check 2>&1`
+	`$COLUMNSTORE_INSTALL_DIR/bin/remote_scp_get.sh $ipadd $PASSWORD ${tmpDir}/pkg_check > ${tmpDir}/remote_scp_get_check 2>&1`
 	  if [ "$?" -ne 0 ]; then
-	    echo "Error running remote_scp_get.sh to $ipadd Node, check /tmp/remote_scp_get_check"
+	    echo "Error running remote_scp_get.sh to $ipadd Node, check ${tmpDir}/remote_scp_get_check"
 	  else
-	    `cat /tmp/remote_command_check | grep 'command not found' > /dev/null 2>&1`
+	    `cat ${tmpDir}/remote_command_check | grep 'command not found' > /dev/null 2>&1`
 	    if [ "$?" -eq 0 ]; then
 	      echo "${bold}Failed${normal}, $ipadd Node ${bold}dpkg${normal} package not installed"
 	      pass=false
@@ -1166,7 +1131,8 @@ checkPackages()
    fi
   fi
 
-  declare -a DEBIAN_PKG=("libboost-all-dev" "expect" "libdbi-perl" "perl" "openssl" "file" "sudo" "libreadline-dev" "rsync" "libsnappy1" "net-tools" "libnuma1")
+
+  declare -a DEBIAN_PKG=("libboost-all-dev" "expect" "libdbi-perl" "perl" "openssl" "file" "libreadline-dev" "rsync" "libsnappy1" "net-tools" "libnuma1")
   declare -a DEBIAN_PKG_NOT=("libmariadb18" "mariadb-server")
 
   if [ "$OS" == "debian8" ]; then
@@ -1178,8 +1144,8 @@ checkPackages()
       pass=true
       #check centos packages on local node
       for PKG in "${DEBIAN_PKG[@]}"; do
-	`dpkg -s "$PKG" > /tmp/pkg_check 2>&1`
-	`cat /tmp/pkg_check | grep 'install ok installed' > /dev/null 2>&1`
+	`dpkg -s "$PKG" > ${tmpDir}/pkg_check 2>&1`
+	`cat ${tmpDir}/pkg_check | grep 'install ok installed' > /dev/null 2>&1`
 	if [ "$?" -ne 0 ]; then
 	  echo "${bold}Failed${normal}, Local Node package ${bold}${PKG}${normal} is not installed, please install"
 	  pass=false
@@ -1196,8 +1162,8 @@ checkPackages()
       #check for package that shouldnt be installed
       pass=true
       for PKG in "${DEBIAN_PKG_NOT[@]}"; do
-	`dpkg -s "$PKG" > /tmp/pkg_check 2>&1`
-	`cat /tmp/pkg_check | grep 'install ok installed' > /dev/null 2>&1`
+	`dpkg -s "$PKG" > ${tmpDir}/pkg_check 2>&1`
+	`cat ${tmpDir}/pkg_check | grep 'install ok installed' > /dev/null 2>&1`
 	if [ "$?" -eq 0 ]; then
 	  echo "${bold}Failed${normal}, Local Node package ${bold}${PKG}${normal} is installed, please un-install"
 	  pass=false
@@ -1217,12 +1183,12 @@ checkPackages()
     if [ "$IPADDRESSES" != "" ]; then
      for ipadd in "${NODE_IPADDRESS[@]}"; do
       for PKG in "${DEBIAN_PKG[@]}"; do
-        `$COLUMNSTORE_INSTALL_DIR/bin/remote_command.sh $ipadd $PASSWORD "dpkg -s '$PKG' > /tmp/pkg_check 2>&1" 1 > /tmp/remote_command_check 2>&1`
-          `$COLUMNSTORE_INSTALL_DIR/bin/remote_scp_get.sh $ipadd $PASSWORD /tmp/pkg_check > /tmp/remote_scp_get_check 2>&1`
+        `$COLUMNSTORE_INSTALL_DIR/bin/remote_command.sh $ipadd $PASSWORD "dpkg -s '$PKG' > ${tmpDir}/pkg_check 2>&1" 1 > ${tmpDir}/remote_command_check 2>&1`
+          `$COLUMNSTORE_INSTALL_DIR/bin/remote_scp_get.sh $ipadd $PASSWORD ${tmpDir}/pkg_check > ${tmpDir}/remote_scp_get_check 2>&1`
             if [ "$?" -ne 0 ]; then
-              echo "Error running remote_scp_get.sh to $ipadd Node, check /tmp/remote_scp_get_check"
+              echo "Error running remote_scp_get.sh to $ipadd Node, check ${tmpDir}/remote_scp_get_check"
             else
-              `cat /tmp/remote_command_check | grep 'command not found' > /dev/null 2>&1`
+              `cat ${tmpDir}/remote_command_check | grep 'command not found' > /dev/null 2>&1`
               if [ "$?" -eq 0 ]; then
                 echo "${bold}Failed${normal}, $ipadd Node ${bold}dpkg${normal} package not installed"
                 pass=false
@@ -1249,12 +1215,12 @@ checkPackages()
       
       #check for package that shouldnt be installed
       for PKG in "${DEBIAN_PKG_NOT[@]}"; do
-        `$COLUMNSTORE_INSTALL_DIR/bin/remote_command.sh $ipadd $PASSWORD "dpkg -s '$PKG' > /tmp/pkg_check 2>&1" 1 > /tmp/remote_command_check 2>&1`
-	`$COLUMNSTORE_INSTALL_DIR/bin/remote_scp_get.sh $ipadd $PASSWORD /tmp/pkg_check > /tmp/remote_scp_get_check 2>&1`
+        `$COLUMNSTORE_INSTALL_DIR/bin/remote_command.sh $ipadd $PASSWORD "dpkg -s '$PKG' > ${tmpDir}/pkg_check 2>&1" 1 > ${tmpDir}/remote_command_check 2>&1`
+	`$COLUMNSTORE_INSTALL_DIR/bin/remote_scp_get.sh $ipadd $PASSWORD ${tmpDir}/pkg_check > ${tmpDir}/remote_scp_get_check 2>&1`
 	  if [ "$?" -ne 0 ]; then
-	    echo "Error running remote_scp_get.sh to $ipadd Node, check /tmp/remote_scp_get_check"
+	    echo "Error running remote_scp_get.sh to $ipadd Node, check ${tmpDir}/remote_scp_get_check"
 	  else
-	    `cat /tmp/remote_command_check | grep 'command not found' > /dev/null 2>&1`
+	    `cat ${tmpDir}/remote_command_check | grep 'command not found' > /dev/null 2>&1`
 	    if [ "$?" -eq 0 ]; then
 	      echo "${bold}Failed${normal}, $ipadd Node ${bold}dpkg${normal} package not installed"
 	      pass=false
@@ -1283,7 +1249,8 @@ checkPackages()
     fi
   fi
   
-  declare -a DEBIAN9_PKG=("libboost-all-dev" "expect" "libdbi-perl" "perl" "openssl" "file" "sudo" "libreadline5" "rsync" "libsnappy1V5" "net-tools" "libaio1" "libnuma1")
+
+  declare -a DEBIAN9_PKG=("libboost-all-dev" "expect" "libdbi-perl" "perl" "openssl" "file" "libreadline5" "rsync" "libsnappy1V5" "net-tools" "libaio1" "libnuma1")
   declare -a DEBIAN9_PKG_NOT=("libmariadb18" "mariadb-server")
 
   if [ "$OS" == "debian9" ]; then
@@ -1295,8 +1262,8 @@ checkPackages()
       pass=true
       #check centos packages on local node
       for PKG in "${DEBIAN9_PKG[@]}"; do
-	`dpkg -s "$PKG" > /tmp/pkg_check 2>&1`
-	`cat /tmp/pkg_check | grep 'install ok installed' > /dev/null 2>&1`
+	`dpkg -s "$PKG" > ${tmpDir}/pkg_check 2>&1`
+	`cat ${tmpDir}/pkg_check | grep 'install ok installed' > /dev/null 2>&1`
 	if [ "$?" -ne 0 ]; then
 	  echo "${bold}Failed${normal}, Local Node package ${bold}${PKG}${normal} is not installed, please install"
 	  pass=false
@@ -1313,8 +1280,8 @@ checkPackages()
       #check for package that shouldnt be installed
       pass=true
       for PKG in "${DEBIAN9_PKG_NOT[@]}"; do
-	`dpkg -s "$PKG" > /tmp/pkg_check 2>&1`
-	`cat /tmp/pkg_check | grep 'install ok installed' > /dev/null 2>&1`
+	`dpkg -s "$PKG" > ${tmpDir}/pkg_check 2>&1`
+	`cat ${tmpDir}/pkg_check | grep 'install ok installed' > /dev/null 2>&1`
 	if [ "$?" -eq 0 ]; then
 	  echo "${bold}Failed${normal}, Local Node package ${bold}${PKG}${normal} is installed, please un-install"
 	  pass=false
@@ -1335,12 +1302,12 @@ checkPackages()
     if [ "$IPADDRESSES" != "" ]; then
      for ipadd in "${NODE_IPADDRESS[@]}"; do
       for PKG in "${DEBIAN9_PKG[@]}"; do
-        `$COLUMNSTORE_INSTALL_DIR/bin/remote_command.sh $ipadd $PASSWORD "dpkg -s '$PKG' > /tmp/pkg_check 2>&1" 1 > /tmp/remote_command_check 2>&1`
-          `$COLUMNSTORE_INSTALL_DIR/bin/remote_scp_get.sh $ipadd $PASSWORD /tmp/pkg_check > /tmp/remote_scp_get_check 2>&1`
+        `$COLUMNSTORE_INSTALL_DIR/bin/remote_command.sh $ipadd $PASSWORD "dpkg -s '$PKG' > ${tmpDir}/pkg_check 2>&1" 1 > ${tmpDir}/remote_command_check 2>&1`
+          `$COLUMNSTORE_INSTALL_DIR/bin/remote_scp_get.sh $ipadd $PASSWORD ${tmpDir}/pkg_check > ${tmpDir}/remote_scp_get_check 2>&1`
             if [ "$?" -ne 0 ]; then
-              echo "Error running remote_scp_get.sh to $ipadd Node, check /tmp/remote_scp_get_check"
+              echo "Error running remote_scp_get.sh to $ipadd Node, check ${tmpDir}/remote_scp_get_check"
             else
-              `cat /tmp/remote_command_check | grep 'command not found' > /dev/null 2>&1`
+              `cat ${tmpDir}/remote_command_check | grep 'command not found' > /dev/null 2>&1`
               if [ "$?" -eq 0 ]; then
                 echo "${bold}Failed${normal}, $ipadd Node ${bold}dpkg${normal} package not installed"
                 pass=false
@@ -1367,12 +1334,12 @@ checkPackages()
       
       #check for package that shouldnt be installed
       for PKG in "${DEBIAN9_PKG_NOT[@]}"; do
-        `$COLUMNSTORE_INSTALL_DIR/bin/remote_command.sh $ipadd $PASSWORD "dpkg -s '$PKG' > /tmp/pkg_check 2>&1" 1 > /tmp/remote_command_check 2>&1`
-	`$COLUMNSTORE_INSTALL_DIR/bin/remote_scp_get.sh $ipadd $PASSWORD /tmp/pkg_check > /tmp/remote_scp_get_check 2>&1`
+        `$COLUMNSTORE_INSTALL_DIR/bin/remote_command.sh $ipadd $PASSWORD "dpkg -s '$PKG' > ${tmpDir}/pkg_check 2>&1" 1 > ${tmpDir}/remote_command_check 2>&1`
+	`$COLUMNSTORE_INSTALL_DIR/bin/remote_scp_get.sh $ipadd $PASSWORD ${tmpDir}/pkg_check > ${tmpDir}/remote_scp_get_check 2>&1`
 	  if [ "$?" -ne 0 ]; then
-	    echo "Error running remote_scp_get.sh to $ipadd Node, check /tmp/remote_scp_get_check"
+	    echo "Error running remote_scp_get.sh to $ipadd Node, check ${tmpDir}/remote_scp_get_check"
 	  else
-	    `cat /tmp/remote_command_check | grep 'command not found' > /dev/null 2>&1`
+	    `cat ${tmpDir}/remote_command_check | grep 'command not found' > /dev/null 2>&1`
 	    if [ "$?" -eq 0 ]; then
 	      echo "${bold}Failed${normal}, $ipadd Node ${bold}dpkg${normal} package not installed"
 	      pass=false
diff --git a/utils/compress/version1.cpp b/utils/compress/version1.cpp
index 59d080022..945e2617a 100644
--- a/utils/compress/version1.cpp
+++ b/utils/compress/version1.cpp
@@ -188,13 +188,9 @@ void initCtlShm()
     }
     catch (bi::interprocess_exception&)
     {
-#if BOOST_VERSION < 104500
-        bi::shared_memory_object shm(bi::create_only, DecomShmName.c_str(), bi::read_write);
-#else
         bi::permissions perms;
         perms.set_unrestricted();
         bi::shared_memory_object shm(bi::create_only, DecomShmName.c_str(), bi::read_write, perms);
-#endif
         shm.truncate(sizeof(CtlShmImage));
         bi::mapped_region region(shm, bi::read_write);
         tmpptr = new (region.get_address()) CtlShmImage;
diff --git a/utils/configcpp/configcpp.cpp b/utils/configcpp/configcpp.cpp
index 3236cc5d2..459a6242b 100644
--- a/utils/configcpp/configcpp.cpp
+++ b/utils/configcpp/configcpp.cpp
@@ -97,7 +97,7 @@ Config* Config::makeConfig(const char* cf)
             cf = cfStr.c_str();
 
 #else
-        cf = getenv("CALPONT_CONFIG_FILE");
+        cf = getenv("COLUMNSTORE_CONFIG_FILE");
 #endif
 
         if (cf == 0 || *cf == 0)
@@ -419,7 +419,7 @@ void Config::writeConfig(const string& configFile) const
             value = c1->getConfig("SystemConfig", "SystemName");
 
             //good read, save copy, copy temp file tp tmp then to Columnstore.xml
-            //move to /tmp to get around a 'same file error' in mv command
+            //move to get around a 'same file error' in mv command
             try
             {
                 if (exists(scft)) fs::remove(scft);
diff --git a/utils/configcpp/writeonce.cpp b/utils/configcpp/writeonce.cpp
index c4c22623f..01ed162bd 100644
--- a/utils/configcpp/writeonce.cpp
+++ b/utils/configcpp/writeonce.cpp
@@ -50,12 +50,16 @@ namespace config
 
 void WriteOnceConfig::initializeDefaults()
 {
+	string tmpDir = startup::StartUp::tmpDir();
+
     fLBID_Shift =           make_pair("13", false);
     fDBRootCount =          make_pair("1", false);
     fDBRMRoot =             make_pair("/mnt/OAM/dbrm/BRM_saves", false);
-    fSharedMemoryTmpFile1 = make_pair("/tmp/CalpontShm,", false);
+    string file = tmpDir + "/ColumnstoreShm";
+    fSharedMemoryTmpFile1 = make_pair(file, false);
     fTxnIDFile =            make_pair("/mnt/OAM/dbrm/SMTxnID", false);
-    fSharedMemoryTmpFile2 = make_pair("/tmp/CalpontSessionMonitorShm", false);
+    file = tmpDir + "/CalpontSessionMonitorShm";
+    fSharedMemoryTmpFile2 = make_pair(file, false);
 }
 
 void WriteOnceConfig::setup()
diff --git a/utils/idbdatafile/IDBLogger.cpp b/utils/idbdatafile/IDBLogger.cpp
index 81d1cfd48..11ce65029 100644
--- a/utils/idbdatafile/IDBLogger.cpp
+++ b/utils/idbdatafile/IDBLogger.cpp
@@ -1,4 +1,5 @@
 /* Copyright (C) 2014 InfiniDB, Inc.
+   Copyright (C) 2018 MariaDB Corporation
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License
@@ -28,6 +29,8 @@
 
 #include "IDBLogger.h"
 
+#include "installdir.h"
+
 #include <sstream>
 #include <fstream>
 #include <time.h>
@@ -55,7 +58,10 @@ void IDBLogger::writeLog( const std::string& logmsg )
     pthread_t threadid = pthread_self();
 #endif
     ostringstream fname;
-    fname << "/tmp/idbdf-log-" << pid << "-" << threadid << ".csv";
+    
+    string tmpDir = startup::StartUp::tmpDir();
+
+    fname << tmpDir + "/idbdf-log-" << pid << "-" << threadid << ".csv";
 
     ofstream output;
     output.open( fname.str().c_str(), ios::out | ios::app );
diff --git a/utils/idbdatafile/IDBPolicy.cpp b/utils/idbdatafile/IDBPolicy.cpp
index 0514eca8b..4d0679308 100644
--- a/utils/idbdatafile/IDBPolicy.cpp
+++ b/utils/idbdatafile/IDBPolicy.cpp
@@ -34,6 +34,9 @@
 #include "utils_utf8.h"
 #endif
 
+#include "installdir.h"
+
+
 using namespace std;
 
 namespace idbdatafile
@@ -60,6 +63,7 @@ void IDBPolicy::init( bool bEnableLogging, bool bUseRdwrMemBuffer, const string&
     if ( hdfsRdwrScratch.length() > 0 )
     {
         // TODO-check to make sure this directory has sufficient space, whatever that means.
+
         boost::filesystem::path tmpfilepath( hdfsRdwrScratch );
 
         if (boost::filesystem::exists(tmpfilepath))
@@ -76,6 +80,8 @@ void IDBPolicy::init( bool bEnableLogging, bool bUseRdwrMemBuffer, const string&
         }
         else
         {
+			cout << tmpfilepath << endl;
+
             if (!boost::filesystem::create_directory(tmpfilepath))
             {
                 // We failed to create the scratch directory
@@ -213,23 +219,10 @@ void IDBPolicy::configIDBPolicy()
     }
 
     // Directory in which to place file buffer temporary files.
-    string hdfsRdwrScratch = cf->getConfig("SystemConfig", "hdfsRdwrScratch");
+    string tmpDir = startup::StartUp::tmpDir();
 
-    if ( hdfsRdwrScratch.length() == 0 )
-    {
-        string tmpPath = cf->getConfig("SystemConfig", "TempDiskPath");
-
-        if ( tmpPath.length() == 0 )
-        {
-            hdfsRdwrScratch = "/tmp/hdfsscratch";
-        }
-        else
-        {
-            hdfsRdwrScratch = tmpPath;
-            hdfsRdwrScratch += "/hdfsscratch";
-        }
-
-    }
+    string scratch = cf->getConfig("SystemConfig", "hdfsRdwrScratch");
+    string hdfsRdwrScratch = tmpDir + scratch;
 
     IDBPolicy::init( idblog, bUseRdwrMemBuffer, hdfsRdwrScratch, hdfsRdwrBufferMaxSize );
 
diff --git a/utils/joiner/joinpartition.cpp b/utils/joiner/joinpartition.cpp
index 688489730..962143aac 100644
--- a/utils/joiner/joinpartition.cpp
+++ b/utils/joiner/joinpartition.cpp
@@ -1,4 +1,5 @@
 /* Copyright (C) 2014 InfiniDB, Inc.
+   Copyright (C) 2018 MariaDB Corporation
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License
@@ -22,6 +23,7 @@
 #include "joinpartition.h"
 #include "tuplejoiner.h"
 #include "atomicops.h"
+#include "installdir.h"
 
 using namespace std;
 using namespace utils;
@@ -128,12 +130,9 @@ JoinPartition::JoinPartition(const JoinPartition& jp, bool splitMode) :
     // Instead, each will double in size, giving a capacity of 8GB -> 16 -> 32, and so on.
 //	bucketCount = jp.bucketCount;
     bucketCount = 2;
-    filenamePrefix = config->getConfig("HashJoin", "TempFilePath");
+    filenamePrefix = startup::StartUp::tmpDir();
 
-    if (filenamePrefix.empty())
-        filenamePrefix = "/tmp/infinidb";
-
-    filenamePrefix += "/Infinidb-join-data-";
+    filenamePrefix += "/Columnstore-join-data-";
 
     uniqueID = atomicops::atomicInc(&uniqueNums);
     uint32_t tmp = uniqueID;
diff --git a/utils/rwlock/rwlock.cpp b/utils/rwlock/rwlock.cpp
index 8d37b5124..d042b905e 100644
--- a/utils/rwlock/rwlock.cpp
+++ b/utils/rwlock/rwlock.cpp
@@ -52,6 +52,8 @@ using namespace boost::posix_time;
 
 #include "shmkeys.h"
 
+#include "installdir.h"
+
 namespace
 {
 using namespace rwlock;
@@ -143,19 +145,9 @@ RWLockShmImpl::RWLockShmImpl(int key, bool excl)
 
     try
     {
-#if BOOST_VERSION < 104500
-        bi::shared_memory_object shm(bi::create_only, keyName.c_str(), bi::read_write);
-#ifdef __linux__
-        {
-            string pname = "/dev/shm/" + keyName;
-            chmod(pname.c_str(), 0666);
-        }
-#endif
-#else
         bi::permissions perms;
         perms.set_unrestricted();
         bi::shared_memory_object shm(bi::create_only, keyName.c_str(), bi::read_write, perms);
-#endif
         shm.truncate(sizeof(struct State));
         fStateShm.swap(shm);
         bi::mapped_region region(fStateShm, bi::read_write);
@@ -174,16 +166,25 @@ RWLockShmImpl::RWLockShmImpl(int key, bool excl)
         new (&fState->sems[RWLock::READERS]) bi::interprocess_semaphore(0);
         new (&fState->sems[RWLock::WRITERS]) bi::interprocess_semaphore(0);
     }
-    catch (bi::interprocess_exception&)
+    catch (bi::interprocess_exception &e)
     {
-        if (excl)
-        {
-            //don't think we can get here anymore...
-            throw not_excl();
+        if (e.get_error_code() == bi::security_error) {
+            cerr << "RWLock:  Failed to create the lock.  Check perms on /dev/shm; should be 1777" << endl;
+            throw;
         }
+        if (e.get_error_code() == bi::already_exists_error && excl)
+            throw not_excl();
+        if (e.get_error_code() != bi::already_exists_error)
+            throw;
 
-        bi::shared_memory_object shm(bi::open_only, keyName.c_str(), bi::read_write);
-        fStateShm.swap(shm);
+        try {
+            bi::shared_memory_object shm(bi::open_only, keyName.c_str(), bi::read_write);
+            fStateShm.swap(shm);
+        }
+        catch (exception &e) {
+            cerr << "RWLock failed to attach to the " << keyName << " shared mem segment, got " << e.what() << endl;
+            throw;
+        }
         bi::mapped_region region(fStateShm, bi::read_write);
         fRegion.swap(region);
         fState = static_cast<State*>(fRegion.get_address());
diff --git a/utils/startup/installdir.cpp b/utils/startup/installdir.cpp
index 5f09a0bd2..f17740ca2 100644
--- a/utils/startup/installdir.cpp
+++ b/utils/startup/installdir.cpp
@@ -31,6 +31,13 @@ using namespace boost;
 #include "idbregistry.h"
 #endif
 #include "installdir.h"
+#include "configcpp.h"
+
+using namespace config;
+
+#include <iostream> 
+   
+using namespace std;
 
 namespace startup
 {
@@ -71,6 +78,62 @@ const string StartUp::installDir()
     return *fInstallDirp;
 }
 
+/* static */
+mutex StartUp::fTmpDirLock;
+/* static */
+string* StartUp::fTmpDirp = 0;
+
+/* static */
+const string StartUp::tmpDir()
+{
+    mutex::scoped_lock lk(fTmpDirLock);
+
+    if (fTmpDirp)
+        return *fTmpDirp;
+
+#ifdef _MSC_VER
+    fTmpDirp = new string("C:\\Calpont\Tmp");
+    string cfStr = IDBreadRegistry("");
+
+    if (!cfStr.empty())
+        *fTmpDirp = cfStr;
+
+#else
+
+	//check for non-root user 
+    const char* p = getenv("HOME");
+	string homedir = p;
+
+    if (homedir == "/root")
+	{
+		Config* sysConfig = Config::makeConfig();
+
+		string TempFileDir;
+
+		try
+		{
+			TempFileDir = sysConfig->getConfig("SystemConfig", "TempFileDir");
+		}
+		catch (...)
+		{}
+
+		fTmpDirp = new string("/tmp");
+		
+		*fTmpDirp = *fTmpDirp + TempFileDir;
+	}
+	else
+	{
+		// non-root user
+		fTmpDirp = new string(homedir);
+
+		*fTmpDirp = *fTmpDirp + "/.tmp";
+	}
+	
+#endif
+
+    return *fTmpDirp;
+}
+
 }
 // vim:ts=4 sw=4:
 
diff --git a/utils/startup/installdir.h b/utils/startup/installdir.h
index 58d99b061..3df874daa 100644
--- a/utils/startup/installdir.h
+++ b/utils/startup/installdir.h
@@ -39,6 +39,7 @@ public:
     ~StartUp() {}
 
     static const std::string installDir();
+    static const std::string tmpDir();
 
 private:
     StartUp(const StartUp& rhs);
@@ -46,6 +47,8 @@ private:
 
     static boost::mutex fInstallDirLock;
     static std::string* fInstallDirp;
+    static boost::mutex fTmpDirLock;
+    static std::string* fTmpDirp;
 };
 
 }
diff --git a/utils/udfsdk/README.txt b/utils/udfsdk/README.txt
index 83497ca46..3210979b4 100644
--- a/utils/udfsdk/README.txt
+++ b/utils/udfsdk/README.txt
@@ -11,7 +11,7 @@ files to create your own function or just try that function as is.
     $ make
 - Copy the libudf_mysql.so.1.0.0 and libudfsdk.so.1.0.0 file to /usr/local/mariadb/columnstore/lib on
   every columnstore node.
-    $ sudo cp libudf_mysql.so.1.0.0 libudfsdk.so.1.0.0 /usr/local/mariadb/columnstore/lib/
+    $ cp libudf_mysql.so.1.0.0 libudfsdk.so.1.0.0 /usr/local/mariadb/columnstore/lib/
 - Restart ColumnStore
     $ mcsadmin restartsystem y
 - Using the mcsmysql client add the user defined function, e.g,
@@ -20,4 +20,4 @@ files to create your own function or just try that function as is.
     > create function mcs_isnull returns string soname 'libudf_mysql.so';
 
 You should now be able to use the mcs_add(arg1, arg2) and mcs_isnull(arg) functions in the select and/or where clauses
-of SQL statements.
\ No newline at end of file
+of SQL statements.
diff --git a/versioning/BRM/brmshmimpl.cpp b/versioning/BRM/brmshmimpl.cpp
index f5985fc8f..3bf834188 100644
--- a/versioning/BRM/brmshmimpl.cpp
+++ b/versioning/BRM/brmshmimpl.cpp
@@ -36,6 +36,8 @@ namespace bi = boost::interprocess;
 #include "brmshmimpl.h"
 #include "brmtypes.h"
 
+#include "installdir.h"
+
 namespace BRM
 {
 
@@ -62,12 +64,7 @@ again:
 #endif
 
             if (curSize == 0) throw
-#if BOOST_VERSION < 104500
-                bi::interprocess_exception();
-
-#else
                 bi::interprocess_exception("shm size is zero");
-#endif
         }
         catch (bi::interprocess_exception&)
         {
@@ -85,43 +82,45 @@ again:
 
     try
     {
-#if BOOST_VERSION < 104500
-        bi::shared_memory_object shm(bi::create_only, keyName.c_str(), bi::read_write);
-#ifdef __linux__
-        {
-            string pname = "/dev/shm/" + keyName;
-            chmod(pname.c_str(), 0666);
-        }
-#endif
-#else
         bi::permissions perms;
         perms.set_unrestricted();
         bi::shared_memory_object shm(bi::create_only, keyName.c_str(), bi::read_write, perms);
-#endif
         idbassert(fSize > 0);
         shm.truncate(fSize);
         fShmobj.swap(shm);
     }
-    catch (bi::interprocess_exception&)
+    catch (bi::interprocess_exception &b)
     {
-        bi::shared_memory_object shm(bi::open_only, keyName.c_str(), bi::read_write);
+        if (b.get_error_code() != bi::already_exists_error) {
+            ostringstream o;
+            o << "BRM caught an exception creating a shared memory segment: " << b.what();
+            log(o.str());
+            throw;
+        }
+        bi::shared_memory_object *shm = NULL;
+        try {
+            shm = new bi::shared_memory_object(bi::open_only, keyName.c_str(), bi::read_write);
+        }
+        catch (exception &e) {
+            ostringstream o;
+            o << "BRM caught an exception attaching to a shared memory segment (" << keyName << "): " << b.what();
+            log(o.str());
+            throw;
+        }
         off_t curSize = 0;
 #ifdef _MSC_VER
         bi::offset_t tmp = 0;
-        shm.get_size(tmp);
+        shm->get_size(tmp);
         curSize = static_cast<off_t>(tmp);
 #else
-        shm.get_size(curSize);
+        shm->get_size(curSize);
 #endif
         idbassert(curSize > 0);
         idbassert(curSize >= fSize);
-        fShmobj.swap(shm);
+        fShmobj.swap(*shm);
+        delete shm;
         fSize = curSize;
     }
-    catch (...)
-    {
-        throw;
-    }
 
     if (fReadOnly)
     {
@@ -143,19 +142,9 @@ int BRMShmImpl::grow(unsigned newKey, off_t newSize)
     string oldName = fShmobj.get_name();
 
     string keyName = ShmKeys::keyToName(newKey);
-#if BOOST_VERSION < 104500
-    bi::shared_memory_object shm(bi::create_only, keyName.c_str(), bi::read_write);
-#ifdef __linux__
-    {
-        string pname = "/dev/shm/" + keyName;
-        chmod(pname.c_str(), 0666);
-    }
-#endif
-#else
     bi::permissions perms;
     perms.set_unrestricted();
     bi::shared_memory_object shm(bi::create_only, keyName.c_str(), bi::read_write, perms);
-#endif
     shm.truncate(newSize);
 
     bi::mapped_region region(shm, bi::read_write);
@@ -190,19 +179,9 @@ int BRMShmImpl::clear(unsigned newKey, off_t newSize)
     string oldName = fShmobj.get_name();
 
     string keyName = ShmKeys::keyToName(newKey);
-#if BOOST_VERSION < 104500
-    bi::shared_memory_object shm(bi::create_only, keyName.c_str(), bi::read_write);
-#ifdef __linux__
-    {
-        string pname = "/dev/shm/" + keyName;
-        chmod(pname.c_str(), 0666);
-    }
-#endif
-#else
     bi::permissions perms;
     perms.set_unrestricted();
     bi::shared_memory_object shm(bi::create_only, keyName.c_str(), bi::read_write, perms);
-#endif
     shm.truncate(newSize);
 
     bi::mapped_region region(shm, bi::read_write);
diff --git a/versioning/BRM/mastersegmenttable.cpp b/versioning/BRM/mastersegmenttable.cpp
index 4d5816f41..047c647f8 100644
--- a/versioning/BRM/mastersegmenttable.cpp
+++ b/versioning/BRM/mastersegmenttable.cpp
@@ -41,6 +41,8 @@ using namespace rwlock;
 #include "mastersegmenttable.h"
 #undef MASTERSEGMENTTABLE_DLLEXPORT
 
+#include "installdir.h"
+
 namespace
 {
 using namespace BRM;
@@ -75,38 +77,33 @@ MasterSegmentTableImpl::MasterSegmentTableImpl(int key, int size)
 
     try
     {
-#if BOOST_VERSION < 104500
-        bi::shared_memory_object shm(bi::create_only, keyName.c_str(), bi::read_write);
-#ifdef __linux__
-        {
-            string pname = "/dev/shm/" + keyName;
-            chmod(pname.c_str(), 0666);
-        }
-#endif
-#else
         bi::permissions perms;
         perms.set_unrestricted();
         bi::shared_memory_object shm(bi::create_only, keyName.c_str(), bi::read_write, perms);
-#endif
         shm.truncate(size);
         fShmobj.swap(shm);
     }
     catch (bi::interprocess_exception& biex)
     {
-        bi::shared_memory_object shm(bi::open_only, keyName.c_str(), bi::read_write);
-#ifdef __linux__
-        {
-            string pname = "/dev/shm/" + keyName;
-            chmod(pname.c_str(), 0666);
+        if (biex.get_error_code() == bi::already_exists_error) {
+            try {
+                bi::shared_memory_object shm(bi::open_only, keyName.c_str(), bi::read_write);
+                fShmobj.swap(shm);
+            }
+            catch (exception &e) {
+                ostringstream o;
+                o << "BRM caught an exception attaching to a shared memory segment (" << keyName << "): " << e.what();
+                log(o.str());
+                throw;
+            }
+        }
+        else {
+            ostringstream o;
+            o << "BRM caught an exception creating a shared memory segment (" << keyName << "): " << biex.what();
+            log(o.str());
+            throw;
         }
-#endif
-        fShmobj.swap(shm);
     }
-    catch (...)
-    {
-        throw;
-    }
-
     bi::mapped_region region(fShmobj, bi::read_write);
     fMapreg.swap(region);
 }
diff --git a/versioning/BRM/sessionmanagerserver.h b/versioning/BRM/sessionmanagerserver.h
index c7319fc0d..b25de41f9 100644
--- a/versioning/BRM/sessionmanagerserver.h
+++ b/versioning/BRM/sessionmanagerserver.h
@@ -73,7 +73,7 @@ namespace BRM
  * 		default value is 1000.
  * SessionManager/SharedMemoryTmpFile: the file to store the shared memory segment
  * 		data in between invocations if DESTROYSHMSEG is defined below.  The
- * 		default is /tmp/CalpontShm.
+ * 		default is /tmp/ColumnstoreShm.
  * SessionManager/TxnIDFile: the file to store the last transaction ID issued
  */
 
diff --git a/versioning/BRM/shmkeys.cpp b/versioning/BRM/shmkeys.cpp
index fcdf7c999..6abe149ac 100644
--- a/versioning/BRM/shmkeys.cpp
+++ b/versioning/BRM/shmkeys.cpp
@@ -55,7 +55,6 @@ ShmKeys::ShmKeys()
     PROCESSSTATUS_SYSVKEY =   0xfd000000 | BRM_UID;
     SYSTEMSTATUS_SYSVKEY =    0xfc000000 | BRM_UID;
     SWITCHSTATUS_SYSVKEY =    0xfb000000 | BRM_UID;
-    STORAGESTATUS_SYSVKEY =   0xfa000000 | BRM_UID;
     NICSTATUS_SYSVKEY =       0xf9000000 | BRM_UID;
     DBROOTSTATUS_SYSVKEY =    0xf8000000 | BRM_UID;
     DECOMSVRMUTEX_SYSVKEY =   0xf7000000 | BRM_UID;
diff --git a/versioning/BRM/shmkeys.h b/versioning/BRM/shmkeys.h
index bfb2cba0f..62dd67866 100644
--- a/versioning/BRM/shmkeys.h
+++ b/versioning/BRM/shmkeys.h
@@ -61,7 +61,6 @@ public:
     uint32_t PROCESSSTATUS_SYSVKEY;
     uint32_t SYSTEMSTATUS_SYSVKEY;
     uint32_t SWITCHSTATUS_SYSVKEY;
-    uint32_t STORAGESTATUS_SYSVKEY;
     uint32_t NICSTATUS_SYSVKEY;
     uint32_t DBROOTSTATUS_SYSVKEY;
     uint32_t DECOMSVRMUTEX_SYSVKEY;
diff --git a/versioning/BRM/slavecomm.cpp b/versioning/BRM/slavecomm.cpp
index cc708781a..fab93d605 100644
--- a/versioning/BRM/slavecomm.cpp
+++ b/versioning/BRM/slavecomm.cpp
@@ -43,6 +43,8 @@
 #include "slavecomm.h"
 #undef SLAVECOMM_DLLEXPORT
 
+#include "installdir.h"
+
 using namespace std;
 using namespace messageqcpp;
 using namespace idbdatafile;
@@ -98,6 +100,8 @@ SlaveComm::SlaveComm(string hostname, SlaveDBRMNode* s) :
             }
         }
     }
+    
+    string tmpDir = startup::StartUp::tmpDir();
 
     /* NOTE: this string has to match whatever is designated as the first slave */
     if (hostname == "DBRM_Worker1")
@@ -108,11 +112,11 @@ SlaveComm::SlaveComm(string hostname, SlaveDBRMNode* s) :
         }
         catch (exception& e)
         {
-            savefile = "/tmp/BRM_SaveFiles";
+            savefile = tmpDir + "/BRM_SaveFiles";
         }
 
         if (savefile == "")
-            savefile = "/tmp/BRM_SaveFiles";
+            savefile = tmpDir + "/BRM_SaveFiles";
 
         tmp = "";
 
@@ -181,17 +185,19 @@ SlaveComm::SlaveComm()
 {
     config::Config* config = config::Config::makeConfig();
 
+    string tmpDir = startup::StartUp::tmpDir();
+
     try
     {
         savefile = config->getConfig("SystemConfig", "DBRMRoot");
     }
     catch (exception& e)
     {
-        savefile = "/tmp/BRM_SaveFiles";
+        savefile = tmpDir + "/BRM_SaveFiles";
     }
 
     if (savefile == "")
-        savefile = "/tmp/BRM_SaveFiles";
+        savefile = tmpDir + "/BRM_SaveFiles";
 
     journalName = savefile + "_journal";
 
diff --git a/writeengine/bulk/bulkload.py b/writeengine/bulk/bulkload.py
index e4d8c0366..9a6ab0e06 100644
--- a/writeengine/bulk/bulkload.py
+++ b/writeengine/bulk/bulkload.py
@@ -52,10 +52,10 @@ def find_paths():
   
   """Find DBRoot and BulkRoot."""
   try:
-    config_file = os.environ['CALPONT_CONFIG_FILE']
+    config_file = os.environ['COLUMNSTORE_CONFIG_FILE']
   except KeyError:
     try:
-        logger.info("Environment variable CALPONT_CONFIG_FILE not set, looking for system Columnstore.xml")
+        logger.info("Environment variable COLUMNSTORE_CONFIG_FILE not set, looking for system Columnstore.xml")
         config_file = '/usr/local/mariadb/columnstore/etc/Columnstore.xml'
         os.lstat(config_file)
     except:
@@ -185,10 +185,6 @@ def main():
   clean up old files, sort the index inserts and generally rock and roll
   """
   start_dir = curdir=os.getcwd() # remember where we started
-  
-  if not os.access('.', os.W_OK):
-    os.chdir('/tmp')
-    logger.warn('Changing to /tmp to have permission to write files')
 
   if not os.environ.has_key('LD_LIBRARY_PATH'):
       logger.info('No environment variable LD_LIBRARY_PATH')
diff --git a/writeengine/bulk/checkidx.py b/writeengine/bulk/checkidx.py
index 0fe0a4ed9..be22a674b 100755
--- a/writeengine/bulk/checkidx.py
+++ b/writeengine/bulk/checkidx.py
@@ -6,7 +6,7 @@ def find_paths():
   
   """Find DBRoot and BulkRoot."""
   try:
-    config_file = os.environ['CALPONT_CONFIG_FILE']
+    config_file = os.environ['COLUMNSTORE_CONFIG_FILE']
   except KeyError:
     try:
       config_file = '/usr/local/mariadb/columnstore/etc/Columnstore.xml'
@@ -71,10 +71,6 @@ def main():
   """
   Validate indexes..
   """
-  
-  if not os.access('.', os.W_OK):
-    os.chdir('/tmp')
-    print 'Changing to /tmp to have permission to write files'
 
   if len(os.getenv('LD_LIBRARY_PATH'))<5:
     print 'Suspicous LD_LIBRARY_PATH: %s'%os.getenv('LD_LIBRARY_PATH')
diff --git a/writeengine/bulk/qa-bulkload.py b/writeengine/bulk/qa-bulkload.py
index 599183436..ea5436fd8 100644
--- a/writeengine/bulk/qa-bulkload.py
+++ b/writeengine/bulk/qa-bulkload.py
@@ -49,10 +49,10 @@ def find_paths():
   
   """Find DBRoot and BulkRoot."""
   try:
-    config_file = os.environ['CALPONT_CONFIG_FILE']
+    config_file = os.environ['COLUMNSTORE_CONFIG_FILE']
   except KeyError:
     try:
-        logger.info("Environment variable CALPONT_CONFIG_FILE not set, looking for system Columnstore.xml")
+        logger.info("Environment variable COLUMNSTORE_CONFIG_FILE not set, looking for system Columnstore.xml")
         config_file = '/usr/local/mariadb/columnstore/etc/Columnstore.xml'
         os.lstat(config_file)
     except:
@@ -182,10 +182,6 @@ def main():
   clean up old files, sort the index inserts and generally rock and roll
   """
   start_dir = curdir=os.getcwd() # remember where we started
-  
-  if not os.access('.', os.W_OK):
-    os.chdir('/tmp')
-    logger.warn('Changing to /tmp to have permission to write files')
 
   if not os.environ.has_key('LD_LIBRARY_PATH'):
       logger.info('No environment variable LD_LIBRARY_PATH')
diff --git a/writeengine/server/we_dataloader.cpp b/writeengine/server/we_dataloader.cpp
index b3845ad9f..d1d735a3b 100644
--- a/writeengine/server/we_dataloader.cpp
+++ b/writeengine/server/we_dataloader.cpp
@@ -1331,15 +1331,6 @@ void WEDataLoader::onReceiveBrmRptFileName(ByteStream& Ibs)
             cout << "Creating directory : " << dirname << endl;
             boost::filesystem::create_directories(dirname.c_str());
         }
-
-        /*
-        #ifdef _MSC_VER
-        	mkdir(dirname.c_str());
-        #else
-        	mkdir(dirname.c_str(), 0777);
-        	boost::filesystem::create_directories("/tmp/boby/test");
-        #endif
-        */
     }
 
     if (fpSysLog)
@@ -1568,15 +1559,6 @@ void WEDataLoader::onReceiveJobId(ByteStream& Ibs)
             cout << "Creating directory : " << dirname << endl;
             boost::filesystem::create_directories(dirname.c_str());
         }
-
-        /*
-        #ifdef _MSC_VER
-        	mkdir(dirname.c_str());
-        #else
-        	mkdir(dirname.c_str(), 0777);
-        	boost::filesystem::create_directories("/tmp/boby/test");
-        #endif
-        */
     }
 
     fJobFile.open(aJobFileName.c_str());
diff --git a/writeengine/shared/we_config.cpp b/writeengine/shared/we_config.cpp
index 07554283e..8b9058057 100644
--- a/writeengine/shared/we_config.cpp
+++ b/writeengine/shared/we_config.cpp
@@ -263,11 +263,14 @@ void Config::checkReload( )
     }
 
     // Directory in which to place file buffer temporary files.
+    string TmpFileDir = startup::StartUp::tmpDir();
+
     string hdfsRdwrScratch = cf->getConfig("SystemConfig", "hdfsRdwrScratch");
+    hdfsRdwrScratch = TmpFileDir + hdfsRdwrScratch;
 
     if ( hdfsRdwrScratch.length() == 0 )
     {
-        hdfsRdwrScratch = "/tmp/hdfsscratch";
+        hdfsRdwrScratch = TmpFileDir + "/hdfsscratch";
     }
 
     IDBPolicy::init( idblog, bUseRdwrMemBuffer, hdfsRdwrScratch, hdfsRdwrBufferMaxSize );
diff --git a/writeengine/splitter/we_cmdargs.cpp b/writeengine/splitter/we_cmdargs.cpp
index 41fe68e21..83044fa45 100644
--- a/writeengine/splitter/we_cmdargs.cpp
+++ b/writeengine/splitter/we_cmdargs.cpp
@@ -1418,8 +1418,7 @@ std::string WECmdArgs::getTmpFileDir()
 {
     if (!fTmpFileDir.empty()) return fTmpFileDir;
 
-    fTmpFileDir = config::Config::makeConfig()->getConfig("SystemConfig",
-                  "TempFileDir");
+    fTmpFileDir = startup::StartUp::tmpDir();
 
     if (fTmpFileDir.empty())
         throw( runtime_error("Config ERROR: TmpFileDir not found!!"));
diff --git a/writeengine/splitter/we_sdhandler.cpp b/writeengine/splitter/we_sdhandler.cpp
index 647a90e89..c2120c529 100644
--- a/writeengine/splitter/we_sdhandler.cpp
+++ b/writeengine/splitter/we_sdhandler.cpp
@@ -73,6 +73,8 @@ using namespace batchloader;
 #include "we_tablelockgrabber.h"
 #include "we_simplesyslog.h"
 
+#include "installdir.h"
+
 namespace WriteEngine
 {
 //------------------------------------------------------------------------------
@@ -1403,7 +1405,7 @@ void WESDHandler::onBrmReport(int PmId, messageqcpp::SBS& Sbs)
             if (!fRef.fCmdArgs.getConsoleOutput())
             {
                 ostringstream oss;
-                oss << "/tmp/" << fTableOId << ".txt";
+                oss << startup::StartUp::tmpDir() << fTableOId << ".txt";
                 ofstream dmlFile(oss.str().c_str(), std::ofstream::app);
 
                 if (dmlFile.is_open())
@@ -1884,10 +1886,10 @@ void WESDHandler::onCleanupResult(int PmId, messageqcpp::SBS& Sbs)
             WEColOorVec::iterator aIt = fImportRslt.fColOorVec.begin();
             ofstream dmlFile;
 
-            if (!fRef.fCmdArgs.getConsoleOutput()) //for DML to use file /tmp/
+            if (!fRef.fCmdArgs.getConsoleOutput()) //for DML to use file
             {
                 ostringstream oss;
-                oss << "/tmp/" << fTableOId << ".txt";
+                oss << startup::StartUp::tmpDir() << fTableOId << ".txt";
                 dmlFile.open(oss.str().c_str());
             }
 
diff --git a/writeengine/splitter/we_splitterapp.cpp b/writeengine/splitter/we_splitterapp.cpp
index 0804baf1b..dac0c7387 100644
--- a/writeengine/splitter/we_splitterapp.cpp
+++ b/writeengine/splitter/we_splitterapp.cpp
@@ -111,7 +111,7 @@ WESplitterApp::WESplitterApp(WECmdArgs& CmdArgs) :
                 {
                     ofstream dmlFile;
                     ostringstream oss;
-                    oss << "/tmp/" << fDh.getTableOID() << ".txt";
+                    oss << startup::StartUp::tmpDir() << fDh.getTableOID() << ".txt";
                     dmlFile.open(oss.str().c_str());
 
                     if (dmlFile.is_open())